From 50e35581d75db2487b667662713e3e4608b7cd05 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 25 Feb 2020 00:51:31 +0100 Subject: qtbase: update patches for latest 5.15 revision Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 12 +- recipes-qt/qt5/qtbase-native_git.bb | 12 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 2 +- ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 14 +-- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 4 +- ...ump-path-length-from-256-to-512-character.patch | 6 +- ...-unknown-features-instead-of-erroring-out.patch | 2 +- ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 4 +- .../0007-Delete-qlonglong-and-qulonglong.patch | 2 +- ...08-Replace-pthread_yield-with-sched_yield.patch | 10 +- ...-Add-OE-specific-specs-for-clang-compiler.patch | 2 +- ...-Invert-conditional-for-defining-QT_SOCKL.patch | 2 +- ..._qlocale-Enable-QT_USE_FENV-only-on-glibc.patch | 4 +- ...mon-gcc-base.conf-Use-I-instead-of-isyste.patch | 6 +- .../qtbase/0013-Disable-ltcg-for-host_build.patch | 2 +- ...gExtras.cmake.in-cope-with-variable-path-.patch | 2 +- ...-corelib-Include-sys-types.h-for-uint32_t.patch | 2 +- ...KE_CXX.COMPILER_MACROS-for-clang-on-linux.patch | 2 +- ...-use-of-timeval-portable-for-64bit-time_t.patch | 70 ++++++++++++ .../0017-qfloat16-check-for-__ARM_FP-2.patch | 34 ------ ...-use-of-timeval-portable-for-64bit-time_t.patch | 70 ------------ ...r-FE_-macros-are-not-defined-for-every-pl.patch | 123 +++++++++++++++++++++ .../qtbase/0019-Always-build-uic-and-qvkgen.patch | 4 +- ...20-Avoid-renameeat2-for-native-sdk-builds.patch | 12 +- .../0021-Bootstrap-without-linkat-feature.patch | 6 +- ...r-FE_-macros-are-not-defined-for-every-pl.patch | 123 --------------------- recipes-qt/qt5/qtbase_git.bb | 9 +- 27 files changed, 253 insertions(+), 288 deletions(-) create mode 100644 recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch delete mode 100644 recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch delete mode 100644 recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch create mode 100644 recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch delete mode 100644 recipes-qt/qt5/qtbase/0022-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 2fee1441..964589cd 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -22,8 +22,8 @@ require qt5-git.inc FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared -# 5.14.meta-qt5-shared.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared +# 5.15.meta-qt5-shared.1 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -41,13 +41,13 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0017-qfloat16-check-for-__ARM_FP-2.patch \ - file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ + file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ + file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ " # common for qtbase-native and nativesdk-qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native -# 5.14.meta-qt5-native.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native +# 5.15.meta-qt5-native.1 SRC_URI += " \ file://0019-Always-build-uic-and-qvkgen.patch \ file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \ diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 0e36004d..ba707cc8 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -17,8 +17,8 @@ require qt5-native.inc require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared -# 5.14.meta-qt5-shared.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared +# 5.15.meta-qt5-shared.1 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -36,13 +36,13 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0017-qfloat16-check-for-__ARM_FP-2.patch \ - file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ + file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ + file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ " # common for qtbase-native and nativesdk-qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native -# 5.14.meta-qt5-native.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native +# 5.15.meta-qt5-native.1 SRC_URI += " \ file://0019-Always-build-uic-and-qvkgen.patch \ file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \ diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 95e236ae..872212f6 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 0d13aba5a2ab1794bfea5a3bbf2096da17f0cae1 Mon Sep 17 00:00:00 2001 +From 45fbe12b5cff5825e078f731c2e8e3d294b9a1d2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform diff --git a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch index be51019d..7cbe46ed 100644 --- a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch +++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch @@ -1,4 +1,4 @@ -From 8409ffc14e5176595c7d591ebd07f5b49af8d245 Mon Sep 17 00:00:00 2001 +From f05a53357489590c3cd8cd848a34f3aeb4bebe18 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS @@ -19,10 +19,10 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 9b672327ef..f0820b4f4e 100644 +index 4c1c3a612b..8b0f6b16ee 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) +@@ -8,7 +8,7 @@ if (NOT TARGET Qt5::qmake) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") !!ELSE @@ -31,7 +31,7 @@ index 9b672327ef..f0820b4f4e 100644 !!ENDIF _qt5_Core_check_file_exists(${imported_location}) -@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc) +@@ -23,7 +23,7 @@ if (NOT TARGET Qt5::moc) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") !!ELSE @@ -40,7 +40,7 @@ index 9b672327ef..f0820b4f4e 100644 !!ENDIF _qt5_Core_check_file_exists(${imported_location}) -@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc) +@@ -40,7 +40,7 @@ if (NOT TARGET Qt5::rcc) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") !!ELSE @@ -50,7 +50,7 @@ index 9b672327ef..f0820b4f4e 100644 _qt5_Core_check_file_exists(${imported_location}) diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..582c52169e 100644 +index a814678f7b..8546e4b4dc 100644 --- a/src/dbus/Qt5DBusConfigExtras.cmake.in +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) @@ -72,7 +72,7 @@ index 1d947159e2..582c52169e 100644 _qt5_DBus_check_file_exists(${imported_location}) diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..8fe9b3c0b5 100644 +index 236d1d4159..f25a73a78b 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 6d8f5f96..3fb6bc87 100644 --- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,4 +1,4 @@ -From 73c6762cc7d4c3449fc152f706c8d0efa2f7e65e Mon Sep 17 00:00:00 2001 +From ea0973fb18ca76d292b3c7fb7a29be547f6d95e1 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the @@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index f0f77fe68e..8ef04cb64f 100644 +index 835fea0c77..dea00e28b9 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -183,7 +183,10 @@ void QLibrarySettings::load() diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch index a40c0563..3a223c2c 100644 --- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch @@ -1,4 +1,4 @@ -From fad25d26b6ec478d0b22bc4fbfec65a6665608c0 Mon Sep 17 00:00:00 2001 +From f83f21998ba43dcdb02de360ba9997f909c5d677 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters @@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri -index 81c84b28ef..bf40b68835 100644 +index e775bf046e..a20eded987 100644 --- a/configure.pri +++ b/configure.pri -@@ -872,10 +872,10 @@ defineTest(qtConfOutput_preparePaths) { +@@ -876,10 +876,10 @@ defineTest(qtConfOutput_preparePaths) { $${currentConfig}.output.qconfigSource = \ "/* Installation Info */" \ diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch index b8a0b716..e1536f40 100644 --- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch @@ -1,4 +1,4 @@ -From 24c469b3c9599aa106c44d1df48fb04db5b8c904 Mon Sep 17 00:00:00 2001 +From 6e0bfe33f74f4a24d7f4c9adb5b96ca6ae844308 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 24 Oct 2016 09:45:18 +0300 Subject: [PATCH] Disable all unknown features instead of erroring out diff --git a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch index 95df5efd..b4f253e7 100644 --- a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +++ b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch @@ -1,4 +1,4 @@ -From 8143b5913e50d26ef39fbbed5f1e28ff74a57d20 Mon Sep 17 00:00:00 2001 +From 0a279228c6a3eb52e434aeb31504762dd29e2f5f Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 11 May 2016 15:20:41 +0200 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS @@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach 2 files changed, 10 insertions(+) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 50364765fb..e101a2e841 100644 +index 4c3086a1f6..f330d28448 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch index d683d4d9..a8161770 100644 --- a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch +++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch @@ -1,4 +1,4 @@ -From 41d43606a50fbeae73d585ed727ec13e36f785c0 Mon Sep 17 00:00:00 2001 +From bc9aa54b9930635ddceb918bfc94871e2fc3d413 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Wed, 7 Jun 2017 21:00:49 +0900 Subject: [PATCH] Delete qlonglong and qulonglong 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 index 07110739..1dbb2855 100644 --- 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 @@ -1,4 +1,4 @@ -From 4d8c0a0524ceea0590f15d87a4aa604a488bedc5 Mon Sep 17 00:00:00 2001 +From fbe7fd996b86c087d64864bcce154d382701ab6f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 27 Jul 2017 08:02:51 -0700 Subject: [PATCH] Replace pthread_yield with sched_yield @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 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 12c29a6e13..7d31799da6 100644 +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 @@ @@ -26,7 +26,7 @@ index 12c29a6e13..7d31799da6 100644 #endif #include -@@ -368,7 +368,7 @@ protected: +@@ -369,7 +369,7 @@ protected: const char *nm = name.constData(); int tp = qRegisterMetaType(nm); #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) @@ -36,7 +36,7 @@ index 12c29a6e13..7d31799da6 100644 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 0546c6ba7d..f602b035d6 100644 +index 099aa5fb51..c2d310458e 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -78,6 +78,7 @@ @@ -47,7 +47,7 @@ index 0546c6ba7d..f602b035d6 100644 #endif #include "private/qhostinfo_p.h" -@@ -2178,8 +2179,8 @@ public slots: +@@ -2199,8 +2200,8 @@ public slots: #if defined(Q_OS_MAC) pthread_yield_np(); diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index b30a823f..f5e21333 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch @@ -1,4 +1,4 @@ -From ba7dda9ef0e33103e26fee2e41f25d8c0e3bfb78 Mon Sep 17 00:00:00 2001 +From ed82988ac6aca8c6927211edefa4e548cc284dfd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 09:11:44 -0700 Subject: [PATCH] Add OE specific specs for clang compiler diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch index e58b1ebc..a0b882ca 100644 --- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch +++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch @@ -1,4 +1,4 @@ -From 03e57f526db46b93b2bcbd01974446b9819e73e7 Mon Sep 17 00:00:00 2001 +From 1d03a7f53ca07ffcee37ec2a6606435c18585ce7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 09:44:48 -0700 Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T 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 8a705415..f579cb5a 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 f3befb762f2e69fa1f8a444ca9b392b4cb48ba5f Mon Sep 17 00:00:00 2001 +From 146fcda8319f17e01af676ee4151d83f302c6d6e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 10:11:50 -0700 Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp -index 8f434acb29..53dc0d9121 100644 +index ec85a6c5c6..15bf7d106f 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -46,7 +46,7 @@ diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch index 5186c2d6..a35746c6 100644 --- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch +++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch @@ -1,4 +1,4 @@ -From 382e44787d366428892161881fdc3c2481cefc04 Mon Sep 17 00:00:00 2001 +From 3184d1f75e0312826efd1227519b46b5cb464299 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 14 Feb 2018 17:08:43 -0800 Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem @@ -22,7 +22,7 @@ Signed-off-by: Martin Jansa 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf -index aead581478..8e06a069b4 100644 +index 2499c8b6d8..2e79e083cd 100644 --- a/mkspecs/common/clang.conf +++ b/mkspecs/common/clang.conf @@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch @@ -35,7 +35,7 @@ index aead581478..8e06a069b4 100644 QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_LTCG = -flto=thin diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf -index 4d82321cba..0b03ec99a6 100644 +index 1f919d270a..adf3fead32 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch index 83f4e29c..fa348096 100644 --- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch @@ -1,4 +1,4 @@ -From 8a2c2006676b0cb1a579efabb0ab24a277024b54 Mon Sep 17 00:00:00 2001 +From bbf475d3c2415a78a8701bd3acaf69032721d597 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Oct 2018 09:54:57 +0300 Subject: [PATCH] Disable ltcg for host_build diff --git a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index f9993f51..59fd70b0 100644 --- a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch @@ -1,4 +1,4 @@ -From 73b4276844b4fadc42375f713b51031b5c7c15b1 Mon Sep 17 00:00:00 2001 +From 44e4a803fd41ff975cdd6c90afa4be66396e14a4 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 27 Oct 2018 12:29:31 +0000 Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to diff --git a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch index 71f4658f..dbad9cf6 100644 --- a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch +++ b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch @@ -1,4 +1,4 @@ -From 3a147b314b96a3f2bd7ded41a9c5fe685985fa29 Mon Sep 17 00:00:00 2001 +From 54936e8ad2e9329edacc6e8150087d463c14fac4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 6 Dec 2018 11:47:52 -0800 Subject: [PATCH] corelib: Include sys/types.h for uint32_t diff --git a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch index a893d90d..138cbad3 100644 --- a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch +++ b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch @@ -1,4 +1,4 @@ -From 90f1d71d609495ba305d052017df4d3fb801401c Mon Sep 17 00:00:00 2001 +From d45c22d639c58d20a15ffc70c28a00e800c12bf4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 6 Dec 2018 15:06:20 -0800 Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux diff --git a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch new file mode 100644 index 00000000..133c43bb --- /dev/null +++ b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch @@ -0,0 +1,70 @@ +From b9b6172194de411c2c68e81c427a79b0a1227e3e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 25 Nov 2019 08:27:39 -0800 +Subject: [PATCH] input: Make use of timeval portable for 64bit time_t + +This patch avoids using time field of input_event structure which is not available +on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new +and keeps old input.h implementation functional as well. + +See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign +Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610] +Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845 +--- + .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++- + .../input/evdevtouch/qevdevtouchhandler.cpp | 7 ++++++- + 2 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +index 3555763b89..e7dc57c027 100644 +--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp ++++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +@@ -58,6 +58,11 @@ + #include + #endif + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + QT_BEGIN_NAMESPACE + + Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") +@@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state) + qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); + + struct ::input_event led_ie; +- ::gettimeofday(&led_ie.time, 0); ++ struct timeval tval; ++ ::gettimeofday(&tval, 0); ++ led_ie.input_event_sec = tval.tv_sec; ++ led_ie.input_event_usec = tval.tv_usec; + led_ie.type = EV_LED; + led_ie.code = led; + led_ie.value = state; +diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +index 78728ef4ce..1d65f9b9f7 100644 +--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp ++++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +@@ -58,6 +58,11 @@ + #include + #endif + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #include + + #if QT_CONFIG(mtdev) +@@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data) + + // update timestamps + m_lastTimeStamp = m_timeStamp; +- m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0; ++ m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0; + + m_lastTouchPoints = m_touchPoints; + m_touchPoints.clear(); diff --git a/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch deleted file mode 100644 index 27fc8a83..00000000 --- a/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e9b0666990eb91c18f42f4f15e863273462f544a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 5 Oct 2019 16:21:08 -0700 -Subject: [PATCH] qfloat16: check for __ARM_FP & 2 - -Clang hides vcvt_f16_f32() and vcvt_f32_f16() behind (__ARM_FP & 2) where 2 refers to -mfpu=fp-armv8. -However, GCC would only build this code if -march=armv8.2-a+fp16 is passed as well. - -global/qfloat16.cpp:149:31: error: use of undeclared identifier 'vcvt_f16_f32' - vst1_f16(out_f16 + i, vcvt_f16_f32(vld1q_f32(in + i))); - ^ -global/qfloat16.cpp:159:28: error: use of undeclared identifier 'vcvt_f32_f16' - vst1q_f32(out + i, vcvt_f32_f16(vld1_f16(in_f16 + i))); - ^ - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/corelib/global/qfloat16.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp -index c868e879b7..0c9bb80cb2 100644 ---- a/src/corelib/global/qfloat16.cpp -+++ b/src/corelib/global/qfloat16.cpp -@@ -205,7 +205,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype - #undef f16cextern - } - --#elif defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__) -+#elif defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__) && (__ARM_FP & 2) - static inline bool hasFastF16() - { - return true; diff --git a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch deleted file mode 100644 index b0de9c26..00000000 --- a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 54328b4942eb8cc884bdf41d58f2408a60ea7605 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 25 Nov 2019 08:27:39 -0800 -Subject: [PATCH] input: Make use of timeval portable for 64bit time_t - -This patch avoids using time field of input_event structure which is not available -on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new -and keeps old input.h implementation functional as well. - -See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign -Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610] -Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845 ---- - .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++- - .../input/evdevtouch/qevdevtouchhandler.cpp | 7 ++++++- - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -index 3555763b89..e7dc57c027 100644 ---- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -@@ -58,6 +58,11 @@ - #include - #endif - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - QT_BEGIN_NAMESPACE - - Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") -@@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state) - qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); - - struct ::input_event led_ie; -- ::gettimeofday(&led_ie.time, 0); -+ struct timeval tval; -+ ::gettimeofday(&tval, 0); -+ led_ie.input_event_sec = tval.tv_sec; -+ led_ie.input_event_usec = tval.tv_usec; - led_ie.type = EV_LED; - led_ie.code = led; - led_ie.value = state; -diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp -index c51db59e1f..1f3726e291 100644 ---- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp -+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp -@@ -58,6 +58,11 @@ - #include - #endif - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - #include - - #if QT_CONFIG(mtdev) -@@ -576,7 +581,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data) - - // update timestamps - m_lastTimeStamp = m_timeStamp; -- m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0; -+ m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0; - - m_lastTouchPoints = m_touchPoints; - m_touchPoints.clear(); diff --git a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch new file mode 100644 index 00000000..e9e29941 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch @@ -0,0 +1,123 @@ +From f2da5661a2a8bc2037a4d40fd1db16522af6d7a8 Mon Sep 17 00:00:00 2001 +From: Nicola Lunghi +Date: Wed, 5 Feb 2020 15:32:25 +0000 +Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform + +the FE_INEXACT, FE_UNDERFLOW, FE_OVERFLOW, FE_DIVBYZERO, FE_INVALID are defined +only for platforms with fp engine. + +Signed-off-by: Nicola Lunghi +Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/289447] +--- + .../gui/painting/qpainter/tst_qpainter.cpp | 50 ++++++++++++++----- + 1 file changed, 37 insertions(+), 13 deletions(-) + +diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +index 9eb62ceab2..211151876c 100644 +--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp ++++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +@@ -2893,19 +2893,43 @@ void tst_QPainter::monoImages() + #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__) + #include + ++#if defined(FE_INEXACT) ++ #define QP_FE_INEXACT (FE_INEXACT) ++#else ++ #define QP_FE_INEXACT 0 ++#endif ++#if defined(FE_UNDERFLOW) ++ #define QP_FE_UNDERFLOW (FE_UNDERFLOW) ++#else ++ #define QP_FE_UNDERFLOW 0 ++#endif ++#if defined(FE_OVERFLOW) ++ #define QP_FE_OVERFLOW (FE_OVERFLOW) ++#else ++ #define QP_FE_OVERFLOW 0 ++#endif ++#if defined(FE_DIVBYZERO) ++ #define QP_FE_DIVBYZERO (FE_DIVBYZERO) ++#else ++ #define QP_FE_DIVBYZERO 0 ++#endif ++#if defined(FE_INVALID) ++ #define QP_FE_INVALID (FE_INVALID) ++#else ++ #define QP_FE_INVALID 0 ++#endif ++ + static const QString fpeExceptionString(int exception) + { +-#ifdef FE_INEXACT +- if (exception & FE_INEXACT) ++ if (exception & QP_FE_INEXACT) + return QLatin1String("Inexact result"); +-#endif +- if (exception & FE_UNDERFLOW) ++ if (exception & QP_FE_UNDERFLOW) + return QLatin1String("Underflow"); +- if (exception & FE_OVERFLOW) ++ if (exception & QP_FE_OVERFLOW) + return QLatin1String("Overflow"); +- if (exception & FE_DIVBYZERO) ++ if (exception & QP_FE_DIVBYZERO) + return QLatin1String("Divide by zero"); +- if (exception & FE_INVALID) ++ if (exception & QP_FE_INVALID) + return QLatin1String("Invalid operation"); + return QLatin1String("No exception"); + } +@@ -2931,7 +2955,7 @@ private: + + void fpe_rasterizeLine_task232012() + { +- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); ++ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); + QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); + img.fill(0x0); + QPainter p(&img); +@@ -2943,7 +2967,7 @@ void fpe_rasterizeLine_task232012() + + void fpe_pixmapTransform() + { +- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); ++ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); + + QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); + +@@ -2971,7 +2995,7 @@ void fpe_pixmapTransform() + + void fpe_zeroLengthLines() + { +- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); ++ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); + + QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); + +@@ -2983,7 +3007,7 @@ void fpe_zeroLengthLines() + + void fpe_divByZero() + { +- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); ++ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); + + QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); + +@@ -3006,7 +3030,7 @@ void fpe_divByZero() + + void fpe_steepSlopes() + { +- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); ++ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); + + QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied); + +@@ -3025,7 +3049,7 @@ void fpe_steepSlopes() + + void fpe_radialGradients() + { +- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); ++ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); + + QImage img(21, 21, QImage::Format_ARGB32_Premultiplied); + img.fill(0); diff --git a/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch index e7a6d67a..5d5a32d7 100644 --- a/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From 71089d2dbc2becf51e419741afb5f9e2028963e7 Mon Sep 17 00:00:00 2001 +From ecfccd0a25564555253f9f09fa6bed85973020a4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen @@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 8ff3ec4c1f..7a26fd3596 100644 +index 592f0cf644..e1cfc3901f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -235,7 +235,7 @@ qtConfig(gui) { diff --git a/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch index 4da126d9..aba0d502 100644 --- a/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch +++ b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch @@ -1,4 +1,4 @@ -From cbf26740eca4972824e74acbb8ca5ccb3cdde9b7 Mon Sep 17 00:00:00 2001 +From f2324ba65bb667108a8ad2f08bc4e4b08253e38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 14 Apr 2019 13:27:58 +0200 Subject: [PATCH] Avoid renameeat2 for native(sdk) builds @@ -24,10 +24,10 @@ Signed-off-by: Andreas Müller 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index c6f071bc3f..575c993e68 100644 +index b3daf43c04..e1df2ac580 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -104,7 +104,7 @@ +@@ -107,7 +107,7 @@ #define QT_FEATURE_process -1 #define QT_FEATURE_regularexpression -1 #ifdef __GLIBC_PREREQ @@ -36,7 +36,7 @@ index c6f071bc3f..575c993e68 100644 #else # define QT_FEATURE_renameat2 -1 #endif -@@ -112,7 +112,7 @@ +@@ -115,7 +115,7 @@ #define QT_FEATURE_signaling_nan -1 #define QT_FEATURE_slog2 -1 #ifdef __GLIBC_PREREQ @@ -46,10 +46,10 @@ index c6f071bc3f..575c993e68 100644 # define QT_FEATURE_statx -1 #endif diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index 38cb6a423d..b6d5e16464 100644 +index eaf4e2d9af..63f2f8ecb3 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy +@@ -1435,16 +1435,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy Q_CHECK_FILE_NAME(srcPath, false); Q_CHECK_FILE_NAME(tgtPath, false); diff --git a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch index dae48d59..68193991 100644 --- a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From 61a5dc7d949bc0f8ff3c4a1060c91c61187e5fb2 Mon Sep 17 00:00:00 2001 +From 6d2382ba56e9d2362ff3572356911f3ef1d6eaef Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature @@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index 575c993e68..d0c9fdfce3 100644 +index e1df2ac580..151cc1d2c2 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -95,7 +95,7 @@ +@@ -98,7 +98,7 @@ #define QT_FEATURE_itemmodel -1 #define QT_FEATURE_library -1 #ifdef __linux__ diff --git a/recipes-qt/qt5/qtbase/0022-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0022-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch deleted file mode 100644 index 8aeca2ef..00000000 --- a/recipes-qt/qt5/qtbase/0022-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 9b192df7e06992b256eb49af5a213c1b0d3e341a Mon Sep 17 00:00:00 2001 -From: Nicola Lunghi -Date: Wed, 5 Feb 2020 15:32:25 +0000 -Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform - -the FE_INEXACT, FE_UNDERFLOW, FE_OVERFLOW, FE_DIVBYZERO, FE_INVALID are defined -only for platforms with fp engine. - -Signed-off-by: Nicola Lunghi -Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/289447] ---- - .../gui/painting/qpainter/tst_qpainter.cpp | 50 ++++++++++++++----- - 1 file changed, 37 insertions(+), 13 deletions(-) - -diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -index 6e48439944..3566ef24be 100644 ---- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp -@@ -2890,19 +2890,43 @@ void tst_QPainter::monoImages() - #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__) - #include - -+#if defined(FE_INEXACT) -+ #define QP_FE_INEXACT (FE_INEXACT) -+#else -+ #define QP_FE_INEXACT 0 -+#endif -+#if defined(FE_UNDERFLOW) -+ #define QP_FE_UNDERFLOW (FE_UNDERFLOW) -+#else -+ #define QP_FE_UNDERFLOW 0 -+#endif -+#if defined(FE_OVERFLOW) -+ #define QP_FE_OVERFLOW (FE_OVERFLOW) -+#else -+ #define QP_FE_OVERFLOW 0 -+#endif -+#if defined(FE_DIVBYZERO) -+ #define QP_FE_DIVBYZERO (FE_DIVBYZERO) -+#else -+ #define QP_FE_DIVBYZERO 0 -+#endif -+#if defined(FE_INVALID) -+ #define QP_FE_INVALID (FE_INVALID) -+#else -+ #define QP_FE_INVALID 0 -+#endif -+ - static const QString fpeExceptionString(int exception) - { --#ifdef FE_INEXACT -- if (exception & FE_INEXACT) -+ if (exception & QP_FE_INEXACT) - return QLatin1String("Inexact result"); --#endif -- if (exception & FE_UNDERFLOW) -+ if (exception & QP_FE_UNDERFLOW) - return QLatin1String("Underflow"); -- if (exception & FE_OVERFLOW) -+ if (exception & QP_FE_OVERFLOW) - return QLatin1String("Overflow"); -- if (exception & FE_DIVBYZERO) -+ if (exception & QP_FE_DIVBYZERO) - return QLatin1String("Divide by zero"); -- if (exception & FE_INVALID) -+ if (exception & QP_FE_INVALID) - return QLatin1String("Invalid operation"); - return QLatin1String("No exception"); - } -@@ -2928,7 +2952,7 @@ private: - - void fpe_rasterizeLine_task232012() - { -- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); -+ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); - QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); - img.fill(0x0); - QPainter p(&img); -@@ -2940,7 +2964,7 @@ void fpe_rasterizeLine_task232012() - - void fpe_pixmapTransform() - { -- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); -+ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); - - QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); - -@@ -2968,7 +2992,7 @@ void fpe_pixmapTransform() - - void fpe_zeroLengthLines() - { -- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); -+ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); - - QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); - -@@ -2980,7 +3004,7 @@ void fpe_zeroLengthLines() - - void fpe_divByZero() - { -- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); -+ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); - - QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); - -@@ -3003,7 +3027,7 @@ void fpe_divByZero() - - void fpe_steepSlopes() - { -- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); -+ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); - - QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied); - -@@ -3022,7 +3046,7 @@ void fpe_steepSlopes() - - void fpe_radialGradients() - { -- FpExceptionChecker checker(FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID | FE_DIVBYZERO); -+ FpExceptionChecker checker(QP_FE_UNDERFLOW | QP_FE_OVERFLOW | QP_FE_INVALID | QP_FE_DIVBYZERO); - - QImage img(21, 21, QImage::Format_ARGB32_Premultiplied); - img.fill(0); diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index ffe60efb..347b5085 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = " \ " # common for qtbase-native, qtbase-nativesdk and qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared -# 5.14.meta-qt5-shared.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared +# 5.15.meta-qt5-shared.1 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -32,9 +32,8 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0017-qfloat16-check-for-__ARM_FP-2.patch \ - file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ - file://0022-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ + file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \ + file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ " # for syncqt -- cgit v1.2.3