diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-04 12:29:13 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-19 12:26:39 +0000 |
commit | 5b7563e30c20156d4c6247ad259c28c17d621cb2 (patch) | |
tree | b548111805e796a4e2fb3b13c0ff6d2b3add23e0 | |
parent | d8b531530fa42b59aa0a5b123d87a30d749cbcc4 (diff) | |
download | meta-qt5-5b7563e30c20156d4c6247ad259c28c17d621cb2.tar.gz |
qtbase: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks
* in preparation for 5.9.8 upgrade
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
55 files changed, 82 insertions, 82 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index fe96f3d7..3f57d34c 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:" | |||
26 | 26 | ||
27 | # common for qtbase-native, qtbase-nativesdk and qtbase | 27 | # common for qtbase-native, qtbase-nativesdk and qtbase |
28 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared | 28 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared |
29 | # 5.9.meta-qt5-shared.6 | 29 | # 5.9.meta-qt5-shared.7 |
30 | SRC_URI += "\ | 30 | SRC_URI += "\ |
31 | file://0001-Add-linux-oe-g-platform.patch \ | 31 | file://0001-Add-linux-oe-g-platform.patch \ |
32 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 32 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
@@ -43,7 +43,7 @@ SRC_URI += "\ | |||
43 | 43 | ||
44 | # common for qtbase-native and nativesdk-qtbase | 44 | # common for qtbase-native and nativesdk-qtbase |
45 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native | 45 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native |
46 | # 5.9.meta-qt5-native.6 | 46 | # 5.9.meta-qt5-native.7 |
47 | SRC_URI += " \ | 47 | SRC_URI += " \ |
48 | file://0012-Always-build-uic.patch \ | 48 | file://0012-Always-build-uic.patch \ |
49 | " | 49 | " |
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 cbcf0142..c5acafb9 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 @@ | |||
1 | From 14826486fbde132cdea45837b645b3cfe26630ee Mon Sep 17 00:00:00 2001 | 1 | From a6cef77852c47edc18f665f69284940875980da5 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | 2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> |
3 | Date: Wed, 10 Feb 2016 09:02:09 +0200 | 3 | Date: Wed, 10 Feb 2016 09:02:09 +0200 |
4 | Subject: [PATCH] Allow a tools-only build | 4 | 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 ef218a12..4d17f619 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 @@ | |||
1 | From 6e528d8c4d82f6e4a1948086ac41230b5f3a773b Mon Sep 17 00:00:00 2001 | 1 | From 9367531198ba852fa1f71f9fb79b1e430cdcfa2d Mon Sep 17 00:00:00 2001 |
2 | From: Kim Kulling <kim.kulling@googlemail.com> | 2 | From: Kim Kulling <kim.kulling@googlemail.com> |
3 | Date: Mon, 7 Nov 2016 17:19:49 +0100 | 3 | Date: Mon, 7 Nov 2016 17:19:49 +0100 |
4 | Subject: [PATCH] Fix BlenderDNA for clang cross compiler. | 4 | 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 7da321a5..f35f5695 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -12,7 +12,7 @@ DEPENDS += "qtbase" | |||
12 | DEPENDS_class-target += "qtdeclarative qt3d-native" | 12 | DEPENDS_class-target += "qtdeclarative qt3d-native" |
13 | 13 | ||
14 | # Patches from https://github.com/meta-qt5/qt3d/commits/b5.9 | 14 | # Patches from https://github.com/meta-qt5/qt3d/commits/b5.9 |
15 | # 5.9.meta-qt5.6 | 15 | # 5.9.meta-qt5.7 |
16 | SRC_URI += " \ | 16 | SRC_URI += " \ |
17 | file://0001-Allow-a-tools-only-build.patch \ | 17 | file://0001-Allow-a-tools-only-build.patch \ |
18 | file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ | 18 | file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 0ab5feb4..30f1cdaf 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 | |||
21 | 21 | ||
22 | # common for qtbase-native, qtbase-nativesdk and qtbase | 22 | # common for qtbase-native, qtbase-nativesdk and qtbase |
23 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared | 23 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared |
24 | # 5.9.meta-qt5-shared.6 | 24 | # 5.9.meta-qt5-shared.7 |
25 | SRC_URI += "\ | 25 | SRC_URI += "\ |
26 | file://0001-Add-linux-oe-g-platform.patch \ | 26 | file://0001-Add-linux-oe-g-platform.patch \ |
27 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 27 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
@@ -38,7 +38,7 @@ SRC_URI += "\ | |||
38 | 38 | ||
39 | # common for qtbase-native and nativesdk-qtbase | 39 | # common for qtbase-native and nativesdk-qtbase |
40 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native | 40 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native |
41 | # 5.9.meta-qt5-native.6 | 41 | # 5.9.meta-qt5-native.7 |
42 | SRC_URI += " \ | 42 | SRC_URI += " \ |
43 | file://0012-Always-build-uic.patch \ | 43 | file://0012-Always-build-uic.patch \ |
44 | " | 44 | " |
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 9e815a91..a6f11442 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 @@ | |||
1 | From 61220bdf923797b8d13b27c1601894a3743eeb7a Mon Sep 17 00:00:00 2001 | 1 | From 3dc56623a89899868a5b975507ce80169e84c8f2 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH] Add linux-oe-g++ platform | 4 | 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 f544e10a..4b1fd626 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 @@ | |||
1 | From 709a7e5e70927e07e66e57414c6b4ed67560217e Mon Sep 17 00:00:00 2001 | 1 | From 1e77843fa9968c0be82d552f3ead308b6071bbac Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS | 4 | 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 7ab90df4..582a35df 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 @@ | |||
1 | From a1cb244c77c988b45b5597b4ffc4398ccb668fd4 Mon Sep 17 00:00:00 2001 | 1 | From e54caac2c1dddbbf9a3e2569356067e42d19a904 Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the | 4 | 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 44a20d4e..53ba7f87 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 @@ | |||
1 | From 0a1329319dcc60f041090abb4625054ed94d6097 Mon Sep 17 00:00:00 2001 | 1 | From 9959c2f9d56e12836409dfee89ba41ece0e88358 Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Tue, 25 Aug 2015 10:05:15 -0400 | 3 | Date: Tue, 25 Aug 2015 10:05:15 -0400 |
4 | Subject: [PATCH] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH] configure: bump path length from 256 to 512 characters |
@@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
15 | 1 file changed, 3 insertions(+), 3 deletions(-) | 15 | 1 file changed, 3 insertions(+), 3 deletions(-) |
16 | 16 | ||
17 | diff --git a/configure.pri b/configure.pri | 17 | diff --git a/configure.pri b/configure.pri |
18 | index dc703ecb14..961b41e3f8 100644 | 18 | index 93e87e5f09..8026f0b8a4 100644 |
19 | --- a/configure.pri | 19 | --- a/configure.pri |
20 | +++ b/configure.pri | 20 | +++ b/configure.pri |
21 | @@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) { | 21 | @@ -804,10 +804,10 @@ defineTest(qtConfOutput_preparePaths) { |
22 | "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ | 22 | "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ |
23 | "" \ | 23 | "" \ |
24 | "/* Installation Info */" \ | 24 | "/* 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 746b1367..923a23d2 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 @@ | |||
1 | From 7e7249e3355264733f1dbfbc7dc7d3f85d890951 Mon Sep 17 00:00:00 2001 | 1 | From 8dc5b6d96c4b29c19a6bf5c1ac1654c96ed7bcd5 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Mon, 24 Oct 2016 09:45:18 +0300 | 3 | Date: Mon, 24 Oct 2016 09:45:18 +0300 |
4 | Subject: [PATCH] Disable all unknown features instead of erroring out | 4 | 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 bfeedbeb..f2b58b58 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 @@ | |||
1 | From d1303277bc34d8ab38082ead9733c25a3ab2a236 Mon Sep 17 00:00:00 2001 | 1 | From 56b24f318e0030f7d98605ae88b4277bfcf433ef Mon Sep 17 00:00:00 2001 |
2 | From: Pascal Bach <pascal.bach@siemens.com> | 2 | From: Pascal Bach <pascal.bach@siemens.com> |
3 | Date: Wed, 11 May 2016 15:20:41 +0200 | 3 | Date: Wed, 11 May 2016 15:20:41 +0200 |
4 | Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS | 4 | 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 8f1bd59d..25115fc2 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 @@ | |||
1 | From 98c2a414a359ad8ceba511292ac6962deba78356 Mon Sep 17 00:00:00 2001 | 1 | From e9c6d679909ee9e1c88fe8b32f925fdd297e9d2c Mon Sep 17 00:00:00 2001 |
2 | From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> | 2 | From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> |
3 | Date: Wed, 7 Jun 2017 21:00:49 +0900 | 3 | Date: Wed, 7 Jun 2017 21:00:49 +0900 |
4 | Subject: [PATCH] Delete qlonglong and qulonglong | 4 | 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 f2e9d680..75f047dd 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 @@ | |||
1 | From 83d9a275c09352558e69445cb453020861ae3f6e Mon Sep 17 00:00:00 2001 | 1 | From 164c79646981537cacc1ad34e4900b36cda7e5d4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 27 Jul 2017 08:02:51 -0700 | 3 | Date: Thu, 27 Jul 2017 08:02:51 -0700 |
4 | Subject: [PATCH] Replace pthread_yield with sched_yield | 4 | 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 c3124b42..367a32f7 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 @@ | |||
1 | From eeb0e3cafc02ae185a75f932176339002f6338ba Mon Sep 17 00:00:00 2001 | 1 | From b4965aaf7e244535aa7bfeed893956c839251799 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 3 Sep 2017 09:11:44 -0700 | 3 | Date: Sun, 3 Sep 2017 09:11:44 -0700 |
4 | Subject: [PATCH] Add OE specific specs for clang compiler | 4 | 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 9bcb7936..a6e46ed0 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 @@ | |||
1 | From 1bd6f92d57ff09665241343870ebf6c4882c62e4 Mon Sep 17 00:00:00 2001 | 1 | From 617c40070354c4a39d9200289b1ac66ac5d344df Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 3 Sep 2017 09:44:48 -0700 | 3 | Date: Sun, 3 Sep 2017 09:44:48 -0700 |
4 | Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T | 4 | 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 ab52eefc..e1afb963 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 @@ | |||
1 | From e9aabbb5549dd76cbc3a6dc5723bbe56559a9fa7 Mon Sep 17 00:00:00 2001 | 1 | From e557afa2241d5a05a45d78693edf61aa036985cd Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 3 Sep 2017 10:11:50 -0700 | 3 | Date: Sun, 3 Sep 2017 10:11:50 -0700 |
4 | Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc | 4 | Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc |
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 13 | diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp |
14 | index 10d78b1f2f..a59f358f80 100644 | 14 | index 0549951070..2fa8479ffd 100644 |
15 | --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 15 | --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp |
16 | +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 16 | +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp |
17 | @@ -46,7 +46,7 @@ | 17 | @@ -46,7 +46,7 @@ |
diff --git a/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch index ab65ce1e..eac5d22a 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 @@ | |||
1 | From a3ec19c34cc14e21a66ee723827219f8c04965da Mon Sep 17 00:00:00 2001 | 1 | From cf844e4fe4f3316defecfcc8d4ccbe01b93f91f0 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
4 | Subject: [PATCH] Always build uic | 4 | Subject: [PATCH] Always build uic |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index eb2f35e8..980850a5 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \ | |||
17 | 17 | ||
18 | # common for qtbase-native, qtbase-nativesdk and qtbase | 18 | # common for qtbase-native, qtbase-nativesdk and qtbase |
19 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared | 19 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared |
20 | # 5.9.meta-qt5-shared.6 | 20 | # 5.9.meta-qt5-shared.7 |
21 | SRC_URI += "\ | 21 | SRC_URI += "\ |
22 | file://0001-Add-linux-oe-g-platform.patch \ | 22 | file://0001-Add-linux-oe-g-platform.patch \ |
23 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 23 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
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 f3d19def..07f127ca 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 @@ | |||
1 | From ee219bf33cf52c7a7eab7c02823b2e4960392ce0 Mon Sep 17 00:00:00 2001 | 1 | From b1622c53d65c11212f9c9b61303b70cf3e65c729 Mon Sep 17 00:00:00 2001 |
2 | From: Wenlin Kang <wenlin.kang@windriver.com> | 2 | From: Wenlin Kang <wenlin.kang@windriver.com> |
3 | Date: Thu, 8 Sep 2016 12:18:13 +0800 | 3 | Date: Thu, 8 Sep 2016 12:18:13 +0800 |
4 | Subject: [PATCH] qtmultimedia: fix a conflicting declaration | 4 | Subject: [PATCH] qtmultimedia: fix a conflicting declaration |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 9f67e014..316ee622 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -26,7 +26,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | |||
26 | EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" | 26 | EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" |
27 | 27 | ||
28 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9 | 28 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9 |
29 | # 5.9.meta-qt5.6 | 29 | # 5.9.meta-qt5.7 |
30 | SRC_URI += "\ | 30 | SRC_URI += "\ |
31 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ | 31 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ |
32 | " | 32 | " |
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 4a49b620..3f7886e8 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 @@ | |||
1 | From a83e4f796c44cda70ac839f5cd545e88097c8e91 Mon Sep 17 00:00:00 2001 | 1 | From b30246c633d18b8519ab1158bdf854c05564add5 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 7 Jun 2017 15:17:12 +0300 | 3 | Date: Wed, 7 Jun 2017 15:17:12 +0300 |
4 | Subject: [PATCH] Allow a tools-only build | 4 | Subject: [PATCH] Allow a tools-only build |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 56f823e3..70aaf0fc 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -12,7 +12,7 @@ require qt5-git.inc | |||
12 | DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" | 12 | DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" |
13 | 13 | ||
14 | # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9 | 14 | # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9 |
15 | # 5.9.meta-qt5.6 | 15 | # 5.9.meta-qt5.7 |
16 | SRC_URI += " \ | 16 | SRC_URI += " \ |
17 | file://0001-Allow-a-tools-only-build.patch \ | 17 | file://0001-Allow-a-tools-only-build.patch \ |
18 | " | 18 | " |
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 1d421c52..38aeb3db 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 @@ | |||
1 | From be7c238b97f6cb104332d6bb956bf0dbe84c22a5 Mon Sep 17 00:00:00 2001 | 1 | From 3713578c07c310554bec11699ee43d4a7bf1d7db Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Tue, 10 Jan 2017 15:28:26 +0200 | 3 | Date: Tue, 10 Jan 2017 15:28:26 +0200 |
4 | Subject: [PATCH] Use external host bin path for cmake file | 4 | 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 3b8416be..1f9d7d56 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb | |||
@@ -13,7 +13,7 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | |||
13 | SRCREV = "f66526f7ba7332cc7ecca9bd68fca456eae845eb" | 13 | SRCREV = "f66526f7ba7332cc7ecca9bd68fca456eae845eb" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 |
16 | # 5.9.meta-qt5.6 | 16 | # 5.9.meta-qt5.7 |
17 | SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" | 17 | SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" |
18 | 18 | ||
19 | do_install_append_class-nativesdk() { | 19 | do_install_append_class-nativesdk() { |
diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 84693d7b..9a0b4938 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 @@ | |||
1 | From 1b9514a70d0947ff025762afd42b8f1c84b5d067 Mon Sep 17 00:00:00 2001 | 1 | From 6acf3f66e312ffabc3845a26f29b70c5fddc0a04 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 | 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 |
4 | Subject: [PATCH] add noqtwebkit configuration | 4 | 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 44963637..eb0630ea 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 @@ | |||
1 | From 20d2656c69da63c33e0d15add3726f2c802bca5a Mon Sep 17 00:00:00 2001 | 1 | From fa25039d01341d9cf18e50631282d48640e679d6 Mon Sep 17 00:00:00 2001 |
2 | From: Cody P Schafer <dev@codyps.com> | 2 | From: Cody P Schafer <dev@codyps.com> |
3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 | 3 | Date: Thu, 9 Jul 2015 11:28:19 -0400 |
4 | Subject: [PATCH] linguist-tools cmake: allow overriding the location for | 4 | 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 dc5dddd6..9d4b7311 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \ | |||
15 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" | 15 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" |
16 | 16 | ||
17 | # Patches from https://github.com/meta-qt5/qttools/commits/b5.9 | 17 | # Patches from https://github.com/meta-qt5/qttools/commits/b5.9 |
18 | # 5.9.meta-qt5.6 | 18 | # 5.9.meta-qt5.7 |
19 | SRC_URI += " \ | 19 | SRC_URI += " \ |
20 | file://0001-add-noqtwebkit-configuration.patch \ | 20 | file://0001-add-noqtwebkit-configuration.patch \ |
21 | file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ | 21 | file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ |
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 cd1e4b84..ef3d7619 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 @@ | |||
1 | From 3ed215600a5c43d0e5312389a1acdef1a99d8b2f Mon Sep 17 00:00:00 2001 | 1 | From cd1618314be779611bdee0a1c3b94658728254b8 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 12 Jul 2017 23:59:52 -0700 | 3 | Date: Wed, 12 Jul 2017 23:59:52 -0700 |
4 | Subject: [PATCH] include sys/time.h for timeval | 4 | 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 7eb0b155..99a638bf 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ | |||
7 | " | 7 | " |
8 | 8 | ||
9 | # Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9 | 9 | # Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9 |
10 | # 5.9.meta-qt5.6 | 10 | # 5.9.meta-qt5.7 |
11 | SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" | 11 | SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" |
12 | 12 | ||
13 | # To enabled Nuance T9 Write support, you need to provide the licensed components | 13 | # To enabled Nuance T9 Write support, you need to provide the licensed components |
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 13f0ce86..f3d90d87 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 @@ | |||
1 | From 237d370278dd68fbb16308e2fad044cbcba9797a Mon Sep 17 00:00:00 2001 | 1 | From e503324502c98080a5d97f597c3c2acc164044c3 Mon Sep 17 00:00:00 2001 |
2 | From: Raphael Freudiger <laser_b@gmx.ch> | 2 | From: Raphael Freudiger <laser_b@gmx.ch> |
3 | Date: Tue, 10 Jan 2017 15:49:55 +0100 | 3 | Date: Tue, 10 Jan 2017 15:49:55 +0100 |
4 | Subject: [PATCH] fix build without xkbcommon-evdev | 4 | Subject: [PATCH] fix build without xkbcommon-evdev |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index c7d56d57..6dfb34b3 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -40,7 +40,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | |||
40 | SRCREV = "44a28bb06d66be1b7ccdc94e36e931002df8d21c" | 40 | SRCREV = "44a28bb06d66be1b7ccdc94e36e931002df8d21c" |
41 | 41 | ||
42 | # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 | 42 | # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 |
43 | # 5.9.meta-qt5.6 | 43 | # 5.9.meta-qt5.7 |
44 | # From https://bugreports.qt.io/browse/QTBUG-57767 | 44 | # From https://bugreports.qt.io/browse/QTBUG-57767 |
45 | SRC_URI += " \ | 45 | SRC_URI += " \ |
46 | file://0001-fix-build-without-xkbcommon-evdev.patch \ | 46 | file://0001-fix-build-without-xkbcommon-evdev.patch \ |
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 51eec18f..ac730395 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 @@ | |||
1 | From b3ef942f47b12546c558d94683719da8d23282f0 Mon Sep 17 00:00:00 2001 | 1 | From bd5763bb31331fca4a4a69354c91fc50c6d1ed52 Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 12:46:58 -0200 | 3 | Date: Thu, 24 Dec 2015 12:46:58 -0200 |
4 | Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX | 4 | Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX |
@@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
11 | 1 file changed, 6 insertions(+), 6 deletions(-) | 11 | 1 file changed, 6 insertions(+), 6 deletions(-) |
12 | 12 | ||
13 | diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc | 13 | diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc |
14 | index 6d926378be..738d3fdedf 100644 | 14 | index 6d926378bec..738d3fdedf2 100644 |
15 | --- a/chromium/ui/gfx/codec/jpeg_codec.cc | 15 | --- a/chromium/ui/gfx/codec/jpeg_codec.cc |
16 | +++ b/chromium/ui/gfx/codec/jpeg_codec.cc | 16 | +++ b/chromium/ui/gfx/codec/jpeg_codec.cc |
17 | @@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) { | 17 | @@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) { |
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 27ad3465..897b173e 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 @@ | |||
1 | From 87b283dd966ef68df24fd4c988b348f53c59e11b Mon Sep 17 00:00:00 2001 | 1 | From 7d2c8552f7fd0234f9afeeee214e0614f3200bcb Mon Sep 17 00:00:00 2001 |
2 | From: Frieder Schrempf <frieder.schrempf@online.de> | 2 | From: Frieder Schrempf <frieder.schrempf@online.de> |
3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 | 3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 |
4 | Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform | 4 | Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform |
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
12 | 1 file changed, 6 insertions(+) | 12 | 1 file changed, 6 insertions(+) |
13 | 13 | ||
14 | diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf | 14 | diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf |
15 | index b78d2a11..14dd07e5 100644 | 15 | index ac0c9837..6c423af4 100644 |
16 | --- a/mkspecs/features/functions.prf | 16 | --- a/mkspecs/features/functions.prf |
17 | +++ b/mkspecs/features/functions.prf | 17 | +++ b/mkspecs/features/functions.prf |
18 | @@ -21,6 +21,12 @@ defineTest(isPlatformSupported) { | 18 | @@ -21,6 +21,12 @@ defineTest(isPlatformSupported) { |
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 0a045b07..8af72881 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 @@ | |||
1 | From 68b44d6cd3b3653dd70da39e39eb40900207daff Mon Sep 17 00:00:00 2001 | 1 | From 3e9f64be66ecab4559a3b144519bc1e22280c1c3 Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 | 3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 |
4 | Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor | 4 | 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 eeba5dce..1dea8a24 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 @@ | |||
1 | From aba02f51bcaef2117aa8b413638af8134b563778 Mon Sep 17 00:00:00 2001 | 1 | From 5a1dadbc395af3ceb24996eda00520e8d5db6d36 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] chromium: Force host toolchain configuration | 4 | Subject: [PATCH] chromium: Force host toolchain configuration |
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 6 insertions(+), 6 deletions(-) | 14 | 1 file changed, 6 insertions(+), 6 deletions(-) |
15 | 15 | ||
16 | diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py | 16 | diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py |
17 | index 43d252b43e..e58347848e 100755 | 17 | index 43d252b43e7..e58347848e5 100755 |
18 | --- a/chromium/tools/gn/bootstrap/bootstrap.py | 18 | --- a/chromium/tools/gn/bootstrap/bootstrap.py |
19 | +++ b/chromium/tools/gn/bootstrap/bootstrap.py | 19 | +++ b/chromium/tools/gn/bootstrap/bootstrap.py |
20 | @@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options): | 20 | @@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options): |
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 c1aa58f9..4eeefa79 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 @@ | |||
1 | From c665697cce340faab080f45bf8a1e086a5bc7129 Mon Sep 17 00:00:00 2001 | 1 | From 8b42e9d563ccc57c4869e91136bdaa9ce29fc0d3 Mon Sep 17 00:00:00 2001 |
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 | 3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 |
4 | Subject: [PATCH] Include dependency to QCoreApplication::translate() | 4 | 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 d864a32c..fb675a62 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 @@ | |||
1 | From e026637ca017f185697de536cf232c0f970286cf Mon Sep 17 00:00:00 2001 | 1 | From 998265280b0aa664343ea9f63490819cc5ed61fb Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Thu, 30 Mar 2017 11:37:24 +0300 | 3 | Date: Thu, 30 Mar 2017 11:37:24 +0300 |
4 | Subject: [PATCH] chromium: workaround for too long .rps file name | 4 | Subject: [PATCH] chromium: workaround for too long .rps file name |
@@ -18,7 +18,7 @@ Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1 | |||
18 | 1 file changed, 9 insertions(+) | 18 | 1 file changed, 9 insertions(+) |
19 | 19 | ||
20 | diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc | 20 | diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc |
21 | index a5bc6cd526..5cefbfe77c 100644 | 21 | index a5bc6cd526e..5cefbfe77c1 100644 |
22 | --- a/chromium/tools/gn/ninja_action_target_writer.cc | 22 | --- a/chromium/tools/gn/ninja_action_target_writer.cc |
23 | +++ b/chromium/tools/gn/ninja_action_target_writer.cc | 23 | +++ b/chromium/tools/gn/ninja_action_target_writer.cc |
24 | @@ -115,9 +115,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { | 24 | @@ -115,9 +115,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { |
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 1ca57455..72fd7941 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 @@ | |||
1 | From f1f470227778b0f7068ec25e4d5db2aaa0ef4f3e Mon Sep 17 00:00:00 2001 | 1 | From 9e148c9bee3e6cbc5d0275911c06a91c12219db3 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] Force host toolchain configuration | 4 | 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 e682b7f3..01b04dbb 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 @@ | |||
1 | From 48f6dbfb20364f5184d43959cb1a6b65e1a6cba6 Mon Sep 17 00:00:00 2001 | 1 | From 635b97b3abb1ba4f7182172bba3620bfb40d7fb9 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:01:12 -0700 | 3 | Date: Fri, 7 Jul 2017 14:01:12 -0700 |
4 | Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not | 4 | Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not |
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 1 file changed, 9 insertions(+) | 12 | 1 file changed, 9 insertions(+) |
13 | 13 | ||
14 | diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c | 14 | diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c |
15 | index b655d1c79c..3de34e36f2 100644 | 15 | index b655d1c79c4..3de34e36f27 100644 |
16 | --- a/chromium/sandbox/linux/suid/sandbox.c | 16 | --- a/chromium/sandbox/linux/suid/sandbox.c |
17 | +++ b/chromium/sandbox/linux/suid/sandbox.c | 17 | +++ b/chromium/sandbox/linux/suid/sandbox.c |
18 | @@ -44,6 +44,15 @@ static bool DropRoot(); | 18 | @@ -44,6 +44,15 @@ static bool DropRoot(); |
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 fed2bca5..0a7017a4 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 @@ | |||
1 | From 4fce1a91096c8a2180f2126e176904b2a1e3275e Mon Sep 17 00:00:00 2001 | 1 | From 70a552d2b1c8c58ecf842094643ca09aec69ace2 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 | 3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 |
4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux | 4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux |
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 2 files changed, 3 insertions(+), 2 deletions(-) | 10 | 2 files changed, 3 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc | 12 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc |
13 | index 7d0cb57931..10be59ebad 100644 | 13 | index 7d0cb579315..10be59ebad8 100644 |
14 | --- a/chromium/base/trace_event/malloc_dump_provider.cc | 14 | --- a/chromium/base/trace_event/malloc_dump_provider.cc |
15 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc | 15 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc |
16 | @@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {} | 16 | @@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {} |
@@ -31,7 +31,7 @@ index 7d0cb57931..10be59ebad 100644 | |||
31 | } | 31 | } |
32 | 32 | ||
33 | diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc | 33 | diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc |
34 | index 7ddeb4d16a..b8c73b09c5 100644 | 34 | index 7ddeb4d16a9..b8c73b09c5a 100644 |
35 | --- a/chromium/content/child/content_child_helpers.cc | 35 | --- a/chromium/content/child/content_child_helpers.cc |
36 | +++ b/chromium/content/child/content_child_helpers.cc | 36 | +++ b/chromium/content/child/content_child_helpers.cc |
37 | @@ -25,7 +25,7 @@ namespace content { | 37 | @@ -25,7 +25,7 @@ namespace content { |
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 30a213a0..9d97ad2f 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 @@ | |||
1 | From f9d402bd9e966ec05717ea3ef62dcbd2943c72b9 Mon Sep 17 00:00:00 2001 | 1 | From 6bf0cc6a2625c868dde404938626925ff63697cf Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:37:49 -0700 | 3 | Date: Fri, 7 Jul 2017 14:37:49 -0700 |
4 | Subject: [PATCH] chromium: musl: include fcntl.h for loff_t | 4 | Subject: [PATCH] chromium: musl: include fcntl.h for loff_t |
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+) | 9 | 1 file changed, 1 insertion(+) |
10 | 10 | ||
11 | diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 11 | diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
12 | index b29ec2d29a..91f77dd88d 100644 | 12 | index b29ec2d29a7..91f77dd88d4 100644 |
13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
15 | @@ -150,6 +150,7 @@ extern "C" { | 15 | @@ -150,6 +150,7 @@ extern "C" { |
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 f72c3a6c..eeeb73ff 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 @@ | |||
1 | From 2a143412893405591f67ec0a74356219e088dbcb Mon Sep 17 00:00:00 2001 | 1 | From 11ad78ee9b5647296f78a1b8488147f09685dd93 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 | 3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 |
4 | Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t | 4 | Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t |
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 1 file changed, 5 insertions(+), 5 deletions(-) | 12 | 1 file changed, 5 insertions(+), 5 deletions(-) |
13 | 13 | ||
14 | diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 14 | diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
15 | index 715c045f66..edc8cf2db7 100644 | 15 | index 715c045f66c..edc8cf2db70 100644 |
16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
18 | @@ -77,7 +77,7 @@ typedef off64_t __off64_t; | 18 | @@ -77,7 +77,7 @@ typedef off64_t __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 ed61cc12..e0a9cbc1 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 @@ | |||
1 | From 00456ee9fa12e815066af7a159e321f274b81e36 Mon Sep 17 00:00:00 2001 | 1 | From 4ca1fb7013c00b23c8697c14604a89c566866fa2 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 | 3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 |
4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction | 4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction |
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc | 11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc |
12 | index 5a0564d2f3..8c2dc6491d 100644 | 12 | index 5a0564d2f3e..8c2dc6491df 100644 |
13 | --- a/chromium/base/allocator/allocator_check.cc | 13 | --- a/chromium/base/allocator/allocator_check.cc |
14 | +++ b/chromium/base/allocator/allocator_check.cc | 14 | +++ b/chromium/base/allocator/allocator_check.cc |
15 | @@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { | 15 | @@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { |
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 cab250a7..625a35d9 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 @@ | |||
1 | From b5ca1e638adfc1241435cf27279b8e7ec05c18af Mon Sep 17 00:00:00 2001 | 1 | From c5675d4fd7116dac65e0949aa3a165e38d3dc77e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 | 3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 |
4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols | 4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols |
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc | 12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc |
13 | index 95480ea4b6..1de3d1a532 100644 | 13 | index 95480ea4b6b..1de3d1a5321 100644 |
14 | --- a/chromium/base/allocator/allocator_shim.cc | 14 | --- a/chromium/base/allocator/allocator_shim.cc |
15 | +++ b/chromium/base/allocator/allocator_shim.cc | 15 | +++ b/chromium/base/allocator/allocator_shim.cc |
16 | @@ -266,7 +266,7 @@ void ShimFree(void* address) { | 16 | @@ -266,7 +266,7 @@ void ShimFree(void* address) { |
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 7d1d43b7..8f1d0d52 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 @@ | |||
1 | From 1b1ebf58dccdc53145a2778193e95987fcf464c9 Mon Sep 17 00:00:00 2001 | 1 | From e035ecd3a54104b61952f98335043a08c75878cc Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:12:39 -0700 | 3 | Date: Fri, 7 Jul 2017 15:12:39 -0700 |
4 | Subject: [PATCH] chromium: musl: Use correct member name __si_fields from | 4 | Subject: [PATCH] chromium: musl: Use correct member name __si_fields from |
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc | 12 | diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc |
13 | index 003708d2c8..0fef3148f9 100644 | 13 | index 003708d2c89..0fef3148f9d 100644 |
14 | --- a/chromium/sandbox/linux/seccomp-bpf/trap.cc | 14 | --- a/chromium/sandbox/linux/seccomp-bpf/trap.cc |
15 | +++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc | 15 | +++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc |
16 | @@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { | 16 | @@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { |
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 d80790d7..50536244 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 @@ | |||
1 | From 23892285ca39c626aa77bca3dbccffe7f7784b91 Mon Sep 17 00:00:00 2001 | 1 | From f054310846e1dae06205c7b54a89aada9f34d16f Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:24:49 -0700 | 3 | Date: Fri, 7 Jul 2017 15:24:49 -0700 |
4 | Subject: [PATCH] chromium: musl: Match syscalls to match musl | 4 | Subject: [PATCH] chromium: musl: Match syscalls to match musl |
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 16 insertions(+) | 9 | 1 file changed, 16 insertions(+) |
10 | 10 | ||
11 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | 11 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h |
12 | index 9dbd2391b2..a715de177c 100644 | 12 | index 9dbd2391b2e..a715de177c6 100644 |
13 | --- a/chromium/third_party/lss/linux_syscall_support.h | 13 | --- a/chromium/third_party/lss/linux_syscall_support.h |
14 | +++ b/chromium/third_party/lss/linux_syscall_support.h | 14 | +++ b/chromium/third_party/lss/linux_syscall_support.h |
15 | @@ -793,6 +793,14 @@ struct kernel_statfs { | 15 | @@ -793,6 +793,14 @@ struct kernel_statfs { |
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 0728aaf9..c656b063 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 @@ | |||
1 | From 9c441f0780c663b3029eedd2a3589418e7c33604 Mon Sep 17 00:00:00 2001 | 1 | From a2ea7f47e39dd36d4329b4aeaf282b8e73dfa24e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:27:50 -0700 | 3 | Date: Fri, 7 Jul 2017 15:27:50 -0700 |
4 | Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc | 4 | Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc |
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | create mode 100644 chromium/net/dns/resolv_compat.h | 13 | create mode 100644 chromium/net/dns/resolv_compat.h |
14 | 14 | ||
15 | diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc | 15 | diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc |
16 | index ba8a369133..e9b40d07fc 100644 | 16 | index ba8a3691331..e9b40d07fc7 100644 |
17 | --- a/chromium/net/dns/dns_config_service_posix.cc | 17 | --- a/chromium/net/dns/dns_config_service_posix.cc |
18 | +++ b/chromium/net/dns/dns_config_service_posix.cc | 18 | +++ b/chromium/net/dns/dns_config_service_posix.cc |
19 | @@ -25,6 +25,10 @@ | 19 | @@ -25,6 +25,10 @@ |
@@ -28,7 +28,7 @@ index ba8a369133..e9b40d07fc 100644 | |||
28 | #include "net/dns/dns_config_watcher_mac.h" | 28 | #include "net/dns/dns_config_watcher_mac.h" |
29 | #endif | 29 | #endif |
30 | diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc | 30 | diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc |
31 | index 74534e6b1b..2780a776e4 100644 | 31 | index 74534e6b1ba..2780a776e4c 100644 |
32 | --- a/chromium/net/dns/dns_reloader.cc | 32 | --- a/chromium/net/dns/dns_reloader.cc |
33 | +++ b/chromium/net/dns/dns_reloader.cc | 33 | +++ b/chromium/net/dns/dns_reloader.cc |
34 | @@ -9,6 +9,10 @@ | 34 | @@ -9,6 +9,10 @@ |
@@ -44,7 +44,7 @@ index 74534e6b1b..2780a776e4 100644 | |||
44 | #include "base/macros.h" | 44 | #include "base/macros.h" |
45 | diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h | 45 | diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h |
46 | new file mode 100644 | 46 | new file mode 100644 |
47 | index 0000000000..4f0e852a19 | 47 | index 00000000000..4f0e852a19d |
48 | --- /dev/null | 48 | --- /dev/null |
49 | +++ b/chromium/net/dns/resolv_compat.h | 49 | +++ b/chromium/net/dns/resolv_compat.h |
50 | @@ -0,0 +1,29 @@ | 50 | @@ -0,0 +1,29 @@ |
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 e175b74b..b7e3619d 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 @@ | |||
1 | From a6fc99a6328212972836d914d333f3670e3c4726 Mon Sep 17 00:00:00 2001 | 1 | From f6559e7e25ef6f3f076bbc2d004ba9b72c8d6324 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:39:57 -0700 | 3 | Date: Fri, 7 Jul 2017 15:39:57 -0700 |
4 | Subject: [PATCH] chromium: musl: Do not define __sbrk on musl | 4 | Subject: [PATCH] chromium: musl: Do not define __sbrk on musl |
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 14 | diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
15 | index edc8cf2db7..a868b50d30 100644 | 15 | index edc8cf2db70..a868b50d30f 100644 |
16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 16 | --- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 17 | +++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h |
18 | @@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, | 18 | @@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, |
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 55739c83..59af39a5 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 @@ | |||
1 | From c190fb457fbe9f1c3adedcdadbda581ac5ed2286 Mon Sep 17 00:00:00 2001 | 1 | From 61a447ce03b444337b6c58c8309ab1d11105cb02 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 | 3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 |
4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size | 4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size |
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 2 files changed, 4 insertions(+), 3 deletions(-) | 10 | 2 files changed, 4 insertions(+), 3 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc | 12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc |
13 | index 92fbda5ee1..c41579d4ed 100644 | 13 | index 92fbda5ee1d..c41579d4ed5 100644 |
14 | --- a/chromium/base/threading/platform_thread_linux.cc | 14 | --- a/chromium/base/threading/platform_thread_linux.cc |
15 | +++ b/chromium/base/threading/platform_thread_linux.cc | 15 | +++ b/chromium/base/threading/platform_thread_linux.cc |
16 | @@ -175,7 +175,8 @@ void TerminateOnThread() {} | 16 | @@ -175,7 +175,8 @@ void TerminateOnThread() {} |
@@ -24,7 +24,7 @@ index 92fbda5ee1..c41579d4ed 100644 | |||
24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the | 24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the |
25 | // default stack size isn't enough for some browser tests. | 25 | // default stack size isn't enough for some browser tests. |
26 | diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 26 | diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp |
27 | index 1d164f510a..3358deb256 100644 | 27 | index 1d164f510a3..3358deb256c 100644 |
28 | --- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 28 | --- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp |
29 | +++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 29 | +++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp |
30 | @@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { | 30 | @@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { |
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 be406a70..224ee3b9 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 @@ | |||
1 | From c4f2176d88f331d8fc150c4bf598d2f2a5f3a1e1 Mon Sep 17 00:00:00 2001 | 1 | From 03a5f71696c5489d3d2c38d2305fc8ef1c70819f Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 17:15:34 -0700 | 3 | Date: Fri, 7 Jul 2017 17:15:34 -0700 |
4 | Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 | 4 | Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 |
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+) | 9 | 1 file changed, 1 insertion(+) |
10 | 10 | ||
11 | diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc | 11 | diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc |
12 | index a2ca2e2309..e139cdf9e9 100644 | 12 | index a2ca2e23096..e139cdf9e98 100644 |
13 | --- a/chromium/device/serial/serial_io_handler_posix.cc | 13 | --- a/chromium/device/serial/serial_io_handler_posix.cc |
14 | +++ b/chromium/device/serial/serial_io_handler_posix.cc | 14 | +++ b/chromium/device/serial/serial_io_handler_posix.cc |
15 | @@ -6,6 +6,7 @@ | 15 | @@ -6,6 +6,7 @@ |
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 feaaca3f..2e678939 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 @@ | |||
1 | From 69ab8dd347721db368d2dad63987a69c9c4f128e Mon Sep 17 00:00:00 2001 | 1 | From 753027a9bceeb28e2286b4ebd7f8b599600b5717 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 8 Jul 2017 09:08:23 -0700 | 3 | Date: Sat, 8 Jul 2017 09:08:23 -0700 |
4 | Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t | 4 | Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t |
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
11 | diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 11 | diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
12 | index 91f77dd88d..bb84a0b305 100644 | 12 | index 91f77dd88d4..bb84a0b3058 100644 |
13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 13 | --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 14 | +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h |
15 | @@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; | 15 | @@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 8c486489..b861f9c4 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -131,7 +131,7 @@ RDEPENDS_${PN}-examples += " \ | |||
131 | QT_MODULE_BRANCH_CHROMIUM = "56-based" | 131 | QT_MODULE_BRANCH_CHROMIUM = "56-based" |
132 | 132 | ||
133 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 | 133 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 |
134 | # 5.9.meta-qt5.6 | 134 | # 5.9.meta-qt5.7 |
135 | SRC_URI += " \ | 135 | SRC_URI += " \ |
136 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 136 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
137 | file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ | 137 | file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ |
@@ -141,7 +141,7 @@ SRC_URI += " \ | |||
141 | " | 141 | " |
142 | 142 | ||
143 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based | 143 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based |
144 | # 56-based.meta-qt5.6 | 144 | # 56-based.meta-qt5.7 |
145 | SRC_URI += " \ | 145 | SRC_URI += " \ |
146 | file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ | 146 | file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ |
147 | file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ | 147 | file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ |
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch index b26c891a..c0faff9d 100644 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | |||
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 1 deletion(-) | 14 | 1 file changed, 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf | 16 | diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf |
17 | index fd66af6..ef754c3 100644 | 17 | index fd66af670..ef754c367 100644 |
18 | --- a/Tools/qmake/mkspecs/features/unix/default_post.prf | 18 | --- a/Tools/qmake/mkspecs/features/unix/default_post.prf |
19 | +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf | 19 | +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf |
20 | @@ -61,7 +61,6 @@ linux-*g++* { | 20 | @@ -61,7 +61,6 @@ linux-*g++* { |
diff --git a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch index dabfbb55..999d48fc 100644 --- a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch | |||
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | 12 | 1 file changed, 2 insertions(+), 2 deletions(-) |
13 | 13 | ||
14 | diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp | 14 | diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp |
15 | index 1b2091f..ba03a28 100644 | 15 | index 1b2091f53..ba03a28ec 100644 |
16 | --- a/Source/WTF/wtf/Assertions.cpp | 16 | --- a/Source/WTF/wtf/Assertions.cpp |
17 | +++ b/Source/WTF/wtf/Assertions.cpp | 17 | +++ b/Source/WTF/wtf/Assertions.cpp |
18 | @@ -61,7 +61,7 @@ | 18 | @@ -61,7 +61,7 @@ |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 3cce5674..1bd4afcf 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -19,7 +19,7 @@ ARM_INSTRUCTION_SET_armv4 = "arm" | |||
19 | ARM_INSTRUCTION_SET_armv5 = "arm" | 19 | ARM_INSTRUCTION_SET_armv5 = "arm" |
20 | 20 | ||
21 | # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.9 | 21 | # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.9 |
22 | # 5.9.meta-qt5.5 | 22 | # 5.9.meta-qt5.7 |
23 | SRC_URI += "\ | 23 | SRC_URI += "\ |
24 | file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ | 24 | file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ |
25 | file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \ | 25 | file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \ |