diff options
author | Francesco Montefoschi <francesco.monte@gmail.com> | 2022-11-27 23:26:17 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2022-12-06 16:08:11 +0100 |
commit | 2df0f760c200c932cfbb61a0ad684896dfe49e07 (patch) | |
tree | 063e6bc358685662d4542b0f5a0175545d3e2e73 | |
parent | 1a917695e439d602ec85e1db4e0478533cfbfaa8 (diff) |
qt5: upgrade to v5.15.7-lts-lgpl
* update to new SRCREVs where available
* https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.7/release-note.md
Signed-off-by: Francesco Montefoschi <francesco.monte@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
43 files changed, 42 insertions, 154 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 32a83b5b..8f812e4a 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -46,7 +46,6 @@ SRC_URI += "\ file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ - file://0020-qbytearraymatcher-Include-limits-header.patch \ file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \ file://0022-testlib-don-t-track-the-build-or-source-directories.patch \ " @@ -203,4 +202,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 = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9" +SRCREV = "358aebba7280d6d2b59b1f740747a4a3d1b7a54a" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index da930dd4..81404332 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -38,6 +38,6 @@ do_configure:prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "92853c6e1aa95dfb7d605959ff44ccc124fbd62c" +SRCREV = "bf79d391c0ca24b5787cdc82dc95df71c53c2d02" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index d8d60217..74499495 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.15.4+git${SRCPV}" +PV = "5.15.7+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 11dd2c88..f2cd930d 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -39,7 +39,6 @@ SRC_URI += "\ file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ - file://0020-qbytearraymatcher-Include-limits-header.patch \ file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \ file://0022-testlib-don-t-track-the-build-or-source-directories.patch \ " @@ -147,4 +146,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 = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9" +SRCREV = "358aebba7280d6d2b59b1f740747a4a3d1b7a54a" diff --git a/recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch b/recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch deleted file mode 100644 index 4054f841..00000000 --- a/recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 36691306941c8835a5c77d8a7170f04c3e432a08 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 2 Mar 2021 13:18:47 -0800 -Subject: [PATCH] qbytearraymatcher: Include <limits> header - -gcc11 complains - error: 'numeric_limits' is not a class template - | 344 | template<> class numeric_limits<const QT_PREPEND_NAMESPACE(qfloat16)> - -This is because its missing right header which perhaps is included -implicitly in older compilers - -Change-Id: Ic4e697c8a4c1b6b5448ba56f1749ae7293125ccd -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/corelib/text/qbytearraymatcher.h | 1 + - src/corelib/tools/qoffsetstringarray_p.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..7b80e2becd 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -40,6 +40,7 @@ - #ifndef QBYTEARRAYMATCHER_H - #define QBYTEARRAYMATCHER_H - -+#include <limits> - #include <QtCore/qbytearray.h> - - QT_BEGIN_NAMESPACE -diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -index 4dd9e9603b..e26a57ff43 100644 ---- a/src/corelib/tools/qoffsetstringarray_p.h -+++ b/src/corelib/tools/qoffsetstringarray_p.h -@@ -55,6 +55,7 @@ - - #include <tuple> - #include <array> -+#include <limits> - - QT_BEGIN_NAMESPACE - diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4b03fb55..b6b9f1ca 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -35,7 +35,6 @@ SRC_URI += "\ file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ - file://0020-qbytearraymatcher-Include-limits-header.patch \ file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \ file://0022-testlib-don-t-track-the-build-or-source-directories.patch \ " @@ -310,4 +309,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9" +SRCREV = "358aebba7280d6d2b59b1f740747a4a3d1b7a54a" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 4f5d34d2..edfbaf34 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 = "464eeabb4045f6372be3c0425f2c6f9c4d24f54e" +SRCREV = "df56d9b4e6373b5975b6cf636ffb5ccdebe9e9fc" # 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 4d79dbb8..c7221450 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "c22a7b05342fc6bba710f9f259cb56f84885b886" +SRCREV = "09e33f25138deceaf810b2ad4936ae8ed9dfe7a8" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index e81473b8..20500238 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 = "3787f647cba0379594157fd771b3d0713a0e88ff" +SRCREV = "15a66695ccc64f8b276f01b10fde427e3b889745" diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmldebug-Include-limits-header.patch b/recipes-qt/qt5/qtdeclarative/0001-qmldebug-Include-limits-header.patch deleted file mode 100644 index d803a294..00000000 --- a/recipes-qt/qt5/qtdeclarative/0001-qmldebug-Include-limits-header.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ab263a3e79a36d3e6536adc900b296cdf27f09ae Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 4 Mar 2021 14:37:06 -0800 -Subject: [PATCH] qmldebug: Include limits header - -this is needed to solve -qmldebug/qqmlprofilerevent_p.h:314:65: error: 'numeric_limits' is not a member of 'std' - -Its exposed bu gcc11 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..f778628f8c 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -47,6 +47,7 @@ - #include <QtCore/qvarlengtharray.h> - #include <QtCore/qmetatype.h> - -+#include <limits> - #include <initializer_list> - #include <type_traits> - --- -2.30.1 - diff --git a/recipes-qt/qt5/qtdeclarative/0001-yarr-Include-limits-for-numeric_limits.patch b/recipes-qt/qt5/qtdeclarative/0001-yarr-Include-limits-for-numeric_limits.patch deleted file mode 100644 index 1a77c04b..00000000 --- a/recipes-qt/qt5/qtdeclarative/0001-yarr-Include-limits-for-numeric_limits.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d99fda38487eee9a660101ce73c488680c485668 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 3 Mar 2021 07:26:21 -0800 -Subject: [PATCH] yarr: Include <limits> for numeric_limits - -Fixes -src/3rdparty/masm/yarr/Yarr.h:46:44: error: 'numeric_limits' is not a member of 'std' - 46 | static const unsigned offsetNoMatch = std::numeric_limits<unsigned>::max(); - | ^~~~~~~~~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/3rdparty/masm/yarr/Yarr.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h -index ccf78f9880..cbb42c60d8 100644 ---- a/src/3rdparty/masm/yarr/Yarr.h -+++ b/src/3rdparty/masm/yarr/Yarr.h -@@ -27,7 +27,7 @@ - - #pragma once - --#include <limits.h> -+#include <limits> - #include "YarrErrorCode.h" - - namespace JSC { namespace Yarr { --- -2.30.1 - diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index f26571a9..9e0a7f4b 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -16,8 +16,6 @@ LIC_FILES_CHKSUM = " \ # 5.15.meta-qt5.1 SRC_URI += " \ file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ - file://0001-yarr-Include-limits-for-numeric_limits.patch \ - file://0001-qmldebug-Include-limits-header.patch \ " LDFLAGS:append:riscv64 = " -pthread" @@ -55,6 +53,6 @@ do_install:append:class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "eca023e1eb19c6d968701595e99f648efcd1c0c7" +SRCREV = "0d60f81bf61a69bc859a269ae562b2610d224e02" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 62f957bc..94eea875 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -16,4 +16,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "6e2c9fe95af305cf7469afd1887dcbc3cb67c1be" +SRCREV = "674f21205720610eda7ad1ae1e4a8692fc959f69" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index fccb5dae..9e45086e 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 = "5b8120bddcc2b3835e726d3f7cf13810f4a9f130" +SRCREV = "dfacc1706eaf9ec306e2f660be393ecffe9637fb" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index a71b63f7..7bc8c592 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 = "a9857aa8d00178d6bf7b711a35705c2c7d1441f0" +SRCREV = "078bc3fa18ea102525bcd831c3b4ed4cca7dc74e" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index f46dc27a..bdff01a0 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -35,7 +35,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 = "8a1d08112386c165167bc5033d1a507d64110460" +SRCREV_qtlocation = "e0d60def8e32fb255ee003742f165f2033d25e1d" SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index 46987ec2..292e12fe 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 = "77137af2aa5468adebfe13f13d87490cf684cffd" +SRCREV = "0dcf0bb9cf72254d77cea7558b3c04c40a48f029" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index ad55583b..fb7d6a9f 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -40,7 +40,7 @@ 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 = "d07f4385c55e5abe36250c3d7f6b130a1bfb75dc" +SRCREV = "eeb34aae03b9395c9b3b45ab7c4f3055d086e894" # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory do_install:append() { diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index c20dddac..42d54d0d 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 = "291f9106a764086f720110895f104c5e9a069d6b" +SRCREV = "361be878e4a3d098a119dd7f648ae8fc29e14674" diff --git a/recipes-qt/qt5/qtpdf_git.bb b/recipes-qt/qt5/qtpdf_git.bb index dd77bc66..418f4498 100644 --- a/recipes-qt/qt5/qtpdf_git.bb +++ b/recipes-qt/qt5/qtpdf_git.bb @@ -141,7 +141,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtwebengine:" 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://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch \ + file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 # 5.15.meta-qt5.15 diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index ccc25fc8..adb5998b 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 = "194024fb2944bbca40fcf072cf95644f5ca439cf" +SRCREV = "267f179714eff834f95ce79346d7f1215e94b24f" diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index e3a8e140..7f9d8c9f 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb @@ -21,7 +21,7 @@ FILES:${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV_qtquick3d = "7a8bdd666c8653f80cdee804e679783a461d5f43" +SRCREV_qtquick3d = "cb8f82eeeb230c3ef38ac6e7f5ca393ccb8e6e1f" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" SRCREV_FORMAT = "qtquick3d_assimp" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index c7592796..81d9aa29 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative qtdeclarative-native" SRC_URI += "file://0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch" -SRCREV = "83cbcc244ac1c1cf65c8b407e0fd905f9d3a41ac" +SRCREV = "8b7daceeb829b4dbf52c95510d4934d1c6df380d" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index b0e00e69..bd5a4a22 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 = "3f0b75ac45c6377093ddec87a869bd1b8fa11857" +SRCREV = "be434da57b1631a29fad3d9c4557f251ca13b71f" diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb index 73cff70b..e986f9e8 100644 --- a/recipes-qt/qt5/qtquicktimeline_git.bb +++ b/recipes-qt/qt5/qtquicktimeline_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtbase qtdeclarative" -SRCREV = "06c4975d21c2b043213eb0412becbed240c9baf3" +SRCREV = "fca37ec8141012818a0518205da11f5f6b3d414c" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index d02defc7..4722df9f 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "d0a3719da2797efd95d90043ad2ba4572a2a8533" +SRCREV = "62bf1183d12abe98df45139ccf15848b989b2e36" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index bf272371..4dbb81f6 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 = "53beea814535e3f27bb2c952856632fba545b1c3" +SRCREV = "c0e5685aab498d443b17250dddef6cdf6fdec108" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15 # 5.15.meta-qt5.1 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index efaccf20..55221465 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 = "819dc6dc360b90889b6bf9cc961659803589b2df" +SRCREV = "d9574231fd48a2961457f74ce6620550cff45847" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index cf02113b..daa55fcb 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 = "d3394c81f10e5d5c40663e88e185335549e4bc12" +SRCREV = "6a0cd4b02964100ef3e71457a5b5396c88a22660" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index d79c8c50..3112efce 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 = "a90c9fc5ebce3f7d7120563c12103c605aeb8eea" +SRCREV = "cf4e7a066f7ce2a17dbe961cd50366a4eb3e2672" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index e3ab978d..dd8db4ba 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 = "b13c2d7fe8810af13a3f9400ecff4ff7c4c7ab51" +SRCREV = "a5d2402512775c78bde93a800ec833dae9e2ffbe" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 1be3db16..771d84d2 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -39,7 +39,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ " -SRCREV = "7e2102f2ebb2b42e9249bab3327f939204053100" +SRCREV = "7fda805bf006e10648606ddd8482cc9aae7476cb" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 6ef215d7..3de21259 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 = "8f0756f2c29cc7bb7e9a016612f15779193109ad" +SRCREV = "1ec28c4aa6b0f9772e99bd8d556bb4552aafcf72" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index f90e4ad4..52640ecf 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 = "436e9407c5dd2e2aa26d7c277f0f0e614d73b8cc" +SRCREV = "d8b87cbb28561654121d44b5d7dedb361e6f773c" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index d2a44621..6a1fba7b 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -49,7 +49,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "f1e6c8764d187e9c1c642f6b11020ea513822cd1" +SRCREV = "533fff12f7c4beb177b56b766c71b1c7384e6229" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 454d27ef..8101e976 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 = "fe29fe07daf7e43fcd6f5fd135b8567d83260fb4" +SRCREV = "a4b41a45a0f583ee7fd887cfb6bf4a5b1cf53aa0" diff --git a/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch b/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch index 48ed82e2..7b175dda 100644 --- a/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch +++ b/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch @@ -1,13 +1,13 @@ From 8031326dbf1252f76f6aac9dcef5611fd7be5fa4 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Fri, 12 Mar 2021 15:47:50 +0100 -Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.4 +Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.7 * to avoid incompatibility when searching for qtwebchannel: CMake Error at /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.browser/0.5.0-14+gitAUTOINC+4b5398142b-r0/recipe-sysroot/usr/lib/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake:116 (find_package): Could not find a configuration file for package "Qt5WebChannel" that is - compatible with requested version "5.15.4". + compatible with requested version "5.15.7". The following configuration files were considered but not accepted: @@ -31,4 +31,4 @@ index 83823ceee..d5e64505d 100644 CONFIG += warning_clean -MODULE_VERSION = 5.15.10 -+MODULE_VERSION = 5.15.4 ++MODULE_VERSION = 5.15.7 diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 5587ede1..9e3712b9 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -156,7 +156,7 @@ PV = "5.15.10+git${SRCPV}" 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://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch \ + file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 # 5.15.meta-qt5.15 diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index ab1001f6..a9d320e6 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 = "37f4fdd9aa3315467a6c893059a9ef7270fc2388" +SRCREV = "e0a130b9a4d83f90e4b3965fd2644a6acc48cbc4" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 22792a9b..9d3be6e5 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 = "d57f4a2226153848bd2fd0ee6d10f5146b1e8554" +SRCREV = "4fe33a26f24770069b264771e89361eeecc646f3" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 08b0218e..b47f7cf5 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -23,4 +23,4 @@ python() { if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') } -SRCREV = "d7f28171b291e6a3d660b847b40cac3c55295471" +SRCREV = "575089ad2fd15568ab73aded0b7ef3bb92e72e88" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 54a65ba4..25fd4e4f 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 = "069b45405667c30fa746541d5e3cb328163cfd15" +SRCREV = "93d090c6d3f9e16683ef86028cf1e72a852929f5" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 5e2245c0..a04e5083 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,6 +25,6 @@ do_configure:prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "82a7136a7caece13767c3b2808b2aad9d3d79dd3" +SRCREV = "97209f5679a72cc926d14ba689b801db3af4f96b" BBCLASSEXTEND =+ "native nativesdk" |