diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-08-07 10:27:09 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-08-13 12:03:25 +0000 |
commit | 7388cd427d99ac7920394a31f176c0eb92521837 (patch) | |
tree | 82fc75b5ab0861a1f68fc52373660270a6818b21 /recipes-qt/qt5 | |
parent | 77ba83f3fbf777add748a437b80c19c6a1a5f989 (diff) |
meta-qt5: update submodules
Change-Id: I4ec55015ee1006f7a61049bf1a8442476f129a8e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5')
50 files changed, 161 insertions, 280 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 412c0050..dc69f4ec 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "a0c4b6f34546bdd22167a76a0540d37e9a37c0cf" +SRCREV = "76be819345228d589cbc4f5129617151ea604750" diff --git a/recipes-qt/qt5/ogl-runtime/0002-Adapt-distance-field-cache-to-5.14.patch b/recipes-qt/qt5/ogl-runtime/0002-Adapt-distance-field-cache-to-5.14.patch new file mode 100644 index 00000000..619a49e0 --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime/0002-Adapt-distance-field-cache-to-5.14.patch @@ -0,0 +1,50 @@ +From e177fb4a0fcf4068cef6a0e018cd98e00f248a13 Mon Sep 17 00:00:00 2001 +From: Laszlo Agocs <laszlo.agocs@qt.io> +Date: Tue, 13 Aug 2019 10:13:47 +0200 +Subject: [PATCH] Adapt distance field cache to 5.14 + +There is a new pure virtual in the base class in 5.14. It is not very +relevant here since this glyph cache is not used in combination with +the df text materials of Qt Quick. We can nonetheless implement the +virtual and return the correct value. + +Task-number: QT3DS-3856 +Change-Id: I97b807ec73a664488b63c8888bc8cd90a9c53589 +--- + src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp | 7 +++++++ + src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h | 4 ++++ + 2 files changed, 11 insertions(+) + +diff --git a/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp b/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp +index e945335..52f01ea 100644 +--- a/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp ++++ b/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp +@@ -513,6 +513,13 @@ bool Q3DSDistanceFieldGlyphCache::loadPregeneratedCache(const QRawFont &font) + return true; + } + ++#if QT_VERSION >= QT_VERSION_CHECK(5,14,0) ++bool Q3DSDistanceFieldGlyphCache::eightBitFormatIsAlphaSwizzled() const ++{ ++ return m_context.GetRenderContext().GetRenderContextType() == qt3ds::render::NVRenderContextValues::GLES2; ++} ++#endif // QT_VERSION >= QT_VERSION_CHECK(5,14,0) ++ + QT_END_NAMESPACE + + #endif // QT_VERSION >= QT_VERSION_CHECK(5,12,2) +diff --git a/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h b/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h +index 679d3ad..fb4826e 100644 +--- a/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h ++++ b/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h +@@ -76,6 +76,10 @@ public: + + qreal fontSize() const; + ++#if QT_VERSION >= QT_VERSION_CHECK(5,14,0) ++ bool eightBitFormatIsAlphaSwizzled() const override; ++#endif ++ + private: + bool loadPregeneratedCache(const QRawFont &font); + TextureInfo *textureInfo(int index) const; diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb index ecc8ba2b..58d31e98 100644 --- a/recipes-qt/qt5/ogl-runtime_git.bb +++ b/recipes-qt/qt5/ogl-runtime_git.bb @@ -9,18 +9,18 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtquickcontrols2" -QT_MODULE_BRANCH = "2.4" +QT_MODULE_BRANCH = "master" QT_MODULE_BRANCH_EASTL = "master" QT_GIT_PROJECT = "qt3dstudio" -PV = "2.4+git${SRCPV}" +PV = "2.5+git${SRCPV}" SRC_URI += " \ ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \ file://0001-Fix-examples-build-error.patch \ - file://0002-Fix-format-security-issues.patch \ + file://0002-Adapt-distance-field-cache-to-5.14.patch \ " -SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f" +SRCREV_ogl-runtime = "bd488ea03ec4a969e86c55909c60deecdc9f9af2" SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5" SRCREV = "${SRCREV_ogl-runtime}" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 0d0f11ec..d23a2d36 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "f39178a415cb41470775a86e0aa358faa3686d81" +SRCREV = "d2c52680884095238ec3859fabaad03157af3985" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index cd22fe24..d6ceb064 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -134,11 +134,9 @@ do_install() { done fi - install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} - # since 5.9.2 something sets a very strange path to mkspec ("${_qt5Core_install_prefix}/../../../../../../../../../../usr/lib/qt5//mkspecs/linux-oe-g++") # override this until somebody finds a better way echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "a0c4b6f34546bdd22167a76a0540d37e9a37c0cf" +SRCREV = "76be819345228d589cbc4f5129617151ea604750" diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch index b9cc9d44..c5815c0f 100644 --- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch +++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch @@ -1,4 +1,4 @@ -From d8eb5531c444bcae2c2067a7f67e5229acc75fac Mon Sep 17 00:00:00 2001 +From 723d7ab6150f7ef7b33892b54ddc0931a5e71341 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 10:11:50 -0700 Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc @@ -7,13 +7,13 @@ musl does not have feenableexcept function Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 2 +- + tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp -index 5d344834e6..1afc70d255 100644 ---- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp -+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +index 676c66d..ba05aad 100644 +--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp ++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -46,7 +46,7 @@ #include <private/qlocale_tools_p.h> #include <qnumeric.h> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 9c8eae83..cad653f3 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "a0c4b6f34546bdd22167a76a0540d37e9a37c0cf" +SRCREV = "76be819345228d589cbc4f5129617151ea604750" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 07ac282f..9fd00fbb 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "5bc7cc7c5c9f4bdc72ae23c16c3c78d6bff86365" +SRCREV = "9a052d7a7e56d312fa52eaef7ff7844ec7019783" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index 8c61cee1..9a848367 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb @@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" DEPENDS += "qtbase" -SRCREV = "838cfa5aec4c02f5e865fc470c10cc50eb42f2c8" +SRCREV = "5b6a1c27ee73be2068705037e09f095d6dc210fa" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 1a4d03fc..db48c255 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "6b9469b1a229486986f572af09459dacce5795de" +SRCREV = "f2f9da656fd77330cce44dfe0721b3f68f1d809d" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index ed6ae7ff..c06e2f63 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "d78542919276ee6a87bfd75b83276dd72b791aaa" +SRCREV = "422856bb470e1380309c66a8ba4b40e06d1df830" diff --git a/recipes-qt/qt5/qtdeclarative/0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch b/recipes-qt/qt5/qtdeclarative/0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch new file mode 100644 index 00000000..3de99517 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch @@ -0,0 +1,23 @@ +From 258a0c6a231f2f853858229e9e069aae71290bba Mon Sep 17 00:00:00 2001 +From: Mikko Gronoff <mikko.gronoff@qt.io> +Date: Mon, 12 Aug 2019 08:27:19 +0300 +Subject: [PATCH] scenegraph: fix error: 'QOffscreenSurface' does not name a + type + +Change-Id: I41a8b30b316b038ed1e3910adb0254931f385a2a +--- + src/quick/scenegraph/qsgrhisupport_p.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/quick/scenegraph/qsgrhisupport_p.h b/src/quick/scenegraph/qsgrhisupport_p.h +index 48ad2f0..0e1881a 100644 +--- a/src/quick/scenegraph/qsgrhisupport_p.h ++++ b/src/quick/scenegraph/qsgrhisupport_p.h +@@ -86,6 +86,7 @@ QT_BEGIN_NAMESPACE + + class QSGDefaultRenderContext; + class QVulkanInstance; ++class QOffscreenSurface; + + // Opting in/out of QRhi and choosing the default/requested backend is managed + // by this singleton. This is because this information may be needed before diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index df86188b..b27d63ab 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -14,7 +14,10 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRC_URI += "file://0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch" +SRC_URI += "\ + file://0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch \ + file://0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch \ +" PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" @@ -26,6 +29,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "9d61684d70c8691d81536b7b519388586e2cbbb8" +SRCREV = "d1b72c98b4e617530bfb23c3a5b7ebc68c15c089" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 9a5f623f..efa139eb 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "337abe99492d7d6d5229b615fa1559fc2f4ee6eb" +SRCREV = "ea0457b8058191b4bb22477c7b51975a70af0b0e" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 52d66c34..09569195 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "fe2eefc036f3f42457e7f2e012f21fdec84550eb" +SRCREV = "c76eb211ff12fc3a1588c3092dd76a41eb5551c7" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index dd7594d4..9e890c65 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "9a4a2dd5189e1659bce46eacef513b0c5680bb1e" +SRCREV = "e7940d951e211837ed45b759fb97282e8d65e4c5" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 16caaa76..cd525271 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "07940838ab5d65565d4b67bdffbcf68d020fb725" +SRCREV = "99dd0e8203d789caf2edfd2105c398654f5b5748" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 440b3c9a..47c5d463 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -36,7 +36,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "971423c512623b84618cfc73b992da1f1dc014f8" +SRCREV_qtlocation = "f8694e1f3430b7851fc90e26c6d778a86219379a" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index 1acf17f3..a2310b21 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "254ea99abd181abe5468b7cc5ece0e2ae51da185" +SRCREV = "03b666a967fb7501248e9f40a5b187ec3a16c453" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 568ec02f..e986dc91 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "5b8ae24da570f61123e14b6f84eb6bab41ac8a29" +SRCREV = "9e7eba636ebb5ca42822f682be2b442be50cde6e" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 4a8b3053..4370d9d8 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -37,4 +37,4 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "afca8928ce8e4113a224e57fa30a3b4bc5a2db47" +SRCREV = "435557691c3c28e9c63aa4bb5f4b9ec8fe3f8923" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 8b20db43..b56b3706 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "8bc6feb36a471006cfa4b62189edc3d7fd67bf78" +SRCREV = "272ea7f508d8ee30311c08c07c6e0501f17338c2" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index a0316ae9..e1bc4c87 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "bad55c664152eef404f7bf908cae0abfdc9a7b46" +SRCREV = "42980b31c57cf7a93c7015df5cd1820db0f4d08b" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 7e0da5b1..735df4fc 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "91fc2ee34cfd674d134e88dc7f3c54453ec685e7" +SRCREV = "f58adac04ad8e36a840a66d14e02e5993b8099e7" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index cc923157..16e134e9 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "2ee351b36b265ead80a6240c83fa9ab5d444bf08" +SRCREV = "2ee78aafc81cd35073e9d90c9186e81676dea2ac" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index f5594dbe..12563e8c 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "d2a661f16e9982c45260efb9875b83c581b82287" +SRCREV = "b74071e607e824d3adbe6bfbe0c9a720f91f3662" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index b6130f79..42d86b7a 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "6f0873134652fb5cba3d340075fdf99989c462b4" +SRCREV = "35516bfec49c5da9b0e6bcd0731bb5d5b7983944" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 6473fa15..e2c035bb 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -36,4 +36,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "583dcc6d31bb44d9d36c6a18dd71d54cbb6d5683" +SRCREV = "40b5d325b6105d4e520c76a079f530168b58efec" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 83f61246..8842b9d6 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "fba55184b93e8f084b45716162581a6132fe94cc" +SRCREV = "279d63c4f6632237e6a0d9c4be91b466876c260a" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.2 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 7bb25462..d01efbee 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "6a8e8a64d3473c5ff890c022b738862a704516dc" +SRCREV = "4dfa95538ff15f59880c93675676ce609b365d89" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index ffe63c76..e3670cf1 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "fdf0ff9dfbc62cdaa86da3b4c47c99806161ec0e" +SRCREV = "b8dbe5524bd15ea0acc03dc5c5c4bf9f0d912f42" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 2d06000d..a8f88c50 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "450156f37356f67f217de760a5df3149684dd99f" +SRCREV = "ad2628329e1685dbccd0ac3c5011336cd2c4f786" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 994be44c..8a05ea2d 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "357a5bd4d6682a50d85c88ba485ed34c745fae85" +SRCREV = "b80a1676c9f5cc0b428f15ac09f6648a80aacb26" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 05741de7..7e930047 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -31,4 +31,4 @@ do_install_append() { QT_MODULE_BRANCH = "dev" -SRCREV = "e3332ee38d27a134cef6621fdaf36687af1b6f4a" +SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index f2fe0635..a4ad0ff6 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "a3190387ab37849cd5ded6fcf350afca8cd17246" +SRCREV = "61c0d8017044263dde21f1db57383f6d19f9eb03" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index b9e9e4d0..de74f4fb 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -10,7 +10,7 @@ DEPENDS += "qtbase qttools-native" do_install_append() { # remove qtquick1 translations - qtquick1 is gone - for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do + for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qmlviewer_*.qm -o -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do rm $transfile done } diff --git a/recipes-qt/qt5/qtvirtualkeyboard/0001-Use-correct-path-to-lib-dir.patch b/recipes-qt/qt5/qtvirtualkeyboard/0001-Use-correct-path-to-lib-dir.patch deleted file mode 100644 index 10b2fa8c..00000000 --- a/recipes-qt/qt5/qtvirtualkeyboard/0001-Use-correct-path-to-lib-dir.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fcb62ce57d5e1a86bfdeced3391321a47250fcce Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Tue, 14 May 2019 09:12:42 +0300 -Subject: [PATCH] Use correct path to lib dir - --L path was pointing to non-existing directory. - -Task-number: QTBUG-75802 -Change-Id: I9a72c57ef63d8da860c220041c2000ce3f1fefa8 -Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> -Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> ---- - src/plugins/lipi-toolkit/plugin/plugin.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/lipi-toolkit/plugin/plugin.pro b/src/plugins/lipi-toolkit/plugin/plugin.pro -index c3a1244..e342af1 100644 ---- a/src/plugins/lipi-toolkit/plugin/plugin.pro -+++ b/src/plugins/lipi-toolkit/plugin/plugin.pro -@@ -26,7 +26,7 @@ include(../../../config.pri) - INCLUDEPATH += \ - ../3rdparty/lipi-toolkit/src/include \ - ../3rdparty/lipi-toolkit/src/util/lib --LIBS += -L$$OUT_PWD/../../lib \ -+LIBS += -L$$OUT_PWD/../../../../lib \ - -lshaperecommon$$qtPlatformTargetSuffix() \ - -lltkcommon$$qtPlatformTargetSuffix() \ - -lltkutil$$qtPlatformTargetSuffix() diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 1f7b6879..a0d5e252 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " -SRC_URI += "file://0001-Use-correct-path-to-lib-dir.patch" - # To enabled Nuance T9 Write support, you need to provide the licensed components # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file. # for example: @@ -73,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "460a7cee80e21df752501161c91b08c2059612fb" +SRCREV = "68375389bf09427103ab3ff2b7fb1517e9b55615" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 34b108c8..ac929622 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "7107f7501df329cf785cec1585767e5d7cbab6c2" +SRCREV = "ae43ed466e62cc198b7ab85c7f40faaada39c968" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 9597ac16..fd66bfed 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "b376dfa4242db85269d138f7e9a77f5bb13964b6" +SRCREV = "29496e3f08e20398e253e6d32bb95879a1a68978" diff --git a/recipes-qt/qt5/qtwebengine/0004-Fix-linker-too-long-argument-list.patch b/recipes-qt/qt5/qtwebengine/0004-Fix-linker-too-long-argument-list.patch deleted file mode 100644 index f42a1d19..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-Fix-linker-too-long-argument-list.patch +++ /dev/null @@ -1,46 +0,0 @@ -From deb9d4818d5206314f290f22330ed3b7fc33d338 Mon Sep 17 00:00:00 2001 -From: Michal Klocek <michal.klocek@qt.io> -Date: Thu, 16 May 2019 21:58:06 +0200 -Subject: [PATCH] Fix linker too long argument list - -For yocto builds linker can get quite long path -since all archives are listed as absolute paths. -This can end up as "execvp: /bin/sh: Argument list too long" - -Use rsp files also for archives. - -Change-Id: I096e2f35ed72b68261bf465e84baddd1f78cd917 -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> ---- - src/core/core_module.pro | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/core/core_module.pro b/src/core/core_module.pro -index e2fa3494..10169a49 100644 ---- a/src/core/core_module.pro -+++ b/src/core/core_module.pro -@@ -25,14 +25,17 @@ isEmpty(NINJA_LIBS): error("Missing library files from QtWebEngineCore linking p - NINJA_OBJECTS = $$eval($$list($$NINJA_OBJECTS)) - # Do manual response file linking for macOS and Linux - --RSP_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}.rsp --for(object, NINJA_OBJECTS): RSP_CONTENT += $$object --write_file($$RSP_FILE, RSP_CONTENT) --macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE) --linux:LIBS_PRIVATE += @$$RSP_FILE -+RSP_OBJECT_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}_o.rsp -+for(object, NINJA_OBJECTS): RSP_O_CONTENT += $$object -+write_file($$RSP_OBJECT_FILE, RSP_O_CONTENT) -+RSP_ARCHIVE_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}_a.rsp -+for(archive, NINJA_ARCHIVES): RSP_A_CONTENT += $$archive -+write_file($$RSP_ARCHIVE_FILE, RSP_A_CONTENT) -+macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_OBJECT_FILE) -+linux:LIBS_PRIVATE += @$${RSP_OBJECT_FILE} - # QTBUG-58710 add main rsp file on windows --win32:QMAKE_LFLAGS += @$$RSP_FILE --linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group -+win32:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} -+linux: LIBS_PRIVATE += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group - else: LIBS_PRIVATE += $$NINJA_ARCHIVES - LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS - # GN's LFLAGS doesn't always work across all the Linux configurations we support. diff --git a/recipes-qt/qt5/qtwebengine/0005-Make-linker-call-look-great-again.patch b/recipes-qt/qt5/qtwebengine/0005-Make-linker-call-look-great-again.patch deleted file mode 100644 index 74afaac1..00000000 --- a/recipes-qt/qt5/qtwebengine/0005-Make-linker-call-look-great-again.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 9ef91351545ef5543b469ef24282334b3d068a2b Mon Sep 17 00:00:00 2001 -From: Michal Klocek <michal.klocek@qt.io> -Date: Fri, 17 May 2019 15:49:23 +0200 -Subject: [PATCH] Make linker call look great again - -Fix issues with messed up linker path: - - * do not use LIBS_PRIVATE on linux at least for passing object - and archive responses files. - * do not use QT and QT_PRIVATE with same libs, it simply - includes libs in LIB and LIB_PRIVATE so doubles linker libs. - * remove bogus dependency for gui and core for webengineheaders pseudo module. - * remove unused egl config flag - -Fixes: QTBUG-75832 -Task-number: QTBUG-75357 -Change-Id: I1720394e636e3f89d546f372b10932dd4ad395fe -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> ---- - src/core/core_chromium.pri | 2 -- - src/core/core_common.pri | 4 ++-- - src/core/core_headers.pro | 1 + - src/core/core_module.pro | 13 ++++++------- - 4 files changed, 9 insertions(+), 11 deletions(-) - -diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri -index 4d8db0d1..d8ef25d8 100644 ---- a/src/core/core_chromium.pri -+++ b/src/core/core_chromium.pri -@@ -33,8 +33,6 @@ RCC_DIR = $$OUT_PWD/$$getConfigDir()/.rcc - # whenever we are cross compiling. - qtConfig(webengine-embedded-build): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES - --qtConfig(egl): CONFIG += egl -- - INCLUDEPATH += $$PWD $$PWD/api - - clang_cl { -diff --git a/src/core/core_common.pri b/src/core/core_common.pri -index 8375d89e..51f5e21b 100644 ---- a/src/core/core_common.pri -+++ b/src/core/core_common.pri -@@ -2,8 +2,8 @@ - # gyp/ninja will take care of the compilation, qmake/make will finish with linking and install. - - TARGET = QtWebEngineCore --QT += qml quick --QT_PRIVATE += quick-private gui-private core-private webenginecoreheaders-private -+QT += qml-private quick-private gui-private core-private -+QT_PRIVATE += webenginecoreheaders-private - - qtConfig(webengine-geolocation): QT += positioning - qtConfig(webengine-webchannel): QT += webchannel -diff --git a/src/core/core_headers.pro b/src/core/core_headers.pro -index 21b5d58c..cd5352eb 100644 ---- a/src/core/core_headers.pro -+++ b/src/core/core_headers.pro -@@ -1,5 +1,6 @@ - TARGET = QtWebEngineCore - CONFIG += no_private_module header_module internal_module no_plist -+QT -= core gui - MODULE = webenginecoreheaders - MODULE_CFG_FILE = qtwebenginecore-config - load(qt_module) -diff --git a/src/core/core_module.pro b/src/core/core_module.pro -index 10169a49..2bfbc65b 100644 ---- a/src/core/core_module.pro -+++ b/src/core/core_module.pro -@@ -10,8 +10,6 @@ linking_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}.pri - error("Could not find the linking information that gn should have generated.") - } - --load(qt_module) -- - api_library_name = qtwebenginecoreapi$$qtPlatformTargetSuffix() - api_library_path = $$OUT_PWD/api/$$getConfigDir() - -@@ -32,10 +30,10 @@ RSP_ARCHIVE_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}_a.rsp - for(archive, NINJA_ARCHIVES): RSP_A_CONTENT += $$archive - write_file($$RSP_ARCHIVE_FILE, RSP_A_CONTENT) - macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_OBJECT_FILE) --linux:LIBS_PRIVATE += @$${RSP_OBJECT_FILE} -+linux:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} - # QTBUG-58710 add main rsp file on windows - win32:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} --linux: LIBS_PRIVATE += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group -+linux:QMAKE_LFLAGS += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group - else: LIBS_PRIVATE += $$NINJA_ARCHIVES - LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS - # GN's LFLAGS doesn't always work across all the Linux configurations we support. -@@ -74,7 +72,7 @@ osx { - # API library as response file to the linker. - QMAKE_LFLAGS += @$${api_library_path}$${QMAKE_DIR_SEP}$${api_library_name}.lib.objects - } else { -- LIBS_PRIVATE += -Wl,-whole-archive -l$$api_library_name -Wl,-no-whole-archive -+ QMAKE_LFLAGS += -Wl,-whole-archive -l$$api_library_name -Wl,-no-whole-archive - } - - win32 { -@@ -87,8 +85,6 @@ win32 { - # and doesn't let Chromium get access to libc symbols through dlsym. - CONFIG -= bsymbolic_functions - --qtConfig(egl): CONFIG += egl -- - linux:qtConfig(separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)" - - REPACK_DIR = $$OUT_PWD/$$getConfigDir() -@@ -157,3 +153,6 @@ OTHER_FILES = \ - $$files(../3rdparty/chromium/*.gypi, true) \ - $$files(../3rdparty/chromium/*.gn, true) \ - $$files(../3rdparty/chromium/*.gni, true) -+ -+load(qt_module) -+ diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch index 7823482b..8000969b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From 249b99b4b54468b428a156f33e2a72066c82e9c2 Mon Sep 17 00:00:00 2001 +From a26e5b6c8cf6fccbd473ca61b2d0038703bb0b99 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 2 Feb 2019 19:28:59 -0800 Subject: [PATCH] chromium: fix build with clang @@ -10,24 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index d223a4f6fd4..1c42c49ea4a 100644 +index 127d0c4..eca0ce1 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -561,13 +561,6 @@ config("compiler") { - } - } - -- # Tells the compiler not to use absolute paths when passing the default -- # paths to the tools it invokes. We don't want this because we don't -- # really need it and it can mess up the goma cache entries. -- if (is_clang && !is_nacl) { -- cflags += [ "-no-canonical-prefixes" ] -- } -- - # C11/C++11 compiler flags setup. - # --------------------------- - if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { -@@ -799,8 +792,6 @@ config("compiler_cpu_abi") { +@@ -746,8 +746,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl) { @@ -36,7 +22,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } if (!is_nacl) { cflags += [ -@@ -813,8 +804,6 @@ config("compiler_cpu_abi") { +@@ -760,8 +758,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia) { @@ -45,7 +31,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] -@@ -823,9 +812,6 @@ config("compiler_cpu_abi") { +@@ -770,9 +766,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -55,7 +41,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } } else { cflags += [ "-EL" ] -@@ -904,10 +890,7 @@ config("compiler_cpu_abi") { +@@ -851,10 +844,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -67,7 +53,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 cflags += [ "-EB" ] ldflags += [ "-EB" ] } -@@ -954,9 +937,6 @@ config("compiler_cpu_abi") { +@@ -901,9 +891,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -77,7 +63,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } } else { cflags += [ -@@ -1013,10 +993,7 @@ config("compiler_cpu_abi") { +@@ -960,10 +947,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips64") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -89,3 +75,17 @@ index d223a4f6fd4..1c42c49ea4a 100644 cflags += [ "-EB", "-mabi=64", +@@ -1137,13 +1121,6 @@ config("compiler_deterministic") { + } + } + } +- +- # Tells the compiler not to use absolute paths when passing the default +- # paths to the tools it invokes. We don't want this because we don't +- # really need it and it can mess up the goma cache entries. +- if (is_clang && !is_nacl) { +- cflags += [ "-no-canonical-prefixes" ] +- } + } + + config("clang_revision") { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch index a0b73a7b..7730e712 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -1,4 +1,4 @@ -From b882013421036a05ea8c909292cc38d05fc29c89 Mon Sep 17 00:00:00 2001 +From ffb83a8c687c18ec05bcf3397f08f6387b4c1ac2 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 5 Feb 2019 14:32:20 -0800 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm @@ -15,20 +15,20 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn -index 05907b481ac..dbc4be143cd 100644 +index b9f1bba..e8a5c58 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn -@@ -74,9 +74,11 @@ if (use_arm_neon_optimizations) { - # implement the CRC32* instructions. These are optional in ARMv8.0." - # - Fuchsia just added a syscall for feature detection. - # TODO(cavalcantii): crbug.com/810125. +@@ -77,9 +77,11 @@ if (use_arm_neon_optimizations) { + # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: + # "All implementations of the ARMv8.1 architecture are required to + # implement the CRC32* instructions. These are optional in ARMv8.0." + defines = [] - if (is_clang && (!is_ios && !is_fuchsia)) { + if (is_clang && !is_ios) { - defines = [ "CRC32_ARMV8_CRC32" ] - if (is_android) { + if (current_cpu == "arm64") { -+ defines += [ "CRC32_ARMV8_CRC32" ] -+ } if (is_android) { ++ defines += [ "CRC32_ARMV8_CRC32" ] ++ } if (is_android) { defines += [ "ARMV8_OS_ANDROID" ] } else if (is_linux || is_chromeos) { defines += [ "ARMV8_OS_LINUX" ] diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 3d4e20d3..5ffabdc6 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -132,15 +132,13 @@ RDEPENDS_${PN}-examples += " \ qtdeclarative-qmlplugins \ " -QT_MODULE_BRANCH_CHROMIUM = "73-based" +QT_MODULE_BRANCH_CHROMIUM = "75-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12 # 5.12.meta-qt5.4 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ - file://0004-Fix-linker-too-long-argument-list.patch \ - file://0005-Make-linker-call-look-great-again.patch \ " SRC_URI_append_libc-musl = "\ file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ @@ -174,8 +172,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "a69029cf9fcfd0c1fcdaafe5cbcbff2d5dd6b5c5" -SRCREV_chromium = "82d848eb4fe3aae8c72a91b2d30c91b407ac5593" +SRCREV_qtwebengine = "33a2c9aed3ee621c91853570087b500c830792e0" +SRCREV_chromium = "f5613a4bc321972b8f72654d4c4bc9ba0c36ffbe" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index e34c705c..5fce7d7f 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "2f419ac89db34d1d3b9ee2e6579a36dfcc36acc3" +SRCREV = "e51341cf20447c42a62281e633513837058f62e5" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index c9b21680..3e71e542 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "7981286485f6fa958133718d31dc3a2c2cc21d8f" +SRCREV = "e108b1f06d18003d7a758b07bc3bea9922b2e116" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index ca637397..eabce2d4 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "d1fc6826660b8c52df4c3b0deb2ab650e0b46767" +SRCREV = "fb2a2003fbb41ac91b319afb56f290b415befb64" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 23b3c774..b8da0d29 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "821e5be0cb9b87def6dbbe1b59a0a3659a2b13ea" +SRCREV = "15ffa33a162325d2d16437a057e79cd3b0e3d61c" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 25aae60d..dc8fca6b 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "fe0475651556878b8b80b38058e5fa743822ddce" +SRCREV = "9da08816e1072fc1391377a38d6afd9e73d756e0" BBCLASSEXTEND =+ "native nativesdk" |