From 2c94f520b0554c7ad1defb23d8c56a7bd1f8e2ca Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 8 Aug 2019 08:37:48 +0300 Subject: ogl-runtime: fix build on musl libc Use bits/local_lim.h only with glibc as it's not available on musl libc. Change-Id: I07fc3ac9681ecd9b39f39a4c517355016aaf8dd6 Reviewed-by: Mikko Gronoff --- .../ogl-runtime/0003-Fix-build-on-musl-libc.patch | 26 ++++++++++++++++++++++ recipes-qt/qt5/ogl-runtime_git.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch b/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch new file mode 100644 index 00000000..5fe840a0 --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch @@ -0,0 +1,26 @@ +From f654a25f9df6583532798f30181d149d51b23808 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 8 Aug 2019 08:34:47 +0300 +Subject: [PATCH] Fix build on musl libc + +Use bits/local_lim.h only with glibc as it's not available +on musl libc. + +Change-Id: Ibffa4ab5649b544664f99b16e94d6865148eeeb5 +--- + src/foundation/linux/Qt3DSLinuxThread.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/foundation/linux/Qt3DSLinuxThread.cpp b/src/foundation/linux/Qt3DSLinuxThread.cpp +index fa6e069..99c4c3a 100644 +--- a/src/foundation/linux/Qt3DSLinuxThread.cpp ++++ b/src/foundation/linux/Qt3DSLinuxThread.cpp +@@ -35,7 +35,7 @@ + #include "foundation/Qt3DSAssert.h" + #include "foundation/Qt3DSIntrinsics.h" + #include "foundation/Qt3DSBroadcastingAllocator.h" +-#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) ++#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) && defined(__GLIBC__) + #include // PTHREAD_STACK_MIN + #endif + #include diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb index ecc8ba2b..049f885a 100644 --- a/recipes-qt/qt5/ogl-runtime_git.bb +++ b/recipes-qt/qt5/ogl-runtime_git.bb @@ -18,6 +18,7 @@ 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://0003-Fix-build-on-musl-libc.patch \ " SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f" -- cgit v1.2.3 From e1bf33d16f6131b7af2603c0e4a6e952148ef53b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 8 Aug 2019 16:36:58 +0300 Subject: qt5-creator: fix build with musl Change-Id: I4a5f92a94f2df289c9584d7be51caf67c3b3f5e3 Reviewed-by: Mikko Gronoff --- .../0003-Link-with-libexecinfo-on-musl.patch | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch index 9b225a57..d17f60b4 100644 --- a/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch +++ b/recipes-qt/qt5/qt5-creator/0003-Link-with-libexecinfo-on-musl.patch @@ -1,4 +1,4 @@ -From 88afa7173c7d0c97e15d9ee9c58e8c0364799bb7 Mon Sep 17 00:00:00 2001 +From ec7aec2f6c56889c96dc12af46059a7f3d4c3a37 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 16 Jan 2018 13:26:57 +0000 Subject: [PATCH] Link with libexecinfo on musl @@ -6,8 +6,9 @@ Subject: [PATCH] Link with libexecinfo on musl Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- - src/plugins/debugger/debugger.pro | 1 + - 1 file changed, 1 insertion(+) + src/plugins/debugger/debugger.pro | 1 + + src/plugins/qmldesigner/designercore/designercore-lib.pri | 2 ++ + 2 files changed, 3 insertions(+) diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro index f5a34aa0d5..4a1359dd5c 100644 @@ -18,3 +19,16 @@ index f5a34aa0d5..4a1359dd5c 100644 include(shared/shared.pri) +LIBS *= -lexecinfo +diff --git a/src/plugins/qmldesigner/designercore/designercore-lib.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri +index 935b29728e..31527267fd 100644 +--- a/src/plugins/qmldesigner/designercore/designercore-lib.pri ++++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri +@@ -2,6 +2,8 @@ include($$PWD/filemanager/filemanager.pri) + + QT += network + ++LIBS *= -lexecinfo ++ + DEFINES += TEST_EXPORTS + DEFINES += DESIGNER_CORE_LIBRARY + INCLUDEPATH += $$PWD \ -- cgit v1.2.3 From 0d0eca50521fcde987be3b97ffd29442db7435ff Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 12 Aug 2019 14:03:33 +0300 Subject: qt5: update to Qt 5.12.5 Change-Id: I7fcb677b9b9fcb28f2ba7977a4060036cc7a8c98 Reviewed-by: Qt CI Bot Reviewed-by: Mikko Gronoff --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-git.inc | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- recipes-qt/qt5/qtwebglplugin_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 37 files changed, 38 insertions(+), 38 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 411b85d0..24109c18 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -194,4 +194,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 = "d8efc8d718e3b3a0464f321e740541f5b221a5d6" +SRCREV = "6ce9404a6e7ad6ba3ff37f6890fe400c643c3d52" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 38973679..fe6b4b8f 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 = "eab523957ac77542758f0172f0396c865933b200" +SRCREV = "6388eb98a12a639a263ef34553269fc36b582269" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 98678e49..fe7de1f6 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.12.4+git${SRCPV}" +PV = "5.12.5+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index a412626f..e20be7c9 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -142,4 +142,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "d8efc8d718e3b3a0464f321e740541f5b221a5d6" +SRCREV = "6ce9404a6e7ad6ba3ff37f6890fe400c643c3d52" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3c9ef6c5..d8a7779f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -276,4 +276,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "d8efc8d718e3b3a0464f321e740541f5b221a5d6" +SRCREV = "6ce9404a6e7ad6ba3ff37f6890fe400c643c3d52" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index ccca7967..49870f7a 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "8ca2dfa61c61280205af9ff9a6607a1794b5cd25" +SRCREV = "73d5bba61d4a57dfce92da8c8c4dbda311af977b" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d410b353..93dc4ba1 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 = "e7051e75c7004baf19a296cbb4f08a80f397b3f7" +SRCREV = "8b79dba3fd204ca4161ec7e7293cb95d698ce9db" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index dec0b6b4..a9793a9a 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 = "f6be1f73a810514335ab3d27e1d05825a36b06af" +SRCREV = "406b18fdb3704a9e9e66cefbc74e7cff55f1947c" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 6369a6c0..271dfd66 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 = "41d93443ab264b4a0869290929e2de84b4a3c494" +SRCREV = "54a0844f5c9c8ec54fcd740b8b99b05fe4532818" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 05fa8e66..01f1eb33 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "48b4df598c88782f031f3df62964e159feeb20fb" +SRCREV = "0647df8c88d4eaeedd19456b6e382308208e2be1" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 9d872f72..0b8c4918 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 = "4ac7a6de3e5ed4e44ba8923852c71bcc8327d95b" +SRCREV = "656f3c134c0cf00743deba3dfaaff7cb5bd17906" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 84a46f7b..6fcc052d 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 = "7b92bc10c5bb7b5c87421198895eae632d10702b" +SRCREV = "f9664053132affe48a069235eb6561a32d38b2a7" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 2795a843..2cf2d08f 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 = "43ca053b50d7ed663c6734879070186bf28a0d29" +SRCREV = "9100cc7ab04586890fb8f1924b0e06ad3efa7d3e" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 6ca3c354..b3d5cd94 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 = "2e02797471e55684a71979f330a4f507e86e5bcc" +SRCREV_qtlocation = "63cd689a400ee57f7e898e81290366c266537982" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index ff7ee5be..5e7c55aa 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 = "d73b59093ec6fed8138460adcdf3ea0a45519a3c" +SRCREV = "70ad769934d9c82e1d1dd11e96386ce59db7631e" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 5ca64f55..4a2fbe39 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 = "d0b28afe0e57857152a61f4a1d2b0dfe7a4bb6bb" +SRCREV = "ee681478c4b05ab6640c0318ed4fa25d62c6f356" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 246fed6f..9543922c 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 = "780bf06b9a938380eb9221532465db0d3069f38a" +SRCREV = "6df36bebdcb0a12069b0cabfed797ebc719b587d" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 9fa1475e..5a473bf9 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 = "783bfd2182f667817213faf3f54a285057bd2456" +SRCREV = "da06da57002b64cf4bcde0ca708b3275a5f919ae" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 74794eee..4d9eb6c5 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 = "8105e3ed0e77f363ccc6406edd38082ac5cef27d" +SRCREV = "4e156bb26fb904663b0e13df1802dc2e0788b114" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 51c50524..86aaff66 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 = "0cdd47b80f26f5e7bb86b34ce31f07bbe2f49640" +SRCREV = "2bcda9d9f45858ac196d9972162c870ac0a6f217" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 123570f5..3f10a980 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 = "a3d8a431aaed65ee49cc9405f4f1ebd9e268a008" +SRCREV = "efbc554c260f15b5c6dc23759eff96c106997a55" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 6a6ddef0..be9f911b 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 = "45626a32aff0ff2ce279a94e18d58aee5583b4f9" +SRCREV = "db44c53e73479ee8ea98f911078b387735906f38" # 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 22c419a1..d262674a 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 = "6e30eaa1bda78b16fe9f467ad328a085bb3def09" +SRCREV = "70c2dd24800527908e92fb0ce181b939dbd6141e" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 3d7ea28f..75cb75fd 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 = "76a08e3d59a0ef7020464d73df6dd5a01e58c230" +SRCREV = "4fb3e302a30c675b3d515d6eb5dd08301727d4c1" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index bb9a79df..4716dac3 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 = "68327f976994cc941b58c2b2e3eb7726809509fd" +SRCREV = "9509b6d3ee02c3c4a0b98dc95bc9787a3c514a18" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 8fdc29db..a56fac77 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 = "29249cf721863cdebdce5d48ded59e295f58a710" +SRCREV = "347de1dd25366015e3fbbc39ccd1a16ecb18eb2e" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index e9309a9c..a02ae2de 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 = "af241efd145cd6e9c8b8b4107fc0a7b78da16c4c" +SRCREV = "a690022b7e56b2e36a95ef22b854af4c82c5fdc8" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 209c0907..dbbef411 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "41dc0e7c0f3e1183b22d85114b013925a1d44319" +SRCREV = "00556e09790b83b3a2a83020b900e07829eaa0a4" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 264175bc..dbba183d 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "9d6cdde0ae4213eb7cc53baab22e183f3c93507d" +SRCREV = "47d15b1378621041f612b395ded685fa4e6fbbd0" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 0a51ff29..c7360ad3 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 = "2e4246ee71dd6689d3731e380f393185a1e3bd8e" +SRCREV = "5ca9f28f4b272d3265b97c16029071a0070195a6" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index d4f7363d..687556b1 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 = "b79562247f6dfe2ad26804c0eca891a529179dd0" +SRCREV = "8a610433fa26c2601d669b45e903566287923bec" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 34882215..07a6d193 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -175,8 +175,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "80674ddb452c6926a01fcb0f35699252cf452043" -SRCREV_chromium = "bd792030e194a0bcce4defbf2298041244b54121" +SRCREV_qtwebengine = "a2c365cb1f22431845380159c29048da76c2b2a9" +SRCREV_chromium = "f7765bc85318b9f7cb8090b85d268238fa5a4cfa" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 9d7e2068..38293bdd 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 = "ccf8f2f2b1729149965921462d9c2d3e5dd8f57a" +SRCREV = "ae907e4c0aa5ae78435138f86a7bd888ef0e1e9a" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index e00a3e5c..0fda9b4b 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 = "9db762ad97338567a614177564f68fee780fefce" +SRCREV = "dcf08a4c702f90cc092629078de48a0ad0d68562" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 41159731..27d85856 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 = "9ca4eec0bc5c0fa9d4ab76df5eb06129765bc09a" +SRCREV = "de7e4c93c0f17e4608abad31bf7cba06b8fc2e19" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 781a07c2..3b267c6c 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 = "2fe9b682bbba406356a38cc4661330259dd97b97" +SRCREV = "10cc8dece051ec715a0db5c48ebcecebfe9d6c63" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index a2b845b2..078dc73e 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 = "4efc4b1d0c11b68e1140734f659b22ce266d1bd6" +SRCREV = "1fe82f967320b3c65f29ed704862f8c34a6c0c87" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3