diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-19 11:27:38 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-22 06:47:41 +0000 |
| commit | f6373503a015b3a5b4f797c286dfc07e660cc20b (patch) | |
| tree | 86d689c7c177316e28fe194f187f1a8464bf8a78 | |
| parent | 5b7563e30c20156d4c6247ad259c28c17d621cb2 (diff) | |
qt5: upgrade to 5.9.8
* unfortunatelly most of the modules don't have the v5.9.8 tags
merged to 5.9 branch yet, the only exception are:
qtnetworkauth, qtremoteobjects, qttranslations
* in most cases it means that we're missing just changes files, but
in some cases there are also some functional commits which are
missing in 5.9 SRCREV:
qtdeclarative:
9d6d2ee21 Use Los Angeles to represent PST8PDT, not Vancouver
qtimageformats:
11a7040 Update bundled libtiff to version 4.0.10
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
76 files changed, 184 insertions, 91 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 3f57d34c..d7f58fd2 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -26,7 +26,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared -# 5.9.meta-qt5-shared.7 +# 5.9.meta-qt5-shared.8 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -43,7 +43,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native -# 5.9.meta-qt5-native.7 +# 5.9.meta-qt5-native.8 SRC_URI += " \ file://0012-Always-build-uic.patch \ " @@ -200,4 +200,7 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "81b29a44d248b5037a2f05dd8815e000d9472f0e" +# Use 159f7e9c39c57177d25f524ae3cad4e533b89da8 +# instead of 82eb6aa08e5dc8a57402b69b4e55ce7d2371e84b because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "159f7e9c39c57177d25f524ae3cad4e533b89da8" diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index c5acafb9..d8453129 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From a6cef77852c47edc18f665f69284940875980da5 Mon Sep 17 00:00:00 2001 +From c765300b6040f8cdc32c7db0dc4f6f8935c7fb5a Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@theqtcompany.com> Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build diff --git a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch index 4d17f619..499df6ae 100644 --- a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +++ b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch @@ -1,4 +1,4 @@ -From 9367531198ba852fa1f71f9fb79b1e430cdcfa2d Mon Sep 17 00:00:00 2001 +From 6ed84ae5e709275ad101fc87823b5feead60c158 Mon Sep 17 00:00:00 2001 From: Kim Kulling <kim.kulling@googlemail.com> Date: Mon, 7 Nov 2016 17:19:49 +0100 Subject: [PATCH] Fix BlenderDNA for clang cross compiler. diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index f35f5695..56e94e89 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -12,7 +12,7 @@ DEPENDS += "qtbase" DEPENDS_class-target += "qtdeclarative qt3d-native" # Patches from https://github.com/meta-qt5/qt3d/commits/b5.9 -# 5.9.meta-qt5.7 +# 5.9.meta-qt5.8 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ @@ -37,6 +37,9 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "de5e7839d638a2cf27703a337d004e3e5a557c82" +# Use 9e05583a8e95d578656fe32c83303f11b651e029 +# instead of 0d923f9fc31fe55006b5e72539bd20ec016ca856 +# because v5.9.8 wasn't merged to 5.9 branch yet +SRCREV = "9e05583a8e95d578656fe32c83303f11b651e029" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 71333edb..262f62c4 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.9.7+git${SRCPV}" +PV = "5.9.8+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 30f1cdaf..0e75f4fe 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -21,7 +21,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared -# 5.9.meta-qt5-shared.7 +# 5.9.meta-qt5-shared.8 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -38,7 +38,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native -# 5.9.meta-qt5-native.7 +# 5.9.meta-qt5-native.8 SRC_URI += " \ file://0012-Always-build-uic.patch \ " @@ -125,4 +125,7 @@ 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 = "81b29a44d248b5037a2f05dd8815e000d9472f0e" +# Use 159f7e9c39c57177d25f524ae3cad4e533b89da8 +# instead of 82eb6aa08e5dc8a57402b69b4e55ce7d2371e84b because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "159f7e9c39c57177d25f524ae3cad4e533b89da8" 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 a6f11442..7d43e177 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 3dc56623a89899868a5b975507ce80169e84c8f2 Mon Sep 17 00:00:00 2001 +From 6b2c5c97714f4ef62cbeedbc9f038c34a2ac27c8 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> 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 4b1fd626..46f20709 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 1e77843fa9968c0be82d552f3ead308b6071bbac Mon Sep 17 00:00:00 2001 +From 94fa0e4aa9da5ed70b839516a808883fa09835bf Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> 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 582a35df..68610cb7 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 e54caac2c1dddbbf9a3e2569356067e42d19a904 Mon Sep 17 00:00:00 2001 +From 8f0bff977e47addf4cc3b5ab59f793ffb33e044d Mon Sep 17 00:00:00 2001 From: Holger Freyther <zecke@selfish.org> 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 53ba7f87..caff28dc 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 9959c2f9d56e12836409dfee89ba41ece0e88358 Mon Sep 17 00:00:00 2001 +From 6d9396d6872b12938ee1a6a55de89ad2e6ec1431 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <denys@ti.com> 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 923a23d2..ab5f9e13 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 8dc5b6d96c4b29c19a6bf5c1ac1654c96ed7bcd5 Mon Sep 17 00:00:00 2001 +From ddc950dca4b2f637d85d459bc1e07873b215d82a Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> 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 f2b58b58..3bf5f36f 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 56b24f318e0030f7d98605ae88b4277bfcf433ef Mon Sep 17 00:00:00 2001 +From 9a7704c87851f02f7c82ef4357275f00f1d1d249 Mon Sep 17 00:00:00 2001 From: Pascal Bach <pascal.bach@siemens.com> 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 25115fc2..9912093b 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 e9c6d679909ee9e1c88fe8b32f925fdd297e9d2c Mon Sep 17 00:00:00 2001 +From 30e17f2c0bc42134e89664993cf2972aefdb5795 Mon Sep 17 00:00:00 2001 From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> 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 75f047dd..1fcfadaf 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 164c79646981537cacc1ad34e4900b36cda7e5d4 Mon Sep 17 00:00:00 2001 +From ce7ca3179bce5472108866ee1708efd1505c05d7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 27 Jul 2017 08:02:51 -0700 Subject: [PATCH] Replace pthread_yield with sched_yield 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 367a32f7..e163b704 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 b4965aaf7e244535aa7bfeed893956c839251799 Mon Sep 17 00:00:00 2001 +From 6bb3138fa7ffeb9a2aef5e6030ed34fa29f862c3 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> 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 a6e46ed0..ee8961e4 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 617c40070354c4a39d9200289b1ac66ac5d344df Mon Sep 17 00:00:00 2001 +From 46f08d16f2650635d71f7dc95d3a3ed06e92ce87 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> 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 e1afb963..51aa67f0 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 e557afa2241d5a05a45d78693edf61aa036985cd Mon Sep 17 00:00:00 2001 +From 7e529b918f4189bea404016b5263e41794710472 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> 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-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch index eac5d22a..5c923e87 100644 --- a/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch @@ -1,4 +1,4 @@ -From cf844e4fe4f3316defecfcc8d4ccbe01b93f91f0 Mon Sep 17 00:00:00 2001 +From bae48d55cb74a613a788f845fb34430197c0599f Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 980850a5..0276c881 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared -# 5.9.meta-qt5-shared.7 +# 5.9.meta-qt5-shared.8 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -220,4 +220,7 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "81b29a44d248b5037a2f05dd8815e000d9472f0e" +# Use 159f7e9c39c57177d25f524ae3cad4e533b89da8 +# instead of 82eb6aa08e5dc8a57402b69b4e55ce7d2371e84b because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "159f7e9c39c57177d25f524ae3cad4e533b89da8" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 91479411..894a1371 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -10,4 +10,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "18d8003c31dfd79acf0c4c811ea2cfa7b8472835" +# Use 909a41f68455cf9f7e0d5ba14ca59641a18b6c6f +# instead of 2097038d94301c0a1e684c939d29bc24620ce3c4 +# because v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "909a41f68455cf9f7e0d5ba14ca59641a18b6c6f" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 74fdae8c..a787164e 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,10 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "7c1ea2526f2d6103ca2e68f8288ab2de42e3965a" +# Use f7fb6e5b3c321c824d597363504cae6cf7d37c43 +# instead of ff7e0b5106a847541e13decfd8cbc57985d001b7 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "f7fb6e5b3c321c824d597363504cae6cf7d37c43" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index bb7bc37f..f3d84af7 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,7 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "8cdcc580a2b38cf7f43bd62de13e11e201647a4a" +# Use 3349d962e8ef1bbef4c72bacdd38854e7d3973a1 +# instead of cd4b17113017df0f9811aa2bd2add37a475a667f because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "3349d962e8ef1bbef4c72bacdd38854e7d3973a1" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 7067abe7..0e58a8e5 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "fbd774738f9c67f6fccd7e0826fb42793223320e" +# Use 46a49e34b9644da11f9e68d6ea3b45d586c711cf +# instead of 243106a56ff681ffefcf65af8ecd30fc14181200 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "46a49e34b9644da11f9e68d6ea3b45d586c711cf" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 11a0868b..f027a147 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -30,6 +30,9 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "9e5de38fbb1d46d2fbd3ace3d5267a2e708d144d" +# Use 24af53cfeb998dcf3a6c6d49d312e50809a4a324 +# instead of 145485bec922e9fb062e2b286916c98385e2e84d because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "24af53cfeb998dcf3a6c6d49d312e50809a4a324" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 4b4a8fc3..17128161 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,7 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "27a786da9f33c8911735438856f26224526f4661" +# Use 7da058990dd7ab2898f27300e2a3757069ecc1ca +# instead of 6f1dca6e8b183a42c7a428645196a9d305602077 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "7da058990dd7ab2898f27300e2a3757069ecc1ca" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index f58e2522..0ae824d5 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,4 +18,7 @@ RDEPENDS_${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "1489bbaad9e7d8b1c415e0904a15dd7dd6eb78bb" +# Use 9f3378d1c6218d6fa49fba354026ee489c220e2e +# instead of 718e1e1f376ef990b998aa72e2029085e6b455be because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "9f3378d1c6218d6fa49fba354026ee489c220e2e" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 051243d6..9d161709 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -26,4 +26,7 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "a90c09c2e6fa845b7951c27e6970dbb7677ddc99" +# Use 23c609ea8de35f9bd6d9304ac8fde3138e02a75b +# instead of 50f78099ca9add9ba9ea5a3e464c864d5a98aee3 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "23c609ea8de35f9bd6d9304ac8fde3138e02a75b" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 6b2315b1..95358344 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -29,7 +29,10 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "018773949e3ed64d00fb82413aa7d63f3b295941" +# Use bdea5c63a0be0802bcb49b2fd30bac233a8ee50f +# instead of 3696006091d0536270c5f8499b19be12e54d841f because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV_qtlocation = "bdea5c63a0be0802bcb49b2fd30bac233a8ee50f" SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch index 07f127ca..15365923 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch @@ -1,4 +1,4 @@ -From b1622c53d65c11212f9c9b61303b70cf3e65c729 Mon Sep 17 00:00:00 2001 +From ed4b7ebd4c4a367691d4c958e69e350d3a28ad1d Mon Sep 17 00:00:00 2001 From: Wenlin Kang <wenlin.kang@windriver.com> Date: Thu, 8 Sep 2016 12:18:13 +0800 Subject: [PATCH] qtmultimedia: fix a conflicting declaration diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 316ee622..978416fe 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -26,7 +26,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9 -# 5.9.meta-qt5.7 +# 5.9.meta-qt5.8 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " @@ -35,4 +35,7 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "2a3c5de691ae25ca37b91cd54bacddb8187ba52f" +# Use 2c22b9c106aee7df19c06f764b25f82ce844121a +# instead of b0df68530506e2b3b17365f07711d80dda6ff44c because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "2c22b9c106aee7df19c06f764b25f82ce844121a" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 8b874fa3..b9f74626 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "441a232141f155a903b0c10c3a9d9bb4b39fe490" +SRCREV = "00a49f18f66219730af26dd23899b6d8ed9f9e76" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 83744c69..de66a603 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "f4af8a1987cc3fed8120062fbeb5659c7b2b77df" +# Use 8b45a73ecac779969d491a19bbe0393f6328a3a6 +# instead of 1ef144bf3a324ac4bdea092a0b845cb483ec9a1d because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "8b45a73ecac779969d491a19bbe0393f6328a3a6" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 72b1009b..b8171ac2 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -19,4 +19,7 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "1afae24d7f3a67b2727ec6283c44275935de55e1" +# Use 6bca42077ed4c50582d5f6b8d4e6f1a989a2081f +# instead of 8c3b97959cb2c157102994082dd2ba0e1985ced7 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "6bca42077ed4c50582d5f6b8d4e6f1a989a2081f" diff --git a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch index 3f7886e8..78f45a2b 100644 --- a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From b30246c633d18b8519ab1158bdf854c05564add5 Mon Sep 17 00:00:00 2001 +From 68a2063462cddd5c2f25815cdd54c793b7ddd095 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 7 Jun 2017 15:17:12 +0300 Subject: [PATCH] Allow a tools-only build diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 70aaf0fc..a55a8ad0 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -12,7 +12,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9 -# 5.9.meta-qt5.7 +# 5.9.meta-qt5.8 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ " @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "b0a23414763c9c268cb6f02a0d5f2189fda0e339" +SRCREV = "b78f04561775639f79bea7acca3b6591515e2af1" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 3684f840..33fa5bad 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -29,4 +29,7 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "da4e4ac0c2c18d7941c218979aa352a86d71df31" +# Use 8fa8656baa5ca3a9b7c170ef473d5b06d3e18ff8 +# instead of 4fe24b5f0d104976f361fd03e5398730bccc4c98 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "8fa8656baa5ca3a9b7c170ef473d5b06d3e18ff8" diff --git a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch index 38aeb3db..0da44407 100644 --- a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch +++ b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch @@ -1,4 +1,4 @@ -From 3713578c07c310554bec11699ee43d4a7bf1d7db Mon Sep 17 00:00:00 2001 +From 39e7ef28cbbd1898cb31808e47161349bbc417b0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Tue, 10 Jan 2017 15:28:26 +0200 Subject: [PATCH] Use external host bin path for cmake file diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 1f9d7d56..a6f59f8d 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,10 +10,13 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "f66526f7ba7332cc7ecca9bd68fca456eae845eb" +# Use 6e92327231c6d46bd9981fce33b4f33058287961 +# instead of f3448b881740eb72befe229999bd5bc8b48908ee because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "6e92327231c6d46bd9981fce33b4f33058287961" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 -# 5.9.meta-qt5.7 +# 5.9.meta-qt5.8 SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" do_install_append_class-nativesdk() { diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 294f992b..6c90e232 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "bc655d7a6c255abff91f7b3950f8a0491f9539b0" +# Use 268aa08850df9220dfd7e59ea6e7f40b36c4bdc2 +# instead of 247c06da51ee9cf7a91c01ae3b013690f9ab7809 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "268aa08850df9220dfd7e59ea6e7f40b36c4bdc2" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 967603e6..d658a067 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "f7669e84496491a2fb08bf13d020aa72071a8f69" +# Use d0cb148f1abb570ddbd3fb5360784e0287938f69 +# instead of fdc716e10ac630416c04275640daaa65d6c92dd8 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "d0cb148f1abb570ddbd3fb5360784e0287938f69" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 2ed31ab1..188697f8 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -15,4 +15,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "74c89bb84489166eedf76ff1091f8ad94f0040d0" +# Use bc3a39de8f5340bb0827510f7d9eebe643bdfba8 +# instead of a5b4f0511006bfa4999beb0df094e11d25a4e6eb because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "bc3a39de8f5340bb0827510f7d9eebe643bdfba8" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 1db4ecd5..dca4eea8 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -13,4 +13,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "d7e914968c363bea7fd318f758795c950e0a8639" +# Use 87396c089f0695e05b50c6efe478a1062ff700b8 +# instead of 44de875f059c35c4819f331a2fae1ab52c81c62c because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "87396c089f0695e05b50c6efe478a1062ff700b8" diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 9a0b4938..d88ef266 100644 --- a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch @@ -1,4 +1,4 @@ -From 6acf3f66e312ffabc3845a26f29b70c5fddc0a04 Mon Sep 17 00:00:00 2001 +From 922c20a7285c2b5a5bc0280de4c09031ad76f6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH] add noqtwebkit configuration diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch index eb0630ea..29f7f386 100644 --- a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -1,4 +1,4 @@ -From fa25039d01341d9cf18e50631282d48640e679d6 Mon Sep 17 00:00:00 2001 +From ae7453d30a8b1da362db035861b254f77b5764ea Mon Sep 17 00:00:00 2001 From: Cody P Schafer <dev@codyps.com> Date: Thu, 9 Jul 2015 11:28:19 -0400 Subject: [PATCH] linguist-tools cmake: allow overriding the location for diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 9d4b7311..ae30c945 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" # Patches from https://github.com/meta-qt5/qttools/commits/b5.9 -# 5.9.meta-qt5.7 +# 5.9.meta-qt5.8 SRC_URI += " \ file://0001-add-noqtwebkit-configuration.patch \ file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ @@ -29,7 +29,10 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "961d99bb82f042c410ed826bfd39f8edb5d79bf0" +# Use e8d9ac8ab166d2e740a0df480277397d3b8a1283 +# instead of cb4fb7bdd59bb57324893cf1b226f380d03b574f because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "e8d9ac8ab166d2e740a0df480277397d3b8a1283" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index d51866ef..24938790 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -106,4 +106,4 @@ FILES_${PN}-qt = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "4e021d60f9e7493c071e02d45087de0804e2949f" +SRCREV = "caf6bbc354e63edb4f9f851963785a9f2b23312b" diff --git a/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch b/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch index ef3d7619..902dabee 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch +++ b/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch @@ -1,4 +1,4 @@ -From cd1618314be779611bdee0a1c3b94658728254b8 Mon Sep 17 00:00:00 2001 +From 4188b0c728947abd0434f6c8edfa4303dfe03bf8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 12 Jul 2017 23:59:52 -0700 Subject: [PATCH] include sys/time.h for timeval diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 99a638bf..ac772c3b 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ " # Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9 -# 5.9.meta-qt5.7 +# 5.9.meta-qt5.8 SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" # To enabled Nuance T9 Write support, you need to provide the licensed components @@ -53,4 +53,7 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "e4b82e3a3f91c681df439d5228fa2755134b87ef" +# Use a2e7b8412f56841e12ed20a39f4a38e32d3c1e30 +# instead of dc18b608b5267ef7bce854aff6803a98137f43d2 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "a2e7b8412f56841e12ed20a39f4a38e32d3c1e30" diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch index f3d90d87..debca547 100644 --- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch @@ -1,4 +1,4 @@ -From e503324502c98080a5d97f597c3c2acc164044c3 Mon Sep 17 00:00:00 2001 +From 3c7bf618ca67f8f31af425ba59ea87005d6ed0ea Mon Sep 17 00:00:00 2001 From: Raphael Freudiger <laser_b@gmx.ch> Date: Tue, 10 Jan 2017 15:49:55 +0100 Subject: [PATCH] fix build without xkbcommon-evdev diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 6dfb34b3..5b6afe70 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,10 +37,13 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "44a28bb06d66be1b7ccdc94e36e931002df8d21c" +# Use 7ed01d849a6813b06e2ce5660fa494879f86e694 +# instead of 79ec94d0efbeabe485275e5c79c828aa64641afa because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "7ed01d849a6813b06e2ce5660fa494879f86e694" # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 -# 5.9.meta-qt5.7 +# 5.9.meta-qt5.8 # From https://bugreports.qt.io/browse/QTBUG-57767 SRC_URI += " \ file://0001-fix-build-without-xkbcommon-evdev.patch \ diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 9b8fa747..0e65ce60 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "cd32de3a030fb956e6a6e045b084719a5cb2f8dc" +# Use 625a73dcbb50bf927c9559556d5db9d7996b92d0 +# instead of e23e37189fb78cb090c67fd01b187b7a59aa8c77 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "625a73dcbb50bf927c9559556d5db9d7996b92d0" diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch index ac730395..5e3597e6 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch @@ -1,4 +1,4 @@ -From bd5763bb31331fca4a4a69354c91fc50c6d1ed52 Mon Sep 17 00:00:00 2001 +From 14ca976a0aa44338f9c56c0a93ee3ee4b1e46e58 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <cleitonrbueno@gmail.com> Date: Thu, 24 Dec 2015 12:46:58 -0200 Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch index 897b173e..691fed86 100644 --- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 7d2c8552f7fd0234f9afeeee214e0614f3200bcb Mon Sep 17 00:00:00 2001 +From 6c554c9fbd80ca904208a0ebd585d95aff6fe292 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf <frieder.schrempf@online.de> Date: Mon, 1 Dec 2014 14:34:40 +0000 Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform diff --git a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index 8af72881..d702448a 100644 --- a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch @@ -1,4 +1,4 @@ -From 3e9f64be66ecab4559a3b144519bc1e22280c1c3 Mon Sep 17 00:00:00 2001 +From 707d6d094c54037ddfd0503aaf38e8a6243582e7 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <cleitonrbueno@gmail.com> Date: Fri, 25 Dec 2015 18:16:05 -0200 Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch index 1dea8a24..c11b0016 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From 5a1dadbc395af3ceb24996eda00520e8d5db6d36 Mon Sep 17 00:00:00 2001 +From 68086df46104b2fd5068d45fe442b00388a67ac0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] chromium: Force host toolchain configuration diff --git a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch index 4eeefa79..15c6e7a8 100644 --- a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch @@ -1,4 +1,4 @@ -From 8b42e9d563ccc57c4869e91136bdaa9ce29fc0d3 Mon Sep 17 00:00:00 2001 +From 1da5916c23ab056b2bb8a2c5f109790c7761974d Mon Sep 17 00:00:00 2001 From: Cleiton Bueno <cleitonrbueno@gmail.com> Date: Thu, 24 Dec 2015 15:59:51 -0200 Subject: [PATCH] Include dependency to QCoreApplication::translate() diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch index fb675a62..bd0a61d3 100644 --- a/recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch @@ -1,4 +1,4 @@ -From 998265280b0aa664343ea9f63490819cc5ed61fb Mon Sep 17 00:00:00 2001 +From 935cfd9ba20ff79d6742a787aabb004a2d809c6a Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Thu, 30 Mar 2017 11:37:24 +0300 Subject: [PATCH] chromium: workaround for too long .rps file name diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch index 72fd7941..ebbce322 100644 --- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From 9e148c9bee3e6cbc5d0275911c06a91c12219db3 Mon Sep 17 00:00:00 2001 +From 617cbf6ada09f7ab365bfcb83a7a2273e8ba5885 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index 01b04dbb..30a9d090 100644 --- a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -1,4 +1,4 @@ -From 635b97b3abb1ba4f7182172bba3620bfb40d7fb9 Mon Sep 17 00:00:00 2001 +From 2fc4c4c80747b8333bf9575f2d493bbfd8d6cc81 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:01:12 -0700 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index 0a7017a4..3e6a239d 100644 --- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -1,4 +1,4 @@ -From 70a552d2b1c8c58ecf842094643ca09aec69ace2 Mon Sep 17 00:00:00 2001 +From ac67d864de3f94b7289b2c44197ee6e641f611bb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:09:06 -0700 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch index 9d97ad2f..2486fcb4 100644 --- a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -1,4 +1,4 @@ -From 6bf0cc6a2625c868dde404938626925ff63697cf Mon Sep 17 00:00:00 2001 +From d358a31dbe88fa3ad3a83099ec72c8100204fec7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:37:49 -0700 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index eeeb73ff..21b935bd 100644 --- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -1,4 +1,4 @@ -From 11ad78ee9b5647296f78a1b8488147f09685dd93 Mon Sep 17 00:00:00 2001 +From 17889464f4f544b330f483ea94843cbbfae66cfb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:38:37 -0700 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch index e0a9cbc1..c23aa2da 100644 --- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch @@ -1,4 +1,4 @@ -From 4ca1fb7013c00b23c8697c14604a89c566866fa2 Mon Sep 17 00:00:00 2001 +From fbbc129624e9005a9194ee9dd0d00b44d58808a7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 14:54:38 -0700 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch index 625a35d9..0c8415de 100644 --- a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch @@ -1,4 +1,4 @@ -From c5675d4fd7116dac65e0949aa3a165e38d3dc77e Mon Sep 17 00:00:00 2001 +From 315976898ad10b8db31fe08f094b722c50980706 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:09:02 -0700 Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols diff --git a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch index 8f1d0d52..fd4bfb68 100644 --- a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch @@ -1,4 +1,4 @@ -From e035ecd3a54104b61952f98335043a08c75878cc Mon Sep 17 00:00:00 2001 +From 16d8052c5262e9e81055d4a626ba71c2f7277feb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:12:39 -0700 Subject: [PATCH] chromium: musl: Use correct member name __si_fields from diff --git a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch index 50536244..8369836e 100644 --- a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch @@ -1,4 +1,4 @@ -From f054310846e1dae06205c7b54a89aada9f34d16f Mon Sep 17 00:00:00 2001 +From 5d25c2e234593e6f9ab155bda05dc34e3fb13c71 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:24:49 -0700 Subject: [PATCH] chromium: musl: Match syscalls to match musl diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index c656b063..183a9e58 100644 --- a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -1,4 +1,4 @@ -From a2ea7f47e39dd36d4329b4aeaf282b8e73dfa24e Mon Sep 17 00:00:00 2001 +From f63b2463e1b6354494f6eb2008afcd7c747507eb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:27:50 -0700 Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch index b7e3619d..375f9591 100644 --- a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -1,4 +1,4 @@ -From f6559e7e25ef6f3f076bbc2d004ba9b72c8d6324 Mon Sep 17 00:00:00 2001 +From 2e102432a5dfdf09fff80d7265ddab1785abbcf8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 15:39:57 -0700 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch index 59af39a5..e43782d8 100644 --- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -1,4 +1,4 @@ -From 61a447ce03b444337b6c58c8309ab1d11105cb02 Mon Sep 17 00:00:00 2001 +From 4368aab2674b3bfbcdaa279a08c0b6f95aa472ea Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 16:41:23 -0700 Subject: [PATCH] chromium: musl: Adjust default pthread stack size diff --git a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch index 224ee3b9..cc3db943 100644 --- a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +++ b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch @@ -1,4 +1,4 @@ -From 03a5f71696c5489d3d2c38d2305fc8ef1c70819f Mon Sep 17 00:00:00 2001 +From f0a375e8d7b39df2c2915d69011b8cefa3524f52 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Jul 2017 17:15:34 -0700 Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 diff --git a/recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch index 2e678939..2f5963f0 100644 --- a/recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch +++ b/recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch @@ -1,4 +1,4 @@ -From 753027a9bceeb28e2286b4ebd7f8b599600b5717 Mon Sep 17 00:00:00 2001 +From 3f8d99a3fece7d0b0db76368691fbc5bc34368a7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 8 Jul 2017 09:08:23 -0700 Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index b861f9c4..e033b89f 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -131,7 +131,7 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "56-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 -# 5.9.meta-qt5.7 +# 5.9.meta-qt5.8 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ @@ -141,7 +141,7 @@ SRC_URI += " \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based -# 56-based.meta-qt5.7 +# 56-based.meta-qt5.8 SRC_URI += " \ file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ @@ -164,8 +164,11 @@ SRC_URI_append_libc-musl = "\ file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "ff3de56218e1012e3b0dd056356253b105eb6f2e" -SRCREV_chromium = "13704549b84a86e894d707a97cfe2ad15a86f30c" +# Use 75283c0240c76b49dade0e2a6c9ad9339b5e2704 +# instead of 86f8a0dfa47fea0ba41c386a9753db94d8de3b54 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV_qtwebengine = "75283c0240c76b49dade0e2a6c9ad9339b5e2704" +SRCREV_chromium = "45ed09101724148401a193e20e3545c8f3de4df2" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index af26d7a3..b654318d 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "df91b5103f4571b9605e4fae50264f101e6931ae" +# Use 3a7a8c98a12569f133f7914118e13ec919f2e484 +# instead of b5d8a09e573ae5c194a962e84a31ef3251250258 because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "3a7a8c98a12569f133f7914118e13ec919f2e484" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index ce573bae..a2e20590 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,7 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "913221453dfbf35d69030819b099c109e078116f" +# Use a3b5e85c924008e1968975825a0e61b040d6d88b +# instead of 6ea20e8930b02928a20173c1718ba5efd7b24dec because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "a3b5e85c924008e1968975825a0e61b040d6d88b" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 802f7893..1352c053 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,4 +13,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "34dcc9ea768efc83a299c39a7a4572c66f7eb6a2" +# Use 3a798695bcda58b3884a9ba278aeca4c79f21ae0 +# instead of 078fef443e40b99098dc5a035ae6e4072682cdbe because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "3a798695bcda58b3884a9ba278aeca4c79f21ae0" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 97eba835..1d3b3c22 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -15,6 +15,9 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "f00a23160e9795615912aa14cf412c7ed278fe50" +# Use 2756d99c14c098a6732635843221550ba68b8840 +# instead of 03d89c93e98af5fe3341c4d634dfe675c2fefefa because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "2756d99c14c098a6732635843221550ba68b8840" BBCLASSEXTEND =+ "native nativesdk" |