diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-05-04 08:10:26 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-05-05 08:47:13 +0300 |
commit | e117beb73719c17358bfc36a36cdd2b4232b3534 (patch) | |
tree | 13ec6e989970cda7c170583c1119b9d77882bbf5 | |
parent | bede93a8b206ac1bb35bf57896f2f05e91f3ed2d (diff) |
qt5: update submodules
- Update to latest content in Qt 5.15 branch.
- Removed a patch which functionality is now included
in qtbase by commit
"7769d9dbfc0d14cb2903adf092fa2166c5015401 Fix compilation with
GCC 12 (and on Fedora 35 and newer)".
- Added patch to fix build on GCC 11.
Task-number: QTBUG-102791
Change-Id: I234f0e862cdf9c3d8fe7cf79584b4afdfb355f1e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0008-QBuffer-add-missing-limits-include.patch | 26 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch | 60 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtconnectivity_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtserialbus_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 2 |
11 files changed, 38 insertions, 72 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 60d7cda4..fef9e14e 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -34,7 +34,7 @@ SRC_URI += "\ file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0007-Delete-qlonglong-and-qulonglong.patch \ - file://0008-Replace-pthread_yield-with-sched_yield.patch \ + file://0008-QBuffer-add-missing-limits-include.patch \ file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ @@ -201,4 +201,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 = "8b6185564551bf334c98d40b64aa443ddac325f0" +SRCREV = "79b698cea11a66ed35b303c3a17c8ed9f251cad1" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index cb6759fa..e0fee94c 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -44,7 +44,7 @@ do_configure:prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV_qt3d = "708d8739d391486bc752ce757a72d82c79e70853" +SRCREV_qt3d = "8adc1cb84bd9a570a9ffa867ca2967a2328134de" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" SRCREV_FORMAT = "qt3d_assimp" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index a5abd1ad..511c355a 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -27,7 +27,7 @@ SRC_URI += "\ file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0007-Delete-qlonglong-and-qulonglong.patch \ - file://0008-Replace-pthread_yield-with-sched_yield.patch \ + file://0008-QBuffer-add-missing-limits-include.patch \ file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ @@ -144,4 +144,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 = "8b6185564551bf334c98d40b64aa443ddac325f0" +SRCREV = "79b698cea11a66ed35b303c3a17c8ed9f251cad1" diff --git a/recipes-qt/qt5/qtbase/0008-QBuffer-add-missing-limits-include.patch b/recipes-qt/qt5/qtbase/0008-QBuffer-add-missing-limits-include.patch new file mode 100644 index 00000000..03eea8c0 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0008-QBuffer-add-missing-limits-include.patch @@ -0,0 +1,26 @@ +From 58e05c3f9b5c6b3f15ab559c6f93e94d8e1fb360 Mon Sep 17 00:00:00 2001 +From: Marc Mutz <marc.mutz@qt.io> +Date: Wed, 4 May 2022 11:36:48 +0200 +Subject: [PATCH] QBuffer: add missing <limits> include + +Amends 4bc85b9850303fa20206f8774af88d72593d3454. + +Pick-to: 6.3 6.2 5.15 +Change-Id: If826043f01155f9854cc69079a09f1b50b47994c +--- + src/corelib/io/qbuffer.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp +index c485bc28f5..7ebc9c9bb6 100644 +--- a/src/corelib/io/qbuffer.cpp ++++ b/src/corelib/io/qbuffer.cpp +@@ -41,6 +41,8 @@ + #include <QtCore/qmetaobject.h> + #include "private/qiodevice_p.h" + ++#include <limits> ++ + QT_BEGIN_NAMESPACE + + /** QBufferPrivate **/ diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch deleted file mode 100644 index b338170e..00000000 --- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 2bb8b79b41eed87b843eb0159d6fa21a92c4c152 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 27 Jul 2017 08:02:51 -0700 -Subject: [PATCH] Replace pthread_yield with sched_yield - -On Linux pthead_yield is same as sched_yield implementation wise -and sched_yield is available on all libc -implementations on Linux - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 ++-- - tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 5 +++-- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -index 19b3289390..4d0cdf8b5f 100644 ---- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -@@ -35,7 +35,7 @@ - #include "tst_qvariant_common.h" - - #ifdef Q_OS_LINUX --# include <pthread.h> -+# include <sched.h> - #endif - - #include <algorithm> -@@ -369,7 +369,7 @@ protected: - const char *nm = name.constData(); - int tp = qRegisterMetaType<Bar>(nm); - #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) -- pthread_yield(); -+ sched_yield(); - #endif - QMetaType info(tp); - if (!info.isValid()) { -diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -index e397e80fe0..cdb7893e56 100644 ---- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp -@@ -78,6 +78,7 @@ - #include <stdlib.h> - #include <sys/stat.h> - #include <unistd.h> -+#include <sched.h> - #endif - - #include <memory> -@@ -2200,8 +2201,8 @@ public slots: - - #if defined(Q_OS_MAC) - pthread_yield_np(); --#elif defined Q_OS_LINUX && !defined Q_OS_ANDROID -- pthread_yield(); -+#elif defined Q_OS_LINUX -+ sched_yield(); - #endif - if (!sock->waitForConnected()) { - networkTimeout = true; diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index c5331df3..edcd6aaa 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -23,7 +23,7 @@ SRC_URI += "\ file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0007-Delete-qlonglong-and-qulonglong.patch \ - file://0008-Replace-pthread_yield-with-sched_yield.patch \ + file://0008-QBuffer-add-missing-limits-include.patch \ file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ @@ -307,4 +307,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "8b6185564551bf334c98d40b64aa443ddac325f0" +SRCREV = "79b698cea11a66ed35b303c3a17c8ed9f251cad1" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index b9345ef1..15ab1713 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 = "0b5843cf1ecf27865f2e843ea673882f90c7c79f" +SRCREV = "6d1e3330de5755469bfc3e547d5e281010c06337" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index bff7f17f..add32b18 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 = "ba9a685a55cc76cbd8bd31cefbabdcb6677ed251" +SRCREV = "fd8b8107e333330d03d7b354503203a6c3ffe722" # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory do_install:append() { diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index fc30dc0c..0da50085 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 = "05f60c329e66fd08a37c260e338c38f74e8191b5" +SRCREV = "fcc3d346c8aaff74b0054974040d3c1250301563" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index ff0edae7..df7a7abe 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -17,4 +17,4 @@ PACKAGECONFIG[socketcan] = "-feature-socketcan,-no-feature-socketcan,,libsocketc EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "58a24375116daef7929869e28ae3042b6f2afaa3" +SRCREV = "cfd59f57bc247bcbb5c382179b457f641d50a4b7" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 307fce55..792a694d 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -48,7 +48,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "3192049196b18a3cba5d1661b5a260258bed8ff9" +SRCREV = "af9964b88b79ee3716a88beb2a5fb3243ded0139" BBCLASSEXTEND =+ "native nativesdk" |