From 808d65c129d283850fa6c1e887dd01f8ee86b64b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 18 Dec 2018 20:07:53 +0000 Subject: qt5: refresh .patch files, meta-qt5/qt* repos and their tags in recipes * in preparation for rebase on 5.12 #136 Signed-off-by: Martin Jansa --- .../0005-Disable-all-unknown-features-instead-of-erroring-out.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch') 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 0414af4e..6e5aa3e1 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 fc51c10426c68137c57b5ea6c7ea2bdfe0055aaf Mon Sep 17 00:00:00 2001 +From 374bf57efe5f936ab61811f7c433c870cdae77ab 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 -- cgit v1.2.3-54-g00ecf From c6be23d3b01b046d2142bb6fc017078f6154ddb5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 20 Dec 2018 01:05:55 +0000 Subject: qt5: upgrade to latest revision in 5.12 * WIP: only qtbase now * fixes #136 Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 25 +- recipes-qt/qt5/qt5-git.inc | 4 +- recipes-qt/qt5/qtbase-native_git.bb | 27 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 8 +- ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 2 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 6 +- ...ump-path-length-from-256-to-512-character.patch | 6 +- ...-unknown-features-instead-of-erroring-out.patch | 6 +- ...-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 +- ...-version-for-renameat2-statx-on-non-boots.patch | 38 +++ .../0013-Upgrade-double-conversion-to-v3.0.0.patch | 344 --------------------- ...-version-for-renameat2-statx-on-non-boots.patch | 38 --- .../qtbase/0014-Disable-ltcg-for-host_build.patch | 26 ++ ...gExtras.cmake.in-cope-with-variable-path-.patch | 66 ++++ ...e-conversion-support-AARCH64EB-and-arm-BE.patch | 40 --- .../qtbase/0016-Disable-ltcg-for-host_build.patch | 26 -- ...-corelib-Include-sys-types.h-for-uint32_t.patch | 27 ++ ...KE_CXX.COMPILER_MACROS-for-clang-on-linux.patch | 41 +++ ...gExtras.cmake.in-cope-with-variable-path-.patch | 66 ---- .../qtbase/0018-Always-build-uic-and-qvkgen.patch | 28 ++ ...-corelib-Include-sys-types.h-for-uint32_t.patch | 27 -- .../0019-Bootstrap-without-linkat-feature.patch | 27 ++ ...KE_CXX.COMPILER_MACROS-for-clang-on-linux.patch | 41 --- .../qtbase/0020-Fix-compile-issue-with-gcc-9.patch | 31 -- .../qtbase/0021-Always-build-uic-and-qvkgen.patch | 28 -- .../0022-Bootstrap-without-linkat-feature.patch | 27 -- recipes-qt/qt5/qtbase_git.bb | 19 +- 33 files changed, 315 insertions(+), 739 deletions(-) create mode 100644 recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch delete mode 100644 recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch delete mode 100644 recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch create mode 100644 recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch create mode 100644 recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch delete mode 100644 recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch delete mode 100644 recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch create mode 100644 recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch create mode 100644 recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch delete mode 100644 recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch create mode 100644 recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0018-corelib-Include-sys-types.h-for-uint32_t.patch create mode 100644 recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch delete mode 100644 recipes-qt/qt5/qtbase/0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch delete mode 100644 recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch delete mode 100644 recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch (limited to 'recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index bfce14f5..91267a58 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.11-shared -# 5.11.meta-qt5-shared.13 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared +# 5.12.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 \ @@ -37,21 +37,18 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ - file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ - file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ - file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ - file://0016-Disable-ltcg-for-host_build.patch \ - file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ - file://0018-corelib-Include-sys-types.h-for-uint32_t.patch \ - file://0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0020-Fix-compile-issue-with-gcc-9.patch \ + file://0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ + file://0014-Disable-ltcg-for-host_build.patch \ + file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ + file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ + file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ " # common for qtbase-native and nativesdk-qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.13 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native +# 5.12.meta-qt5-native.1 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ + file://0018-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase @@ -198,4 +195,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 = "08de243eaa007597c2bfbc97d3d14e2f821ac4be" +SRCREV = "7fc427ba23a624a433d93e1c604d870656835305" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 79008d19..c92da467 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -2,7 +2,7 @@ # Copyright (C) 2013-2018 Martin Jansa QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.11" +QT_MODULE_BRANCH ?= "5.12" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" # each module needs to define valid SRCREV @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.11.3+git${SRCPV}" +PV = "5.12.0+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index ed5226b9..53a679fc 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.11-shared -# 5.11.meta-qt5-shared.13 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared +# 5.12.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,26 +32,23 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ - file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ - file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ - file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ - file://0016-Disable-ltcg-for-host_build.patch \ - file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ - file://0018-corelib-Include-sys-types.h-for-uint32_t.patch \ - file://0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0020-Fix-compile-issue-with-gcc-9.patch \ + file://0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ + file://0014-Disable-ltcg-for-host_build.patch \ + file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ + file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ + file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ " # common for qtbase-native and nativesdk-qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.13 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native +# 5.12.meta-qt5-native.1 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ + file://0018-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0022-Bootstrap-without-linkat-feature.patch \ + file://0019-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" @@ -142,4 +139,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 = "08de243eaa007597c2bfbc97d3d14e2f821ac4be" +SRCREV = "7fc427ba23a624a433d93e1c604d870656835305" 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 7195da8f..ae4d89de 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 ff46b3e91a384888b299a5444adc0e9abc110d3b Mon Sep 17 00:00:00 2001 +From 9f6cab0c540e7367de851ef19fd2928087b0f307 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 @@ -31,7 +31,7 @@ Signed-off-by: Martin Jansa create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 2830a1b189..6445dc2d5a 100755 +index ef7bad1bfc..dcca0f9135 100755 --- a/configure +++ b/configure @@ -712,7 +712,7 @@ fi @@ -65,7 +65,7 @@ index 934a18a924..0f5b1b6333 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index b57afcf72d..afa1c39b3e 100644 +index d16b3cf1be..df219ce34c 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { @@ -77,7 +77,7 @@ index b57afcf72d..afa1c39b3e 100644 LIBS += -L$$plug_path/$$plug_type } LIBS += -l$${plug}$$qtPlatformTargetSuffix() -@@ -298,8 +298,8 @@ for(ever) { +@@ -307,8 +307,8 @@ for(ever) { # static builds: link qml import plugins into the target. contains(all_qt_module_deps, qml): \ qtConfig(static):import_plugins:!host_build:!no_import_scan { 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 9766d50b..26b487c5 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 2592ce6190596219428eb5e500c3a5f5a14dad01 Mon Sep 17 00:00:00 2001 +From 5d9dbd6fb7a069877f2e4e4880134c07343d8edc 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 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 614bdec3..d49ec61e 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 0ce64385c882e1f7788620ba37781d89625437cb Mon Sep 17 00:00:00 2001 +From 4bab728a4d9ecf3a4626a945a671d236458f74a2 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,10 +20,10 @@ 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 e727f00c8e..819dbb8aa3 100644 +index 4119012d85..6395d10561 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -172,7 +172,10 @@ void QLibrarySettings::load() +@@ -174,7 +174,10 @@ void QLibrarySettings::load() QSettings *QLibraryInfoPrivate::findConfiguration() { #ifdef QT_BUILD_QMAKE 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 d97bc569..4b48081e 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 9858c07dd25d523f8e02b348c21e57c95077e108 Mon Sep 17 00:00:00 2001 +From 3f34b8d782f26876e4e62c6201454ea74ef90ab3 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 6e7f6b76a4..35d15685ee 100644 +index b3b3e27c44..45b5495bfd 100644 --- a/configure.pri +++ b/configure.pri -@@ -821,10 +821,10 @@ defineTest(qtConfOutput_preparePaths) { +@@ -837,10 +837,10 @@ defineTest(qtConfOutput_preparePaths) { "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ "" \ "/* 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 6e5aa3e1..0369e52c 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 374bf57efe5f936ab61811f7c433c870cdae77ab Mon Sep 17 00:00:00 2001 +From 68a9d70b13773587c7be0f5dad1829e4081749d1 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 @@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index 4039bba431..153edbfa30 100644 +index fe14ea1f40..1ee89bac46 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -1266,7 +1266,8 @@ defineReplace(qtConfEvaluateSingleExpression) { +@@ -1520,7 +1520,8 @@ defineReplace(qtConfEvaluateSingleExpression) { error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") return($$result) } 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 b8689813..25b44db3 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 29270c9427ad9e024ecffb94f5431c08f755925d Mon Sep 17 00:00:00 2001 +From 7406b73bc09b9b61b34417d384033b3f21959c6e 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 27f4c277d6..01f68a569d 100644 +index 3ed6dd5889..52b69b26f6 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 2b0c8c9d..fdf8ac13 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 c374524c31fbf11f8f2cd8d1036633f5c7507619 Mon Sep 17 00:00:00 2001 +From fdaadd9cd531866ac414970d1bec24a4b89a8538 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 b5cf78ec..2da95175 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 40b0cf799c4af4ae92eebab64e91015d67e428c1 Mon Sep 17 00:00:00 2001 +From 1caa83ba191dd4a819a6b7db5da8c293a1f46c57 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,10 +14,10 @@ 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 e312199980..5789174ad5 100644 +index 5d9b5ca95c..ffcbddc442 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ #include "tst_qvariant_common.h" #ifdef Q_OS_LINUX @@ -26,7 +26,7 @@ index e312199980..5789174ad5 100644 #endif #include -@@ -205,7 +205,7 @@ protected: +@@ -365,7 +365,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 e312199980..5789174ad5 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 263a475435..11994b3c4f 100644 +index c473230246..1db8d6f225 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -78,6 +78,7 @@ 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 144c9182..90b54fee 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 d8c3ea974639c70d9a158d4e01c3f782133a46f8 Mon Sep 17 00:00:00 2001 +From b2bbab58fa5062011770b5a32d2d73e0c854623b 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 5dce2003..0884863b 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 0ada7d8bec024960b2e10c9ac36f312bb0f5338c Mon Sep 17 00:00:00 2001 +From 37dae545c6c5134b8c7aaac5e398cfec54349493 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 935c746a..e6ded389 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 0c80cc78c3ca53134a1c66824f749676fa966246 Mon Sep 17 00:00:00 2001 +From bcb16ca13fd33efaf24f62fb8253d7aeae3e3c91 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/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp -index b7cb8a1bdc..f6e6545948 100644 +index 5d344834e6..1afc70d255 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/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 e894f34c..e652f97e 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 2856cb239b64b7d0330bb016e080ed294f9bad3e Mon Sep 17 00:00:00 2001 +From 0ba4c8db7ec77d36e12fafd210ec189ccb176e96 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 0fb84bc1b3..68b49b5303 100644 +index 5800aaa5b4..7b4901ce46 100644 --- a/mkspecs/common/clang.conf +++ b/mkspecs/common/clang.conf @@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX @@ -35,7 +35,7 @@ index 0fb84bc1b3..68b49b5303 100644 QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_LTCG = -flto diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf -index 234f71d495..c7d81a902e 100644 +index c2669e4833..3fde8dc85f 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-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch new file mode 100644 index 00000000..27b354b2 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch @@ -0,0 +1,38 @@ +From ebd6d61f9031fec80c7dde35819cabec727179aa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 21 Aug 2018 00:29:06 +0200 +Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped + build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/corelib/io/qfilesystemengine_unix.cpp | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp +index b2d81066db..b90e3dc15d 100644 +--- a/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/src/corelib/io/qfilesystemengine_unix.cpp +@@ -93,6 +93,17 @@ extern "C" NSString *NSTemporaryDirectory(); + #ifndef FICLONE + # define FICLONE _IOW(0x94, 9, int) + #endif ++ ++// renameat2/statx features for non bootstrapped build ++#ifndef QT_BOOTSTRAPPED ++#ifdef __GLIBC_PREREQ ++# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++#else ++# define QT_FEATURE_renameat2 -1 ++# define QT_FEATURE_statx -1 ++#endif ++#endif + #endif + + #if defined(Q_OS_ANDROID) diff --git a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch b/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch deleted file mode 100644 index 138d1f7f..00000000 --- a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch +++ /dev/null @@ -1,344 +0,0 @@ -From f20acf6fa22235fdaa551b0410d65627e028f4b4 Mon Sep 17 00:00:00 2001 -From: Ulf Hermann -Date: Fri, 27 Apr 2018 10:38:18 +0200 -Subject: [PATCH] Upgrade double-conversion to v3.0.0 - -This fixes their issue #41, a potential undefined behavior. - -We preserve the locally added "__ghs" clause as well as the _M_ARM_FP -clause necessary for winrt in utils.h. - -[ChangeLog][Third-Party Code] double-conversion got updated to upstream -version 3.0.0. - -Task-number: QTBUG-66561 -Change-Id: Id79125bdeeaebb61dca2e2885d3370accce9030c -Reviewed-by: Simon Hausmann -Upstream-Status: Backport ---- - src/3rdparty/double-conversion/bignum.cc | 2 +- - src/3rdparty/double-conversion/bignum.h | 1 - - .../double-conversion/cached-powers.cc | 5 +-- - src/3rdparty/double-conversion/diy-fp.h | 22 +++++------ - .../double-conversion/double-conversion.cc | 21 ++++++---- - src/3rdparty/double-conversion/fixed-dtoa.cc | 5 ++- - src/3rdparty/double-conversion/ieee.h | 2 +- - .../include/double-conversion/utils.h | 38 +++++++++++++------ - .../double-conversion/qt_attribution.json | 4 +- - src/3rdparty/double-conversion/strtod.cc | 2 +- - 10 files changed, 60 insertions(+), 42 deletions(-) - -diff --git a/src/3rdparty/double-conversion/bignum.cc b/src/3rdparty/double-conversion/bignum.cc -index 2743d67e8d..8892de8f2a 100644 ---- a/src/3rdparty/double-conversion/bignum.cc -+++ b/src/3rdparty/double-conversion/bignum.cc -@@ -104,7 +104,7 @@ void Bignum::AssignDecimalString(Vector value) { - const int kMaxUint64DecimalDigits = 19; - Zero(); - int length = value.length(); -- int pos = 0; -+ unsigned int pos = 0; - // Let's just say that each digit needs 4 bits. - while (length >= kMaxUint64DecimalDigits) { - uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits); -diff --git a/src/3rdparty/double-conversion/bignum.h b/src/3rdparty/double-conversion/bignum.h -index 5ec3544f57..c385f2237b 100644 ---- a/src/3rdparty/double-conversion/bignum.h -+++ b/src/3rdparty/double-conversion/bignum.h -@@ -49,7 +49,6 @@ class Bignum { - - void AssignPowerUInt16(uint16_t base, int exponent); - -- void AddUInt16(uint16_t operand); - void AddUInt64(uint64_t operand); - void AddBignum(const Bignum& other); - // Precondition: this >= other. -diff --git a/src/3rdparty/double-conversion/cached-powers.cc b/src/3rdparty/double-conversion/cached-powers.cc -index 9536f26927..2b43f06412 100644 ---- a/src/3rdparty/double-conversion/cached-powers.cc -+++ b/src/3rdparty/double-conversion/cached-powers.cc -@@ -131,7 +131,6 @@ static const CachedPower kCachedPowers[] = { - {UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340}, - }; - --static const int kCachedPowersLength = ARRAY_SIZE(kCachedPowers); - static const int kCachedPowersOffset = 348; // -1 * the first decimal_exponent. - static const double kD_1_LOG2_10 = 0.30102999566398114; // 1 / lg(10) - // Difference between the decimal exponents in the table above. -@@ -144,14 +143,12 @@ void PowersOfTenCache::GetCachedPowerForBinaryExponentRange( - int max_exponent, - DiyFp* power, - int* decimal_exponent) { -- (void)max_exponent; // Silence unused parameter warning in release builds -- (void)kCachedPowersLength; // Silence unused parameter warning in release builds - int kQ = DiyFp::kSignificandSize; - double k = ceil((min_exponent + kQ - 1) * kD_1_LOG2_10); - int foo = kCachedPowersOffset; - int index = - (foo + static_cast(k) - 1) / kDecimalExponentDistance + 1; -- ASSERT(0 <= index && index < kCachedPowersLength); -+ ASSERT(0 <= index && index < static_cast(ARRAY_SIZE(kCachedPowers))); - CachedPower cached_power = kCachedPowers[index]; - ASSERT(min_exponent <= cached_power.binary_exponent); - (void) max_exponent; // Mark variable as used. -diff --git a/src/3rdparty/double-conversion/diy-fp.h b/src/3rdparty/double-conversion/diy-fp.h -index 9dcf8fbdba..2edf34674e 100644 ---- a/src/3rdparty/double-conversion/diy-fp.h -+++ b/src/3rdparty/double-conversion/diy-fp.h -@@ -42,7 +42,7 @@ class DiyFp { - static const int kSignificandSize = 64; - - DiyFp() : f_(0), e_(0) {} -- DiyFp(uint64_t f, int e) : f_(f), e_(e) {} -+ DiyFp(uint64_t significand, int exponent) : f_(significand), e_(exponent) {} - - // this = this - other. - // The exponents of both numbers must be the same and the significand of this -@@ -76,22 +76,22 @@ class DiyFp { - - void Normalize() { - ASSERT(f_ != 0); -- uint64_t f = f_; -- int e = e_; -+ uint64_t significand = f_; -+ int exponent = e_; - - // This method is mainly called for normalizing boundaries. In general - // boundaries need to be shifted by 10 bits. We thus optimize for this case. - const uint64_t k10MSBits = UINT64_2PART_C(0xFFC00000, 00000000); -- while ((f & k10MSBits) == 0) { -- f <<= 10; -- e -= 10; -+ while ((significand & k10MSBits) == 0) { -+ significand <<= 10; -+ exponent -= 10; - } -- while ((f & kUint64MSB) == 0) { -- f <<= 1; -- e--; -+ while ((significand & kUint64MSB) == 0) { -+ significand <<= 1; -+ exponent--; - } -- f_ = f; -- e_ = e; -+ f_ = significand; -+ e_ = exponent; - } - - static DiyFp Normalize(const DiyFp& a) { -diff --git a/src/3rdparty/double-conversion/double-conversion.cc b/src/3rdparty/double-conversion/double-conversion.cc -index 909985be82..6f21a0124c 100644 ---- a/src/3rdparty/double-conversion/double-conversion.cc -+++ b/src/3rdparty/double-conversion/double-conversion.cc -@@ -118,7 +118,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation( - StringBuilder* result_builder) const { - // Create a representation that is padded with zeros if needed. - if (decimal_point <= 0) { -- // "0.00000decimal_rep". -+ // "0.00000decimal_rep" or "0.000decimal_rep00". - result_builder->AddCharacter('0'); - if (digits_after_point > 0) { - result_builder->AddCharacter('.'); -@@ -129,7 +129,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation( - result_builder->AddPadding('0', remaining_digits); - } - } else if (decimal_point >= length) { -- // "decimal_rep0000.00000" or "decimal_rep.0000" -+ // "decimal_rep0000.00000" or "decimal_rep.0000". - result_builder->AddSubstring(decimal_digits, length); - result_builder->AddPadding('0', decimal_point - length); - if (digits_after_point > 0) { -@@ -137,7 +137,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation( - result_builder->AddPadding('0', digits_after_point); - } - } else { -- // "decima.l_rep000" -+ // "decima.l_rep000". - ASSERT(digits_after_point > 0); - result_builder->AddSubstring(decimal_digits, decimal_point); - result_builder->AddCharacter('.'); -@@ -494,10 +494,17 @@ static double SignedZero(bool sign) { - // because it constant-propagated the radix and concluded that the last - // condition was always true. By moving it into a separate function the - // compiler wouldn't warn anymore. -+#if _MSC_VER -+#pragma optimize("",off) - static bool IsDecimalDigitForRadix(int c, int radix) { - return '0' <= c && c <= '9' && (c - '0') < radix; - } -- -+#pragma optimize("",on) -+#else -+static bool inline IsDecimalDigitForRadix(int c, int radix) { -+ return '0' <= c && c <= '9' && (c - '0') < radix; -+} -+#endif - // Returns true if 'c' is a character digit that is valid for the given radix. - // The 'a_character' should be 'a' or 'A'. - // -@@ -852,9 +859,9 @@ double StringToDoubleConverter::StringToIeee( - return junk_string_value_; - } - } -- char sign = '+'; -+ char exponen_sign = '+'; - if (*current == '+' || *current == '-') { -- sign = static_cast(*current); -+ exponen_sign = static_cast(*current); - ++current; - if (current == end) { - if (allow_trailing_junk) { -@@ -888,7 +895,7 @@ double StringToDoubleConverter::StringToIeee( - ++current; - } while (current != end && *current >= '0' && *current <= '9'); - -- exponent += (sign == '-' ? -num : num); -+ exponent += (exponen_sign == '-' ? -num : num); - } - - if (!(allow_trailing_spaces || allow_trailing_junk) && (current != end)) { -diff --git a/src/3rdparty/double-conversion/fixed-dtoa.cc b/src/3rdparty/double-conversion/fixed-dtoa.cc -index aef65fdc21..0f55a0b6eb 100644 ---- a/src/3rdparty/double-conversion/fixed-dtoa.cc -+++ b/src/3rdparty/double-conversion/fixed-dtoa.cc -@@ -98,7 +98,7 @@ class UInt128 { - return high_bits_ == 0 && low_bits_ == 0; - } - -- int BitAt(int position) { -+ int BitAt(int position) const { - if (position >= 64) { - return static_cast(high_bits_ >> (position - 64)) & 1; - } else { -@@ -259,7 +259,8 @@ static void FillFractionals(uint64_t fractionals, int exponent, - fractionals -= static_cast(digit) << point; - } - // If the first bit after the point is set we have to round up. -- if (((fractionals >> (point - 1)) & 1) == 1) { -+ ASSERT(fractionals == 0 || point - 1 >= 0); -+ if ((fractionals != 0) && ((fractionals >> (point - 1)) & 1) == 1) { - RoundUp(buffer, length, decimal_point); - } - } else { // We need 128 bits. -diff --git a/src/3rdparty/double-conversion/ieee.h b/src/3rdparty/double-conversion/ieee.h -index 661141d1a8..b14cf4f717 100644 ---- a/src/3rdparty/double-conversion/ieee.h -+++ b/src/3rdparty/double-conversion/ieee.h -@@ -99,7 +99,7 @@ class Double { - } - - double PreviousDouble() const { -- if (d64_ == (kInfinity | kSignMask)) return -Double::Infinity(); -+ if (d64_ == (kInfinity | kSignMask)) return -Infinity(); - if (Sign() < 0) { - return Double(d64_ + 1).value(); - } else { -diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 20bfd36c84..ca7646d817 100644 ---- a/src/3rdparty/double-conversion/include/double-conversion/utils.h -+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -33,19 +33,29 @@ - - #include - #ifndef ASSERT --# if defined(WINCE) || defined(_WIN32_WCE) --# define ASSERT(condition) --# else --# define ASSERT(condition) \ -+#define ASSERT(condition) \ - assert(condition); --# endif - #endif - #ifndef UNIMPLEMENTED --# define UNIMPLEMENTED() (exit(-1)) -+#define UNIMPLEMENTED() (abort()) -+#endif -+#ifndef DOUBLE_CONVERSION_NO_RETURN -+#ifdef _MSC_VER -+#define DOUBLE_CONVERSION_NO_RETURN __declspec(noreturn) -+#else -+#define DOUBLE_CONVERSION_NO_RETURN __attribute__((noreturn)) -+#endif - #endif - #ifndef UNREACHABLE --# define UNREACHABLE() (exit(-1)) -+#ifdef _MSC_VER -+void DOUBLE_CONVERSION_NO_RETURN abort_noreturn(); -+inline void abort_noreturn() { abort(); } -+#define UNREACHABLE() (abort_noreturn()) -+#else -+#define UNREACHABLE() (abort()) - #endif -+#endif -+ - - // Double operations detection based on target architecture. - // Linux uses a 80bit wide floating point stack on x86. This induces double -@@ -62,11 +72,15 @@ - defined(__hppa__) || defined(__ia64__) || \ - defined(__mips__) || \ - defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ -+ defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ -- defined(__AARCH64EL__) -+ defined(__AARCH64EL__) || defined(__aarch64__) || \ -+ defined(__riscv) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -+#elif defined(__mc68000__) -+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) - // Windows uses a 64bit wide floating point stack. -@@ -172,8 +186,8 @@ template - class Vector { - public: - Vector() : start_(NULL), length_(0) {} -- Vector(T* data, int length) : start_(data), length_(length) { -- ASSERT(length == 0 || (length > 0 && data != NULL)); -+ Vector(T* data, int len) : start_(data), length_(len) { -+ ASSERT(len == 0 || (len > 0 && data != NULL)); - } - - // Returns a vector using the same backing storage as this one, -@@ -215,8 +229,8 @@ class Vector { - // buffer bounds on all operations in debug mode. - class StringBuilder { - public: -- StringBuilder(char* buffer, int size) -- : buffer_(buffer, size), position_(0) { } -+ StringBuilder(char* buffer, int buffer_size) -+ : buffer_(buffer, buffer_size), position_(0) { } - - ~StringBuilder() { if (!is_finalized()) Finalize(); } - -diff --git a/src/3rdparty/double-conversion/qt_attribution.json b/src/3rdparty/double-conversion/qt_attribution.json -index 92118ac779..d41a7ef332 100644 ---- a/src/3rdparty/double-conversion/qt_attribution.json -+++ b/src/3rdparty/double-conversion/qt_attribution.json -@@ -5,8 +5,8 @@ - "QtUsage": "Used in Qt Core. Configure with -system-doubleconversion or -no-doubleconversion to avoid.", - - "Homepage": "https://github.com/google/double-conversion", -- "Version": "2.0.1", -- "DownloadLocation": "https://github.com/google/double-conversion/commit/2fb03de56faa32bbba5e02222528e7b760f71d77", -+ "Version": "3.0.0", -+ "DownloadLocation": "https://github.com/google/double-conversion/commit/ca220cbafa83ca706f028bfbb5adc7eb2f1f90e1", - "License": "BSD 3-clause \"New\" or \"Revised\" License", - "LicenseId": "BSD-3-Clause", - "LicenseFile": "LICENSE", -diff --git a/src/3rdparty/double-conversion/strtod.cc b/src/3rdparty/double-conversion/strtod.cc -index 34717562bd..17abcbb2a5 100644 ---- a/src/3rdparty/double-conversion/strtod.cc -+++ b/src/3rdparty/double-conversion/strtod.cc -@@ -286,7 +286,7 @@ static bool DiyFpStrtod(Vector buffer, - const int kDenominator = 1 << kDenominatorLog; - // Move the remaining decimals into the exponent. - exponent += remaining_decimals; -- int error = (remaining_decimals == 0 ? 0 : kDenominator / 2); -+ uint64_t error = (remaining_decimals == 0 ? 0 : kDenominator / 2); - - int old_e = input.e(); - input.Normalize(); diff --git a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch deleted file mode 100644 index 09ec0fa9..00000000 --- a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fb6a20e6917cfa32e69791e0adb130140f4b5688 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 21 Aug 2018 00:29:06 +0200 -Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped - build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - src/corelib/io/qfilesystemengine_unix.cpp | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index 964dcebeb2..c09eb0154b 100644 ---- a/src/corelib/io/qfilesystemengine_unix.cpp -+++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -95,6 +95,17 @@ extern "C" NSString *NSTemporaryDirectory(); - #ifndef FICLONE - # define FICLONE _IOW(0x94, 9, int) - #endif -+ -+// renameat2/statx features for non bootstrapped build -+#ifndef QT_BOOTSTRAPPED -+#ifdef __GLIBC_PREREQ -+# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+#else -+# define QT_FEATURE_renameat2 -1 -+# define QT_FEATURE_statx -1 -+#endif -+#endif - #endif - - #if defined(Q_OS_ANDROID) diff --git a/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch new file mode 100644 index 00000000..d4a47fb8 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch @@ -0,0 +1,26 @@ +From baa8339d0fda285b7410066827644aa8af0e5dfb 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 + +debug-prefix-map does not work correctly for static libraries +when using ltcg, and since host_build compilations link agaist +the libQt5Bootstrap.a library, it breaks source file packaging +into debug packages. + +Task-number: QTBUG-71230 +Upstream-Status: Inappropriate [embedded specific] +--- + mkspecs/features/ltcg.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf +index ccf0226272..482e5b573d 100644 +--- a/mkspecs/features/ltcg.prf ++++ b/mkspecs/features/ltcg.prf +@@ -1,4 +1,4 @@ +-CONFIG(release, debug|release) { ++CONFIG(release, debug|release):!host_build { + # We need fat object files when creating static libraries on some platforms + # so the linker will know to load a particular object from the library + # in the first place. On others, we have special ar and nm to create the symbol diff --git a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch new file mode 100644 index 00000000..f620b3d7 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch @@ -0,0 +1,66 @@ +From 744a866a54780ab2c1acf9da875be0845726b20f 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 + sysroot + +EGL is configured to need an include path into the recipe-specific sysroot. +However users of the cmake file will have a different absolute path than that +used when creating the cmake file from cmake.in in qtbase. + +Change to store the relative path within the sysroot and then prepend the +currently used sysroot in the _qt5gui_find_extra_libs macro. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Max Krummenacher +--- + src/gui/Qt5GuiConfigExtras.cmake.in | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) + +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 07869efd7d..671aa82167 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) + + macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) + set(Qt5Gui_${Name}_LIBRARIES) +-!!IF !mac +- set(Qt5Gui_${Name}_INCLUDE_DIRS ${IncDirs}) +-!!ELSE ++ + foreach(_dir ${IncDirs}) +- if (EXISTS ${_dir}) +- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_dir}) +- else() +- find_path(_actual_dir ${_dir}) # Look in sdk directories +- if (_actual_dir) +- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) +- endif() +- unset(_actual_dir CACHE) ++ find_path(_actual_dir ${_dir}) ++ if (_actual_dir) ++ list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) + endif() ++ unset(_actual_dir CACHE) + endforeach() +-!!ENDIF ++ + foreach(_lib ${Libs}) + string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib}) + if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE) +@@ -158,11 +152,11 @@ endmacro() + + + !!IF !isEmpty(CMAKE_EGL_LIBS) +-_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$CMAKE_EGL_INCDIRS\") ++_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$replace(CMAKE_EGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") + !!ENDIF + + !!IF !isEmpty(CMAKE_OPENGL_LIBS) +-_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$CMAKE_OPENGL_INCDIRS\") ++_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$replace(CMAKE_OPENGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") + + !!ENDIF + diff --git a/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch b/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch deleted file mode 100644 index 5658b01a..00000000 --- a/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 09b304966543753e445b90b904a9f558377a87f6 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Wed, 29 Aug 2018 18:20:14 +0900 -Subject: [PATCH] double-conversion: support AARCH64EB and arm BE - -Big endian can work well. So, -- Make qtbase support aarch64 BE -- Make qtbase support arm BE - -Upstream-Status: Pending - -Change-Id: Ie5b104fa2b23af8e89bae57fb56f3663be1bbb48 -Signed-off-by: Lei Maohui -Signed-off-by: Martin Jansa ---- - .../double-conversion/include/double-conversion/utils.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index ca7646d817..69aa17171c 100644 ---- a/src/3rdparty/double-conversion/include/double-conversion/utils.h -+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -68,7 +68,7 @@ inline void abort_noreturn() { abort(); } - // disabled.) - // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) - #if defined(_M_X64) || defined(__x86_64__) || \ -- defined(__ARMEL__) || defined(__avr32__) || _M_ARM_FP || \ -+ defined(__arm__) || defined(__avr32__) || _M_ARM_FP || \ - defined(__hppa__) || defined(__ia64__) || \ - defined(__mips__) || \ - defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ -@@ -76,7 +76,7 @@ inline void abort_noreturn() { abort(); } - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ -- defined(__AARCH64EL__) || defined(__aarch64__) || \ -+ defined(__AARCH64EL__) || defined(__AARCH64EB__) || defined(__aarch64__) || \ - defined(__riscv) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) diff --git a/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch deleted file mode 100644 index e6ba5a35..00000000 --- a/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e9ea14a04e74be6740b82d51340bb6218f35ab1f 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 - -debug-prefix-map does not work correctly for static libraries -when using ltcg, and since host_build compilations link agaist -the libQt5Bootstrap.a library, it breaks source file packaging -into debug packages. - -Task-number: QTBUG-71230 -Upstream-Status: Inappropriate [embedded specific] ---- - mkspecs/features/ltcg.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf -index ccf0226272..482e5b573d 100644 ---- a/mkspecs/features/ltcg.prf -+++ b/mkspecs/features/ltcg.prf -@@ -1,4 +1,4 @@ --CONFIG(release, debug|release) { -+CONFIG(release, debug|release):!host_build { - # We need fat object files when creating static libraries on some platforms - # so the linker will know to load a particular object from the library - # in the first place. On others, we have special ar and nm to create the symbol diff --git a/recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch new file mode 100644 index 00000000..10a7698e --- /dev/null +++ b/recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch @@ -0,0 +1,27 @@ +From 10d6966a88bdc997d2fdade463d267c25ba86f7d 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 + +This has been includes indirectly on glibc/linux systems +via inttypes.h -> stdint.h -> sys/types.h but it breaks on +musl where this indirect include chain does not exist. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/corelib/global/qnumeric_p.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h +index 0a6db9afcd..b791d0a172 100644 +--- a/src/corelib/global/qnumeric_p.h ++++ b/src/corelib/global/qnumeric_p.h +@@ -55,6 +55,7 @@ + #include "QtCore/private/qglobal_p.h" + #include + #include ++#include + + #if defined(Q_CC_MSVC) + # include diff --git a/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch new file mode 100644 index 00000000..7144fbe4 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch @@ -0,0 +1,41 @@ +From c79578126a744dda2feeeff7521438714859508a 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 + +This is required when using clang for compiler, fixes +mkspecs/features/toolchain.prf:215: Variable QMAKE_CXX.COMPILER_MACROS is not defined. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + mkspecs/features/toolchain.prf | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf +index c7ea20e180..8a6bb0052d 100644 +--- a/mkspecs/features/toolchain.prf ++++ b/mkspecs/features/toolchain.prf +@@ -210,6 +210,13 @@ defineReplace(qtVariablesFromGCC) { + return($$ret) + } + ++defineReplace(qtVariablesFromCLANG) { ++ ret = $$system("$$1 $$2 -E $$system_quote($$PWD/data/macros.cpp) \ ++ <$$QMAKE_SYSTEM_NULL_DEVICE 2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec) ++ !equals(ec, 0): qtCompilerErrror($$1, $$ret) ++ return($$ret) ++} ++ + isEmpty($${target_prefix}.COMPILER_MACROS) { + msvc { + clang_cl { +@@ -229,6 +236,8 @@ isEmpty($${target_prefix}.COMPILER_MACROS) { + } else { + vars = $$qtVariablesFromMSVC($$QMAKE_CXX) + } ++ } else: clang { ++ vars = $$qtVariablesFromCLANG($$QMAKE_CXX, $$QMAKE_CXXFLAGS) + } else: gcc|ghs { + vars = $$qtVariablesFromGCC($$QMAKE_CXX) + } diff --git a/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch deleted file mode 100644 index 54b0f640..00000000 --- a/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ /dev/null @@ -1,66 +0,0 @@ -From f5b11bb3ab6299912491568f84185e0174cc6e5a 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 - sysroot - -EGL is configured to need an include path into the recipe-specific sysroot. -However users of the cmake file will have a different absolute path than that -used when creating the cmake file from cmake.in in qtbase. - -Change to store the relative path within the sysroot and then prepend the -currently used sysroot in the _qt5gui_find_extra_libs macro. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Max Krummenacher ---- - src/gui/Qt5GuiConfigExtras.cmake.in | 22 ++++++++-------------- - 1 file changed, 8 insertions(+), 14 deletions(-) - -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..671aa82167 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) - - macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) - set(Qt5Gui_${Name}_LIBRARIES) --!!IF !mac -- set(Qt5Gui_${Name}_INCLUDE_DIRS ${IncDirs}) --!!ELSE -+ - foreach(_dir ${IncDirs}) -- if (EXISTS ${_dir}) -- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_dir}) -- else() -- find_path(_actual_dir ${_dir}) # Look in sdk directories -- if (_actual_dir) -- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) -- endif() -- unset(_actual_dir CACHE) -+ find_path(_actual_dir ${_dir}) -+ if (_actual_dir) -+ list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) - endif() -+ unset(_actual_dir CACHE) - endforeach() --!!ENDIF -+ - foreach(_lib ${Libs}) - string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib}) - if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE) -@@ -158,11 +152,11 @@ endmacro() - - - !!IF !isEmpty(CMAKE_EGL_LIBS) --_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$CMAKE_EGL_INCDIRS\") -+_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$replace(CMAKE_EGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") - !!ENDIF - - !!IF !isEmpty(CMAKE_OPENGL_LIBS) --_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$CMAKE_OPENGL_INCDIRS\") -+_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$replace(CMAKE_OPENGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") - - !!ENDIF - diff --git a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch new file mode 100644 index 00000000..15ddbf31 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch @@ -0,0 +1,28 @@ +From 9caf072bfa7393a70714ce1e10169be4bfb8c866 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 + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 1c76a2e46f..fbd4014fb3 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -232,7 +232,7 @@ qtConfig(gui) { + } + } + } +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen + + nacl: SUBDIRS -= src_network src_testlib + diff --git a/recipes-qt/qt5/qtbase/0018-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0018-corelib-Include-sys-types.h-for-uint32_t.patch deleted file mode 100644 index c07cd2b8..00000000 --- a/recipes-qt/qt5/qtbase/0018-corelib-Include-sys-types.h-for-uint32_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dd16d19bc6b4e8ee5d61fae94cd65b7f10d6e835 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 - -This has been includes indirectly on glibc/linux systems -via inttypes.h -> stdint.h -> sys/types.h but it breaks on -musl where this indirect include chain does not exist. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/corelib/global/qnumeric_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h -index 5f8a124bcc..fe1711cf1b 100644 ---- a/src/corelib/global/qnumeric_p.h -+++ b/src/corelib/global/qnumeric_p.h -@@ -55,6 +55,7 @@ - #include "QtCore/private/qglobal_p.h" - #include - #include -+#include - - #if defined(Q_CC_MSVC) - # include diff --git a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..69cbfa38 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch @@ -0,0 +1,27 @@ +From b53e518a341d975298b804af6eb0d2f9a31abaf4 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 + +qmake does not work together with pseudo when unnamed temporary files +are used with linkat. + +Upstream-Status: Inappropriate [OE specific] +[YOCTO #11996] +--- + src/corelib/global/qconfig-bootstrapped.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index dfcc3c9c7f..1e5bc401b7 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -91,7 +91,7 @@ + #define QT_FEATURE_itemmodel -1 + #define QT_FEATURE_library -1 + #ifdef __linux__ +-# define QT_FEATURE_linkat 1 ++# define QT_FEATURE_linkat -1 + #else + # define QT_FEATURE_linkat -1 + #endif diff --git a/recipes-qt/qt5/qtbase/0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch deleted file mode 100644 index 2ab04330..00000000 --- a/recipes-qt/qt5/qtbase/0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 61d8dd1cfdc6334a4d81c0f043a9515346872d0c 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 - -This is required when using clang for compiler, fixes -mkspecs/features/toolchain.prf:215: Variable QMAKE_CXX.COMPILER_MACROS is not defined. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - mkspecs/features/toolchain.prf | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf -index fdf3d1cdd3..6ecfd391f6 100644 ---- a/mkspecs/features/toolchain.prf -+++ b/mkspecs/features/toolchain.prf -@@ -180,6 +180,13 @@ defineReplace(qtVariablesFromGCC) { - return($$ret) - } - -+defineReplace(qtVariablesFromCLANG) { -+ ret = $$system("$$1 $$2 -E $$system_quote($$PWD/data/macros.cpp) \ -+ <$$QMAKE_SYSTEM_NULL_DEVICE 2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec) -+ !equals(ec, 0): qtCompilerErrror($$1, $$ret) -+ return($$ret) -+} -+ - isEmpty($${target_prefix}.COMPILER_MACROS) { - msvc { - clang_cl { -@@ -199,6 +206,8 @@ isEmpty($${target_prefix}.COMPILER_MACROS) { - } else { - vars = $$qtVariablesFromMSVC($$QMAKE_CXX) - } -+ } else: clang { -+ vars = $$qtVariablesFromCLANG($$QMAKE_CXX, $$QMAKE_CXXFLAGS) - } else: gcc { - vars = $$qtVariablesFromGCC($$QMAKE_CXX) - } diff --git a/recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch b/recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch deleted file mode 100644 index 2eb35600..00000000 --- a/recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eb68b9fa27d94bc90db5b0023b224ac0e60b8243 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Tue, 13 Nov 2018 16:00:23 +0100 -Subject: [PATCH] Fix compile issue with gcc 9 - -It appears messenne_twisters in the latest libstdc++ has one more -requirement before it is willing to construct with our -SystemGenerator struct as an sseq provider. - -Upstream-Status: Backport from 5.12 - -Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe -Reviewed-by: Giuseppe D'Angelo -Reviewed-by: Thiago Macieira -Signed-off-by: Martin Jansa ---- - src/corelib/global/qrandom.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index ebf9864b15..577736a867 100644 ---- a/src/corelib/global/qrandom.cpp -+++ b/src/corelib/global/qrandom.cpp -@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator - #endif // Q_OS_WINRT - - static SystemGenerator &self(); -+ typedef quint32 result_type; - void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); - - // For std::mersenne_twister_engine implementations that use something diff --git a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch deleted file mode 100644 index 42d94190..00000000 --- a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4ac36e3e40bd8a4940f211cf89155618149f1f68 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 - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 1c76a2e46f..fbd4014fb3 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -232,7 +232,7 @@ qtConfig(gui) { - } - } - } --SUBDIRS += src_plugins -+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen - - nacl: SUBDIRS -= src_network src_testlib - diff --git a/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index ea79e392..00000000 --- a/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 03c534e00991d08897541910226256e88f0f5efc 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 - -qmake does not work together with pseudo when unnamed temporary files -are used with linkat. - -Upstream-Status: Inappropriate [OE specific] -[YOCTO #11996] ---- - src/corelib/global/qconfig-bootstrapped.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index 229b4d17a1..3dbb1ea65c 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -91,7 +91,7 @@ - #define QT_FEATURE_itemmodel -1 - #define QT_FEATURE_library -1 - #ifdef __linux__ --# define QT_FEATURE_linkat 1 -+# define QT_FEATURE_linkat -1 - #else - # define QT_FEATURE_linkat -1 - #endif diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index bb912265..c7e9d366 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.11-shared -# 5.11.meta-qt5-shared.13 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared +# 5.12.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 \ @@ -28,14 +28,11 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ - file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ - file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ - file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ - file://0016-Disable-ltcg-for-host_build.patch \ - file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ - file://0018-corelib-Include-sys-types.h-for-uint32_t.patch \ - file://0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0020-Fix-compile-issue-with-gcc-9.patch \ + file://0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ + file://0014-Disable-ltcg-for-host_build.patch \ + file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ + file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ + file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ " @@ -262,4 +259,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "08de243eaa007597c2bfbc97d3d14e2f821ac4be" +SRCREV = "7fc427ba23a624a433d93e1c604d870656835305" -- cgit v1.2.3-54-g00ecf From 6531fa731203debe1b42dedfa225bfa2e1847064 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 20 Dec 2018 12:01:21 +0000 Subject: qtbase: use v5.12.0 as base * restore 0018-Fix-compile-issue-with-gcc-9.patch which is only in v5.12.1 * zlib detection got broken probably in: commit e80bf655e922e9864f8843b5e7bbb47019a6d95a Author: Oswald Buddenhagen Date: Thu Dec 7 19:30:07 2017 +0100 configure: verify header presence against sources Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 9 +++---- 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 | 2 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 6 ++--- ...ump-path-length-from-256-to-512-character.patch | 6 ++--- ...-unknown-features-instead-of-erroring-out.patch | 6 ++--- ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 2 +- .../0007-Delete-qlonglong-and-qulonglong.patch | 2 +- ...08-Replace-pthread_yield-with-sched_yield.patch | 4 ++-- ...-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 | 2 +- ...-version-for-renameat2-statx-on-non-boots.patch | 4 ++-- .../qtbase/0014-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 | 4 ++-- ...KE_CXX.COMPILER_MACROS-for-clang-on-linux.patch | 8 +++---- .../qtbase/0018-Always-build-uic-and-qvkgen.patch | 28 ---------------------- .../qtbase/0018-Fix-compile-issue-with-gcc-9.patch | 28 ++++++++++++++++++++++ .../qtbase/0019-Always-build-uic-and-qvkgen.patch | 28 ++++++++++++++++++++++ .../0019-Bootstrap-without-linkat-feature.patch | 27 --------------------- .../0020-Bootstrap-without-linkat-feature.patch | 27 +++++++++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 5 ++-- 25 files changed, 128 insertions(+), 96 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch create mode 100644 recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch create mode 100644 recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch create mode 100644 recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch (limited to 'recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 91267a58..31687913 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.1 +# 5.12.meta-qt5-shared.2 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -42,13 +42,14 @@ SRC_URI += "\ file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0018-Fix-compile-issue-with-gcc-9.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.1 +# 5.12.meta-qt5-native.2 SRC_URI += " \ - file://0018-Always-build-uic-and-qvkgen.patch \ + file://0019-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase @@ -195,4 +196,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 = "7fc427ba23a624a433d93e1c604d870656835305" +SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index dcc102a9..3dc92499 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.1 +# 5.12.meta-qt5-shared.2 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -37,18 +37,19 @@ SRC_URI += "\ file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0018-Fix-compile-issue-with-gcc-9.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.1 +# 5.12.meta-qt5-native.2 SRC_URI += " \ - file://0018-Always-build-uic-and-qvkgen.patch \ + file://0019-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0019-Bootstrap-without-linkat-feature.patch \ + file://0020-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" @@ -59,6 +60,7 @@ XPLATFORM ?= "linux-oe-g++" PACKAGECONFIG_CONFARGS = " \ -sysroot ${STAGING_DIR_NATIVE} \ -no-gcc-sysroot \ + -system-zlib \ -qt-pcre \ -no-libjpeg \ -no-libpng \ @@ -138,4 +140,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 = "7fc427ba23a624a433d93e1c604d870656835305" +SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" 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 ae4d89de..0a3cbf92 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 9f6cab0c540e7367de851ef19fd2928087b0f307 Mon Sep 17 00:00:00 2001 +From 3701cce26ce6f90e4b5e4c71c73d333d43b5ac08 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 26b487c5..ddeef281 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 5d9dbd6fb7a069877f2e4e4880134c07343d8edc Mon Sep 17 00:00:00 2001 +From bd8119aaabd75c4a80141b25be48eb990e50ade8 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 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 d49ec61e..fd2ed42a 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 4bab728a4d9ecf3a4626a945a671d236458f74a2 Mon Sep 17 00:00:00 2001 +From 77eec5eff2a1e24911bc38f1f96e5bf055058274 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,10 +20,10 @@ 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 4119012d85..6395d10561 100644 +index e727f00c8e..819dbb8aa3 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -174,7 +174,10 @@ void QLibrarySettings::load() +@@ -172,7 +172,10 @@ void QLibrarySettings::load() QSettings *QLibraryInfoPrivate::findConfiguration() { #ifdef QT_BUILD_QMAKE 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 4b48081e..eb866c7e 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 3f34b8d782f26876e4e62c6201454ea74ef90ab3 Mon Sep 17 00:00:00 2001 +From 394f8c1f2faae7cf54dc6882b3817c226d84152c 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 b3b3e27c44..45b5495bfd 100644 +index 64ed6b9ed8..bb2acbcd35 100644 --- a/configure.pri +++ b/configure.pri -@@ -837,10 +837,10 @@ defineTest(qtConfOutput_preparePaths) { +@@ -838,10 +838,10 @@ defineTest(qtConfOutput_preparePaths) { "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ "" \ "/* 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 0369e52c..3c1adaa2 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 68a9d70b13773587c7be0f5dad1829e4081749d1 Mon Sep 17 00:00:00 2001 +From 13dc97ded965a67af44d8cecad2762dedc928701 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 @@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index fe14ea1f40..1ee89bac46 100644 +index 81b820978a..bec0fb1149 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -1520,7 +1520,8 @@ defineReplace(qtConfEvaluateSingleExpression) { +@@ -1301,7 +1301,8 @@ defineReplace(qtConfEvaluateSingleExpression) { error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") return($$result) } 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 25b44db3..18bbd8b0 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 7406b73bc09b9b61b34417d384033b3f21959c6e Mon Sep 17 00:00:00 2001 +From 18ffe421246444e5f599fdb76d05a5981f4c611a 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 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 fdf8ac13..607b88a0 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 fdaadd9cd531866ac414970d1bec24a4b89a8538 Mon Sep 17 00:00:00 2001 +From b6cb180ea1fed0c7fa0e77ba9fbe36335b4f2780 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 2da95175..ea58a9f1 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 1caa83ba191dd4a819a6b7db5da8c293a1f46c57 Mon Sep 17 00:00:00 2001 +From ebe76b93dc894598b91cfd5934724ead5e4e62d0 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 @@ -36,7 +36,7 @@ index 5d9b5ca95c..ffcbddc442 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 c473230246..1db8d6f225 100644 +index 263a475435..11994b3c4f 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -78,6 +78,7 @@ 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 90b54fee..e0595715 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 b2bbab58fa5062011770b5a32d2d73e0c854623b Mon Sep 17 00:00:00 2001 +From 7aef68ed29b5fc96c99d65ccd5e217775044d27d 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 0884863b..e984d315 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 37dae545c6c5134b8c7aaac5e398cfec54349493 Mon Sep 17 00:00:00 2001 +From cb7f43dd24bc59baf1466b9f55c48b170c5912cf 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 e6ded389..d988f514 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 bcb16ca13fd33efaf24f62fb8253d7aeae3e3c91 Mon Sep 17 00:00:00 2001 +From 784a7d274ae96a5598ff886be0fab100e4919c31 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/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp -index 5d344834e6..1afc70d255 100644 +index 261689d401..40537daef9 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/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 e652f97e..fa0f7bfa 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 0ba4c8db7ec77d36e12fafd210ec189ccb176e96 Mon Sep 17 00:00:00 2001 +From 9b4355142608fecdf8353dc958f85b08a5bfb2b9 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 diff --git a/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch index 27b354b2..c3f2aed0 100644 --- a/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch +++ b/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch @@ -1,4 +1,4 @@ -From ebd6d61f9031fec80c7dde35819cabec727179aa Mon Sep 17 00:00:00 2001 +From 4a810779f45444d3432ce14bf24d053f5d049ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 21 Aug 2018 00:29:06 +0200 Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped @@ -15,7 +15,7 @@ Signed-off-by: Andreas Müller 1 file changed, 11 insertions(+) diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index b2d81066db..b90e3dc15d 100644 +index 5a5a3a82c6..e5469ff5d7 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -93,6 +93,17 @@ extern "C" NSString *NSTemporaryDirectory(); diff --git a/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch index d4a47fb8..c73733dc 100644 --- a/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch @@ -1,4 +1,4 @@ -From baa8339d0fda285b7410066827644aa8af0e5dfb Mon Sep 17 00:00:00 2001 +From 83f34d8a82867132b05394f9ce33b8b394454a8b 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/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index f620b3d7..b8b5b39f 100644 --- a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch @@ -1,4 +1,4 @@ -From 744a866a54780ab2c1acf9da875be0845726b20f Mon Sep 17 00:00:00 2001 +From d7bd980370d701fa9aeea48f1494d2df6ce3dd2f 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/0016-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch index 10a7698e..855f8550 100644 --- a/recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch +++ b/recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch @@ -1,4 +1,4 @@ -From 10d6966a88bdc997d2fdade463d267c25ba86f7d Mon Sep 17 00:00:00 2001 +From a138a37e24dd3926e4b3818f99f33139e22e52dc 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 @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+) diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h -index 0a6db9afcd..b791d0a172 100644 +index e318c3759b..1cf589c1e7 100644 --- a/src/corelib/global/qnumeric_p.h +++ b/src/corelib/global/qnumeric_p.h @@ -55,6 +55,7 @@ diff --git a/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch index 7144fbe4..c6963f6d 100644 --- a/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch +++ b/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch @@ -1,4 +1,4 @@ -From c79578126a744dda2feeeff7521438714859508a Mon Sep 17 00:00:00 2001 +From d836722dee0305cec50c23620600743f363b35c6 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 @@ -13,10 +13,10 @@ Signed-off-by: Khem Raj 1 file changed, 9 insertions(+) diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf -index c7ea20e180..8a6bb0052d 100644 +index 4ecfb8d889..5ed7e2f080 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf -@@ -210,6 +210,13 @@ defineReplace(qtVariablesFromGCC) { +@@ -205,6 +205,13 @@ defineReplace(qtVariablesFromGCC) { return($$ret) } @@ -30,7 +30,7 @@ index c7ea20e180..8a6bb0052d 100644 isEmpty($${target_prefix}.COMPILER_MACROS) { msvc { clang_cl { -@@ -229,6 +236,8 @@ isEmpty($${target_prefix}.COMPILER_MACROS) { +@@ -224,6 +231,8 @@ isEmpty($${target_prefix}.COMPILER_MACROS) { } else { vars = $$qtVariablesFromMSVC($$QMAKE_CXX) } diff --git a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch deleted file mode 100644 index 15ddbf31..00000000 --- a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9caf072bfa7393a70714ce1e10169be4bfb8c866 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 - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 1c76a2e46f..fbd4014fb3 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -232,7 +232,7 @@ qtConfig(gui) { - } - } - } --SUBDIRS += src_plugins -+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen - - nacl: SUBDIRS -= src_network src_testlib - diff --git a/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch b/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch new file mode 100644 index 00000000..db79e846 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch @@ -0,0 +1,28 @@ +From cde196cf74805cc0f47fbebce884a871859862b2 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Tue, 13 Nov 2018 16:00:23 +0100 +Subject: [PATCH] Fix compile issue with gcc 9 + +It appears messenne_twisters in the latest libstdc++ has one more +requirement before it is willing to construct with our +SystemGenerator struct as an sseq provider. + +Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe +Reviewed-by: Giuseppe D'Angelo +Reviewed-by: Thiago Macieira +--- + src/corelib/global/qrandom.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp +index 23e5e499b2..03534cf453 100644 +--- a/src/corelib/global/qrandom.cpp ++++ b/src/corelib/global/qrandom.cpp +@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator + #endif // Q_OS_WINRT + + static SystemGenerator &self(); ++ typedef quint32 result_type; + void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); + + // For std::mersenne_twister_engine implementations that use something 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 new file mode 100644 index 00000000..77437485 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch @@ -0,0 +1,28 @@ +From 3a870fb87411802a3e56b5bfa8423240c0036b44 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 + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 1c76a2e46f..fbd4014fb3 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -232,7 +232,7 @@ qtConfig(gui) { + } + } + } +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen + + nacl: SUBDIRS -= src_network src_testlib + diff --git a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index 69cbfa38..00000000 --- a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b53e518a341d975298b804af6eb0d2f9a31abaf4 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 - -qmake does not work together with pseudo when unnamed temporary files -are used with linkat. - -Upstream-Status: Inappropriate [OE specific] -[YOCTO #11996] ---- - src/corelib/global/qconfig-bootstrapped.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index dfcc3c9c7f..1e5bc401b7 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -91,7 +91,7 @@ - #define QT_FEATURE_itemmodel -1 - #define QT_FEATURE_library -1 - #ifdef __linux__ --# define QT_FEATURE_linkat 1 -+# define QT_FEATURE_linkat -1 - #else - # define QT_FEATURE_linkat -1 - #endif diff --git a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..afc2fcb9 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch @@ -0,0 +1,27 @@ +From 8820b1008d832aeab005406fcce1f6b4520426d6 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 + +qmake does not work together with pseudo when unnamed temporary files +are used with linkat. + +Upstream-Status: Inappropriate [OE specific] +[YOCTO #11996] +--- + src/corelib/global/qconfig-bootstrapped.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index f6a5d6b1d4..de0111cc3c 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -91,7 +91,7 @@ + #define QT_FEATURE_itemmodel -1 + #define QT_FEATURE_library -1 + #ifdef __linux__ +-# define QT_FEATURE_linkat 1 ++# define QT_FEATURE_linkat -1 + #else + # define QT_FEATURE_linkat -1 + #endif diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index c7e9d366..d27b1fa6 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.1 +# 5.12.meta-qt5-shared.2 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -33,6 +33,7 @@ SRC_URI += "\ file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0018-Fix-compile-issue-with-gcc-9.patch \ " @@ -259,4 +260,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "7fc427ba23a624a433d93e1c604d870656835305" +SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" -- cgit v1.2.3-54-g00ecf From c67abd66ff15feeaae5acc2688b932e5dec72317 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 24 Dec 2018 00:09:00 -0800 Subject: qtbase: Fix build with gcc 4.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes errors like In file included from ../include/QtCore/qendian.h:1:0, from TOPDIR/build/tmp/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+13ed06640c-r0/git/src/corelib/codecs/qutfcodec.cpp:43: ../include/QtCore/../../../git/src/corelib/global/qendian.h:165:61: error: redeclaration ‘constexpr T qbswap(T) [with T = qfloat16]’ differs in ‘constexpr’ Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 ++-- recipes-qt/qt5/qtbase-native_git.bb | 9 ++-- ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 2 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 2 +- ...ump-path-length-from-256-to-512-character.patch | 2 +- ...-unknown-features-instead-of-erroring-out.patch | 2 +- ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 2 +- .../0007-Delete-qlonglong-and-qulonglong.patch | 2 +- ...08-Replace-pthread_yield-with-sched_yield.patch | 2 +- ...-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 | 2 +- ...mon-gcc-base.conf-Use-I-instead-of-isyste.patch | 2 +- ...-version-for-renameat2-statx-on-non-boots.patch | 2 +- .../qtbase/0014-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 +- .../qtbase/0018-Fix-compile-issue-with-gcc-9.patch | 2 +- .../qtbase/0019-Always-build-uic-and-qvkgen.patch | 28 ------------- ...ing-Q_DECL_CONSTEXPR-to-float-conversion-.patch | 49 ++++++++++++++++++++++ .../qtbase/0020-Always-build-uic-and-qvkgen.patch | 28 +++++++++++++ .../0020-Bootstrap-without-linkat-feature.patch | 27 ------------ .../0021-Bootstrap-without-linkat-feature.patch | 27 ++++++++++++ recipes-qt/qt5/qtbase_git.bb | 3 +- 25 files changed, 132 insertions(+), 80 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch create mode 100644 recipes-qt/qt5/qtbase/0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch create mode 100644 recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch create mode 100644 recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch (limited to 'recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 31687913..6c9853ea 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.2 +# 5.12.meta-qt5-shared.3 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -43,13 +43,14 @@ SRC_URI += "\ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-Fix-compile-issue-with-gcc-9.patch \ + file://0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.2 +# 5.12.meta-qt5-native.3 SRC_URI += " \ - file://0019-Always-build-uic-and-qvkgen.patch \ + file://0020-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 3dc92499..d224487c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.2 +# 5.12.meta-qt5-shared.3 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -38,18 +38,19 @@ SRC_URI += "\ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-Fix-compile-issue-with-gcc-9.patch \ + file://0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.2 +# 5.12.meta-qt5-native.3 SRC_URI += " \ - file://0019-Always-build-uic-and-qvkgen.patch \ + file://0020-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0020-Bootstrap-without-linkat-feature.patch \ + file://0021-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" 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 c08f4901..96bad560 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 bd8119aaabd75c4a80141b25be48eb990e50ade8 Mon Sep 17 00:00:00 2001 +From 0b3ead1ff3942cdcb19ab949a0386b3618b20d2a 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 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 fd2ed42a..6f284949 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 77eec5eff2a1e24911bc38f1f96e5bf055058274 Mon Sep 17 00:00:00 2001 +From 2881fc4c8871dc5f4dd3798894bef0cdad04194f 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 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 eb866c7e..7e5674be 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 394f8c1f2faae7cf54dc6882b3817c226d84152c Mon Sep 17 00:00:00 2001 +From e5036f7002281cd122a9992da59270a25d9cff89 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 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 3c1adaa2..9b563b26 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 13dc97ded965a67af44d8cecad2762dedc928701 Mon Sep 17 00:00:00 2001 +From af450d151f0f9329fb207b7f06bbaa72d97aad0f 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 18bbd8b0..8e9e0b29 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 18ffe421246444e5f599fdb76d05a5981f4c611a Mon Sep 17 00:00:00 2001 +From f691e01eb5d30d4b18193f33b8b042d9ef8d30fe 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 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 607b88a0..bb93d8b9 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 b6cb180ea1fed0c7fa0e77ba9fbe36335b4f2780 Mon Sep 17 00:00:00 2001 +From 2d0c0a470b2b0cb0b1d4b6fcdbbd5e49bbb268e9 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 ea58a9f1..871e9ace 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 ebe76b93dc894598b91cfd5934724ead5e4e62d0 Mon Sep 17 00:00:00 2001 +From cbdcde6b124da35443cf435e0f04cfe75360ce90 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 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 e0595715..664767dd 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 7aef68ed29b5fc96c99d65ccd5e217775044d27d Mon Sep 17 00:00:00 2001 +From 12d00d903a16dba6f7aad0f4652addbd395765fe 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 e984d315..b0136274 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 cb7f43dd24bc59baf1466b9f55c48b170c5912cf Mon Sep 17 00:00:00 2001 +From 0e57390700e0c5e727307ced58f7664138a97a53 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 d988f514..2b9cbd20 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 784a7d274ae96a5598ff886be0fab100e4919c31 Mon Sep 17 00:00:00 2001 +From aaeb2c108346466614e8b2f16408cccf1626dbcf 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 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 fa0f7bfa..4ecbef82 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 9b4355142608fecdf8353dc958f85b08a5bfb2b9 Mon Sep 17 00:00:00 2001 +From 25fe85b199ab52bfa0a2e4c1da41fee1f4a26fbe 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 diff --git a/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch index c3f2aed0..7a0f334a 100644 --- a/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch +++ b/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch @@ -1,4 +1,4 @@ -From 4a810779f45444d3432ce14bf24d053f5d049ca8 Mon Sep 17 00:00:00 2001 +From 3aa91c5947c880e9e0380c9b481bfafd2eeb566c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 21 Aug 2018 00:29:06 +0200 Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped diff --git a/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch index c73733dc..f8a51572 100644 --- a/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch @@ -1,4 +1,4 @@ -From 83f34d8a82867132b05394f9ce33b8b394454a8b Mon Sep 17 00:00:00 2001 +From d64de84020798e9f4645d876b99a81cedfc051fa 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/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index b8b5b39f..b4e98a3f 100644 --- a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch @@ -1,4 +1,4 @@ -From d7bd980370d701fa9aeea48f1494d2df6ce3dd2f Mon Sep 17 00:00:00 2001 +From 852a06e11ece7b1a74785bdea2235583d0275007 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/0016-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch index 855f8550..06b7ae45 100644 --- a/recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch +++ b/recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch @@ -1,4 +1,4 @@ -From a138a37e24dd3926e4b3818f99f33139e22e52dc Mon Sep 17 00:00:00 2001 +From 05d36eef240f707d309f9abbbeead2a428e6828b 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/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch index c6963f6d..191c475d 100644 --- a/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch +++ b/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch @@ -1,4 +1,4 @@ -From d836722dee0305cec50c23620600743f363b35c6 Mon Sep 17 00:00:00 2001 +From 8d03a813e3354af543f6b54928629c75ce989781 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/0018-Fix-compile-issue-with-gcc-9.patch b/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch index db79e846..e5e9813b 100644 --- a/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch +++ b/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch @@ -1,4 +1,4 @@ -From cde196cf74805cc0f47fbebce884a871859862b2 Mon Sep 17 00:00:00 2001 +From 4bc9f80bb0875648a2f3eca5b14e4e9e56cfda4d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 13 Nov 2018 16:00:23 +0100 Subject: [PATCH] Fix compile issue with gcc 9 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 deleted file mode 100644 index 77437485..00000000 --- a/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3a870fb87411802a3e56b5bfa8423240c0036b44 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 - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 1c76a2e46f..fbd4014fb3 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -232,7 +232,7 @@ qtConfig(gui) { - } - } - } --SUBDIRS += src_plugins -+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen - - nacl: SUBDIRS -= src_network src_testlib - diff --git a/recipes-qt/qt5/qtbase/0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch b/recipes-qt/qt5/qtbase/0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch new file mode 100644 index 00000000..42c3d2fb --- /dev/null +++ b/recipes-qt/qt5/qtbase/0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch @@ -0,0 +1,49 @@ +From c10b4df78f56f4ad3db563fe73d0ebece3e5284c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 24 Dec 2018 00:05:06 -0800 +Subject: [PATCH] qendian: Adding Q_DECL_CONSTEXPR to float conversion + specializations + +This fixes build failures seen with gcc 4.8 +Fixes https://bugreports.qt.io/browse/QTBUG-71945 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/corelib/global/qendian.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h +index 0e67a1ab8e..75f109f26c 100644 +--- a/src/corelib/global/qendian.h ++++ b/src/corelib/global/qendian.h +@@ -153,7 +153,7 @@ template <> inline Q_DECL_CONSTEXPR qint8 qbswap(qint8 source) + } + + // floating specializations +-template ++template Q_DECL_CONSTEXPR + Float qbswapFloatHelper(Float source) + { + // memcpy call in qFromUnaligned is recognized by optimizer as a correct way of type prunning +@@ -162,17 +162,17 @@ Float qbswapFloatHelper(Float source) + return qFromUnaligned(&temp); + } + +-template <> inline qfloat16 qbswap(qfloat16 source) ++template <> inline Q_DECL_CONSTEXPR qfloat16 qbswap(qfloat16 source) + { + return qbswapFloatHelper(source); + } + +-template <> inline float qbswap(float source) ++template <> inline Q_DECL_CONSTEXPR float qbswap(float source) + { + return qbswapFloatHelper(source); + } + +-template <> inline double qbswap(double source) ++template <> inline Q_DECL_CONSTEXPR double qbswap(double source) + { + return qbswapFloatHelper(source); + } diff --git a/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch new file mode 100644 index 00000000..89ea8778 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch @@ -0,0 +1,28 @@ +From f43c877cc27a1042c5ba898fd3865164a200ce40 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 + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 1c76a2e46f..fbd4014fb3 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -232,7 +232,7 @@ qtConfig(gui) { + } + } + } +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen + + nacl: SUBDIRS -= src_network src_testlib + diff --git a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index afc2fcb9..00000000 --- a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8820b1008d832aeab005406fcce1f6b4520426d6 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 - -qmake does not work together with pseudo when unnamed temporary files -are used with linkat. - -Upstream-Status: Inappropriate [OE specific] -[YOCTO #11996] ---- - src/corelib/global/qconfig-bootstrapped.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index f6a5d6b1d4..de0111cc3c 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -91,7 +91,7 @@ - #define QT_FEATURE_itemmodel -1 - #define QT_FEATURE_library -1 - #ifdef __linux__ --# define QT_FEATURE_linkat 1 -+# define QT_FEATURE_linkat -1 - #else - # define QT_FEATURE_linkat -1 - #endif diff --git a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..6ac54fdf --- /dev/null +++ b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch @@ -0,0 +1,27 @@ +From f21492a98b2a738e53134be8b7bf8ce44af71712 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 + +qmake does not work together with pseudo when unnamed temporary files +are used with linkat. + +Upstream-Status: Inappropriate [OE specific] +[YOCTO #11996] +--- + src/corelib/global/qconfig-bootstrapped.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index f6a5d6b1d4..de0111cc3c 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -91,7 +91,7 @@ + #define QT_FEATURE_itemmodel -1 + #define QT_FEATURE_library -1 + #ifdef __linux__ +-# define QT_FEATURE_linkat 1 ++# define QT_FEATURE_linkat -1 + #else + # define QT_FEATURE_linkat -1 + #endif diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 001b01e2..3f7ee3c7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.2 +# 5.12.meta-qt5-shared.3 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -34,6 +34,7 @@ SRC_URI += "\ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-Fix-compile-issue-with-gcc-9.patch \ + file://0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch \ " -- cgit v1.2.3-54-g00ecf