diff options
86 files changed, 161 insertions, 310 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 87da66e4..da0adbe3 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -25,8 +25,8 @@ require qt5-git.inc | |||
25 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" | 25 | 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.10-shared | 28 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared |
29 | # 5.10.meta-qt5-shared.2 | 29 | # 5.11.meta-qt5-shared.1 |
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,8 +43,8 @@ SRC_URI += "\ | |||
43 | " | 43 | " |
44 | 44 | ||
45 | # common for qtbase-native and nativesdk-qtbase | 45 | # common for qtbase-native and nativesdk-qtbase |
46 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native | 46 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native |
47 | # 5.10.meta-qt5-native.2 | 47 | # 5.11.meta-qt5-native.1 |
48 | SRC_URI += " \ | 48 | SRC_URI += " \ |
49 | file://0013-Always-build-uic-and-qvkgen.patch \ | 49 | file://0013-Always-build-uic-and-qvkgen.patch \ |
50 | " | 50 | " |
@@ -123,7 +123,6 @@ do_configure() { | |||
123 | -no-accessibility \ | 123 | -no-accessibility \ |
124 | -no-cups \ | 124 | -no-cups \ |
125 | -no-gui \ | 125 | -no-gui \ |
126 | -no-qml-debug \ | ||
127 | -no-sql-mysql \ | 126 | -no-sql-mysql \ |
128 | -no-sql-sqlite \ | 127 | -no-sql-sqlite \ |
129 | -no-opengl \ | 128 | -no-opengl \ |
@@ -212,4 +211,4 @@ fakeroot do_generate_qt_environment_file() { | |||
212 | do_generate_qt_environment_file[umask] = "022" | 211 | do_generate_qt_environment_file[umask] = "022" |
213 | addtask generate_qt_environment_file after do_install before do_package | 212 | addtask generate_qt_environment_file after do_install before do_package |
214 | 213 | ||
215 | SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e" | 214 | SRCREV = "17b73b0d2b8e0d643bdf13b543cc23d657a4b330" |
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 66c80173..37093983 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 05562960b7a3ed7753c9a39a7032fea873fc4098 Mon Sep 17 00:00:00 2001 | 1 | From cab5a0bcf52370fede85ee02896ce1a2979d6631 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 |
@@ -40,12 +40,12 @@ index 8ba2d9a..e973d93 100644 | |||
40 | } else { | 40 | } else { |
41 | include(assimp.pri) | 41 | include(assimp.pri) |
42 | diff --git a/tools/tools.pro b/tools/tools.pro | 42 | diff --git a/tools/tools.pro b/tools/tools.pro |
43 | index 8e973ae..ad51db5 100644 | 43 | index 64f2b9f..d108e7f 100644 |
44 | --- a/tools/tools.pro | 44 | --- a/tools/tools.pro |
45 | +++ b/tools/tools.pro | 45 | +++ b/tools/tools.pro |
46 | @@ -1,4 +1,4 @@ | 46 | @@ -1,4 +1,4 @@ |
47 | TEMPLATE = subdirs | 47 | TEMPLATE = subdirs |
48 | QT_FOR_CONFIG += 3dcore-private | 48 | QT_FOR_CONFIG += 3dcore-private |
49 | -!android:qtConfig(assimp):qtConfig(commandlineparser): \ | 49 | -qtConfig(assimp):qtConfig(commandlineparser): \ |
50 | +!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \ | 50 | +tools-only|qtConfig(assimp):qtConfig(commandlineparser): \ |
51 | SUBDIRS += qgltf | 51 | SUBDIRS += qgltf |
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 3357fa3e..68b0f332 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 fc23039612ab9aed4f994b4390016e71ceee8165 Mon Sep 17 00:00:00 2001 | 1 | From d6e714f9c2b1e5ed238084e254268d70d2093ae1 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 dbd1b279..3cbdfa57 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \ | |||
11 | DEPENDS += "qtbase" | 11 | 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.10 | 14 | # Patches from https://github.com/meta-qt5/qt3d/commits/b5.11 |
15 | # 5.10.meta-qt5.2 | 15 | # 5.11.meta-qt5.1 |
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 \ |
@@ -37,6 +37,6 @@ do_configure_prepend() { | |||
37 | ${S}/src/quick3d/imports/input/importsinput.pro | 37 | ${S}/src/quick3d/imports/input/importsinput.pro |
38 | } | 38 | } |
39 | 39 | ||
40 | SRCREV = "31f424bb81cd2583920d3d521e1e01f01c2d28e2" | 40 | SRCREV = "e813fb36e782c5e0ab7c25b9c069cee709692506" |
41 | 41 | ||
42 | BBCLASSEXTEND += "native nativesdk" | 42 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index beba9135..9698b314 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -2,7 +2,7 @@ | |||
2 | # Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> |
3 | 3 | ||
4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
5 | QT_MODULE_BRANCH ?= "5.10.1" | 5 | QT_MODULE_BRANCH ?= "5.11" |
6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" | 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" |
7 | 7 | ||
8 | # each module needs to define valid SRCREV | 8 | # each module needs to define valid SRCREV |
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" | |||
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
17 | PV = "5.10.1+git${SRCPV}" | 17 | PV = "5.10.1+5.11-alpha+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 36eeae89..52b01481 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -20,8 +20,8 @@ require qt5-native.inc | |||
20 | require qt5-git.inc | 20 | 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.10-shared | 23 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared |
24 | # 5.10.meta-qt5-shared.2 | 24 | # 5.11.meta-qt5-shared.1 |
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 \ |
@@ -39,7 +39,7 @@ SRC_URI += "\ | |||
39 | 39 | ||
40 | # common for qtbase-native and nativesdk-qtbase | 40 | # common for qtbase-native and nativesdk-qtbase |
41 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native | 41 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native |
42 | # 5.10.meta-qt5-native.2 | 42 | # 5.11.meta-qt5-native.1 |
43 | SRC_URI += " \ | 43 | SRC_URI += " \ |
44 | file://0013-Always-build-uic-and-qvkgen.patch \ | 44 | file://0013-Always-build-uic-and-qvkgen.patch \ |
45 | " | 45 | " |
@@ -65,7 +65,6 @@ PACKAGECONFIG_CONFARGS = " \ | |||
65 | -no-accessibility \ | 65 | -no-accessibility \ |
66 | -no-cups \ | 66 | -no-cups \ |
67 | -no-gui \ | 67 | -no-gui \ |
68 | -no-qml-debug \ | ||
69 | -no-sql-mysql \ | 68 | -no-sql-mysql \ |
70 | -no-sql-sqlite \ | 69 | -no-sql-sqlite \ |
71 | -no-opengl \ | 70 | -no-opengl \ |
@@ -137,4 +136,4 @@ do_install() { | |||
137 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 136 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
138 | } | 137 | } |
139 | 138 | ||
140 | SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e" | 139 | SRCREV = "17b73b0d2b8e0d643bdf13b543cc23d657a4b330" |
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 07fc2f77..bef60369 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 1ed7a2e9a883fe1240d89b7b70fb0f296bb2b54f Mon Sep 17 00:00:00 2001 | 1 | From 27bee79f05319c35a0538b5c876841563ecd42f6 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 |
@@ -30,7 +30,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
30 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 30 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
31 | 31 | ||
32 | diff --git a/configure b/configure | 32 | diff --git a/configure b/configure |
33 | index 08b49a8..5876721 100755 | 33 | index 9757254..add3e56 100755 |
34 | --- a/configure | 34 | --- a/configure |
35 | +++ b/configure | 35 | +++ b/configure |
36 | @@ -712,7 +712,7 @@ fi | 36 | @@ -712,7 +712,7 @@ fi |
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 fa598834..58098451 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 c7dd4e5de1fac8c35df79a86418b6cd552024bd0 Mon Sep 17 00:00:00 2001 | 1 | From 6918a52c286a7c174f048643038bac84bfd4ad76 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 cc0a3305..d29d07d5 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 f1d359e60e76867cee1df636c5c834fe829f5316 Mon Sep 17 00:00:00 2001 | 1 | From e6ab481548fa56b388c6a18a11baf112bb3189dd 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 |
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
19 | 1 file changed, 4 insertions(+), 1 deletion(-) | 19 | 1 file changed, 4 insertions(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 21 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
22 | index b4ba0b5..11d4c00 100644 | 22 | index 422d08f..a59df4f 100644 |
23 | --- a/src/corelib/global/qlibraryinfo.cpp | 23 | --- a/src/corelib/global/qlibraryinfo.cpp |
24 | +++ b/src/corelib/global/qlibraryinfo.cpp | 24 | +++ b/src/corelib/global/qlibraryinfo.cpp |
25 | @@ -172,7 +172,10 @@ void QLibrarySettings::load() | 25 | @@ -172,7 +172,10 @@ void QLibrarySettings::load() |
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch index 5a3dfea2..9de8772e 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 cb813ec552f965208ecfc9750a0fbf10841322fb Mon Sep 17 00:00:00 2001 | 1 | From 91a51709be1af7b1b5444ea5725ad0dbcf7b2bbe 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 ea48255..0699701 100644 | 18 | index a67860f..30c4a63 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 | @@ -819,10 +819,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 2e261b81..0b31a069 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 6cd8e808e0eb8fa26976da66dd3dfdd58c1d026a Mon Sep 17 00:00:00 2001 | 1 | From bdd3fc615f2ea39dbf2c6d32e6f321582a49508d 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 cf1a716f..93404eaf 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 e3fe48be51aa67227ac1b34c01e4c913d82866c2 Mon Sep 17 00:00:00 2001 | 1 | From abaf5cde503901aae1dc1cb1ede28a17ff51cee8 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 fd9a9e5a..37914ad4 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 efaae3535a1ac006ec1b3003258b83d905265fd3 Mon Sep 17 00:00:00 2001 | 1 | From 6360a89c28bf5d48914ba2f947b55270c071f1b0 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 81269d2e..5f9c818d 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 d79fecb4e8d2040efdc295d06c5e24bdf3cf6b60 Mon Sep 17 00:00:00 2001 | 1 | From 48fb6a724a72ee28987124e238051234b8c95431 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 |
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 2 files changed, 5 insertions(+), 4 deletions(-) | 14 | 2 files changed, 5 insertions(+), 4 deletions(-) |
15 | 15 | ||
16 | diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 16 | diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp |
17 | index 076610a..cb8431f 100644 | 17 | index cc628ee..6b6aecc 100644 |
18 | --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 18 | --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp |
19 | +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 19 | +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp |
20 | @@ -34,7 +34,7 @@ | 20 | @@ -34,7 +34,7 @@ |
@@ -26,7 +26,7 @@ index 076610a..cb8431f 100644 | |||
26 | #endif | 26 | #endif |
27 | 27 | ||
28 | #include <algorithm> | 28 | #include <algorithm> |
29 | @@ -199,7 +199,7 @@ protected: | 29 | @@ -193,7 +193,7 @@ protected: |
30 | const char *nm = name.constData(); | 30 | const char *nm = name.constData(); |
31 | int tp = qRegisterMetaType<Bar>(nm); | 31 | int tp = qRegisterMetaType<Bar>(nm); |
32 | #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) | 32 | #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) |
@@ -36,7 +36,7 @@ index 076610a..cb8431f 100644 | |||
36 | QMetaType info(tp); | 36 | QMetaType info(tp); |
37 | if (!info.isValid()) { | 37 | if (!info.isValid()) { |
38 | diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 38 | diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp |
39 | index e45eda2..e64f329 100644 | 39 | index fc92ed6..e59b858 100644 |
40 | --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 40 | --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp |
41 | +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 41 | +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp |
42 | @@ -78,6 +78,7 @@ | 42 | @@ -78,6 +78,7 @@ |
diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index c210d644..b5e1fab3 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 aaeadb4326f1f9df7bbafa0b9fa6937504a1c035 Mon Sep 17 00:00:00 2001 | 1 | From 1b03528718e7665804c9e0443d45d43a6559034f 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 5fed2ff8..994d6ab8 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 7c7545fc64e78b2a4a411aa392df6f424ee27c5a Mon Sep 17 00:00:00 2001 | 1 | From 05b42800ee62d3a25667d12dc5af3c7df860edc1 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 |
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | 1 file changed, 3 insertions(+), 3 deletions(-) | 13 | 1 file changed, 3 insertions(+), 3 deletions(-) |
14 | 14 | ||
15 | diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h | 15 | diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h |
16 | index d29225f..a0cdb57 100644 | 16 | index a818d97..959a508 100644 |
17 | --- a/mkspecs/linux-clang/qplatformdefs.h | 17 | --- a/mkspecs/linux-clang/qplatformdefs.h |
18 | +++ b/mkspecs/linux-clang/qplatformdefs.h | 18 | +++ b/mkspecs/linux-clang/qplatformdefs.h |
19 | @@ -84,10 +84,10 @@ | 19 | @@ -81,10 +81,10 @@ |
20 | 20 | ||
21 | #undef QT_SOCKLEN_T | 21 | #undef QT_SOCKLEN_T |
22 | 22 | ||
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 a0aaa520..84f0ccb9 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 ba70f3ca46d921c20bebb5cb9d4b41e64bd02d8b Mon Sep 17 00:00:00 2001 | 1 | From c042f0e9d25b1f4fe53c88f0c897b89cf2f8ab9f 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 d424e60..3eae828 100644 | 14 | index fc1ac7c..5bb715a 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-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch index fe1fcf57..52151305 100644 --- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch +++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 81fc64f7f3a8b0554fd8d1b96b113bc04b5f0b5c Mon Sep 17 00:00:00 2001 | 1 | From aa45912a7543d1648cde7c3a8915ba5811294ef0 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, 14 Feb 2018 17:08:43 -0800 | 3 | Date: Wed, 14 Feb 2018 17:08:43 -0800 |
4 | Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem | 4 | Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem |
diff --git a/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch index 3d40515f..07bbd76b 100644 --- a/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2ea3a1612452f1dc9c2febb4ae610194f67e39d6 Mon Sep 17 00:00:00 2001 | 1 | From cfa510d03aad4e637d8956b6dc8923f80e3db36f 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 and qvkgen | 4 | Subject: [PATCH] Always build uic and qvkgen |
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/src/src.pro b/src/src.pro | 16 | diff --git a/src/src.pro b/src/src.pro |
17 | index a73729a..c7668b5 100644 | 17 | index 1f7c5d9..6b39379 100644 |
18 | --- a/src/src.pro | 18 | --- a/src/src.pro |
19 | +++ b/src/src.pro | 19 | +++ b/src/src.pro |
20 | @@ -213,7 +213,7 @@ qtConfig(gui) { | 20 | @@ -222,7 +222,7 @@ qtConfig(gui) { |
21 | } | 21 | } |
22 | } | 22 | } |
23 | } | 23 | } |
diff --git a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch index c733c156..58bc6d83 100644 --- a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 77365eda4dd1c4c26803b3f0d1f411b7416ad531 Mon Sep 17 00:00:00 2001 | 1 | From 58e3b74b86f64f67c07fedc2e3dc3b8e025ca411 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: Fri, 24 Nov 2017 15:16:31 +0200 | 3 | Date: Fri, 24 Nov 2017 15:16:31 +0200 |
4 | Subject: [PATCH] Bootstrap without linkat feature | 4 | Subject: [PATCH] Bootstrap without linkat feature |
@@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [OE specific] | |||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h | 15 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h |
16 | index dabb715..5b4ff86 100644 | 16 | index 86ef1a2..52dc6ec 100644 |
17 | --- a/src/corelib/global/qconfig-bootstrapped.h | 17 | --- a/src/corelib/global/qconfig-bootstrapped.h |
18 | +++ b/src/corelib/global/qconfig-bootstrapped.h | 18 | +++ b/src/corelib/global/qconfig-bootstrapped.h |
19 | @@ -88,7 +88,7 @@ | 19 | @@ -89,7 +89,7 @@ |
20 | #define QT_FEATURE_futimes -1 | 20 | #define QT_FEATURE_futimes -1 |
21 | #define QT_FEATURE_library -1 | 21 | #define QT_FEATURE_library -1 |
22 | #ifdef __linux__ | 22 | #ifdef __linux__ |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 0078c801..a3b9d8e1 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -16,8 +16,8 @@ LIC_FILES_CHKSUM = " \ | |||
16 | " | 16 | " |
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.10-shared | 19 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared |
20 | # 5.10.meta-qt5-shared.2 | 20 | # 5.11.meta-qt5-shared.1 |
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 \ |
@@ -90,7 +90,6 @@ PACKAGECONFIG ?= " \ | |||
90 | PACKAGECONFIG[release] = "-release,-debug" | 90 | PACKAGECONFIG[release] = "-release,-debug" |
91 | PACKAGECONFIG[debug] = "" | 91 | PACKAGECONFIG[debug] = "" |
92 | PACKAGECONFIG[developer] = "-developer-build" | 92 | PACKAGECONFIG[developer] = "-developer-build" |
93 | PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" | ||
94 | PACKAGECONFIG[optimize-size] = "-optimize-size" | 93 | PACKAGECONFIG[optimize-size] = "-optimize-size" |
95 | PACKAGECONFIG[sm] = "-sm,-no-sm" | 94 | PACKAGECONFIG[sm] = "-sm,-no-sm" |
96 | PACKAGECONFIG[tests] = "-make tests,-nomake tests" | 95 | PACKAGECONFIG[tests] = "-make tests,-nomake tests" |
@@ -244,4 +243,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
244 | 243 | ||
245 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 244 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
246 | 245 | ||
247 | SRCREV = "6c6ace9d23f90845fd424e474d38fe30f070775e" | 246 | SRCREV = "17b73b0d2b8e0d643bdf13b543cc23d657a4b330" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index af0b1186..4fed367d 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS = "qtdeclarative" | 11 | DEPENDS = "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "0eecd96a7b83e8b1fc2811ec366b4ca1980296e0" | 13 | SRCREV = "80d7f92b9628076b681e509ddf8eae43cac550d5" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index a2d4ced2..da0f8527 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
10 | 10 | ||
11 | SRCREV = "9a4f99f518a49716cc9cc300eb456c6b13f9e8d1" | 11 | SRCREV = "1f78a69f4f6c33393a0b43a9151c698aa3d05bbb" |
12 | 12 | ||
13 | # The same issue as in qtbase: | 13 | # The same issue as in qtbase: |
14 | # http://errors.yoctoproject.org/Errors/Details/152641/ | 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 32ccdced..89f92546 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" | |||
19 | 19 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "2331b915d207fe794a07b834ec2bf8578965bc4d" | 22 | SRCREV = "d70fe2ac47dbf034991f0b2a4b0a3e1f16d171b9" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index ea0ba59d..f4240169 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
10 | 10 | ||
11 | SRCREV = "397e50147407c16a16b6505558992ca3180f9aff" | 11 | SRCREV = "be7e45ca259d70d5f2ef0d11460261146fc1df95" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index d6f468fc..e8042afb 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() { | |||
30 | 30 | ||
31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
32 | 32 | ||
33 | SRCREV = "3e91062877c0853aff693799bc5e33cdf7aaad42" | 33 | SRCREV = "0975a9c892f1cb30b9e11e6becc469a3101cc2db" |
34 | 34 | ||
35 | BBCLASSEXTEND =+ "native nativesdk" | 35 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index e91754cd..485a6d95 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb | |||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" | |||
14 | 14 | ||
15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
16 | 16 | ||
17 | SRCREV = "e6f366618dc9a3d232446197d6fea7c814e53828" | 17 | SRCREV = "313f221381507eee36c8e3bd0069b3e7962da140" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 658420b5..f80ff56a 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ | |||
10 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | 10 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ |
11 | " | 11 | " |
12 | 12 | ||
13 | DEPENDS += "qtdeclarative" | 13 | DEPENDS += "qtdeclarative qtdeclarative-native" |
14 | 14 | ||
15 | RDEPENDS_${PN}-dev = "" | 15 | RDEPENDS_${PN}-dev = "" |
16 | 16 | ||
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" | |||
18 | # http://errors.yoctoproject.org/Errors/Build/44912/ | 18 | # http://errors.yoctoproject.org/Errors/Build/44912/ |
19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
20 | 20 | ||
21 | SRCREV = "a38c4da7b598f5a185d7c9f824482d418353e6bf" | 21 | SRCREV = "3e28d47cea038ca64c2e14ff449cc183c51643ce" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index d804b019..5e699261 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" | |||
26 | 26 | ||
27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
28 | 28 | ||
29 | SRCREV = "892d4a0df7dccc6e70586835bb1211cf1b79bc69" | 29 | SRCREV = "f878323a82fa69fcaeb37b42e10ba28759157f47" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index fa981abb..24d3527b 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb | |||
@@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | QT_MODULE_BRANCH = "5.10" | 12 | SRCREV = "4d5a04a0793ef05ade54a09cd469c9934f102753" |
13 | |||
14 | SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e" | ||
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 03f3aca0..3e9edd46 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -31,7 +31,7 @@ SRC_URI += " \ | |||
31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
32 | " | 32 | " |
33 | 33 | ||
34 | SRCREV_qtlocation = "ec00ff89bee900a1b8925e227a892bc57839cd60" | 34 | SRCREV_qtlocation = "d458bd47106dd849e6cf72b97a27f871735e4eed" |
35 | SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" | 35 | SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" |
36 | 36 | ||
37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 90c255d7..a3e6da49 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb | |||
@@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | QT_MODULE_BRANCH = "5.10" | 12 | SRCREV = "b61e7bd3182addd8675ae907fc681db402fb138f" |
13 | |||
14 | SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9" | ||
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 4fb0f724..a9572c5e 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 ec1740a7bce48435e65ede530e0b96593ac619ea Mon Sep 17 00:00:00 2001 | 1 | From 4d020a4b5922c5c97bec661f39d978188d503c9c 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 efe848f0..519e76bb 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -26,8 +26,9 @@ 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 | CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" | 28 | CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" |
29 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.10 | 29 | |
30 | # 5.10.meta-qt5.2 | 30 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.11 |
31 | # 5.11.meta-qt5.1 | ||
31 | SRC_URI += "\ | 32 | SRC_URI += "\ |
32 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ | 33 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ |
33 | " | 34 | " |
@@ -36,4 +37,4 @@ SRC_URI += "\ | |||
36 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
38 | 39 | ||
39 | SRCREV = "038716bb1f2d9b95f2d638e2d61d297563343af9" | 40 | SRCREV = "0354fdda8b430f7749082ca55ad6c1dc781f3918" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 0180376e..689d85c3 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb | |||
@@ -9,4 +9,4 @@ require qt5-git.inc | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "8f4f2e0cae642ff5eb0b87ae1d4e9c5e6ccf2bd8" | 12 | SRCREV = "e8552ddaf17dad91df3a03ccfc0d708ab13d6d0e" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index adda211c..c39ec3da 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "d925245573a76b23b231a93fa4674fb340f226a7" | 13 | SRCREV = "51b83b74bb3d0ed406e28f89cbde1441782b82b2" |
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 85b84629..fd440b74 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb | |||
@@ -26,4 +26,4 @@ do_configure_prepend() { | |||
26 | 26 | ||
27 | QT_MODULE_BRANCH = "dev" | 27 | QT_MODULE_BRANCH = "dev" |
28 | 28 | ||
29 | SRCREV = "b2476dcd53f0dea1e9eb38df5add3a771d64c4a1" | 29 | SRCREV = "fa02271a18837f20e82006de23c2af1899294aa1" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index d922cd68..ba6afa84 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -8,6 +8,6 @@ LIC_FILES_CHKSUM = " \ | |||
8 | file://LICENSE.GPLv3;md5=dce746aa5261707df6d6999ab9958d8b \ | 8 | file://LICENSE.GPLv3;md5=dce746aa5261707df6d6999ab9958d8b \ |
9 | " | 9 | " |
10 | 10 | ||
11 | DEPENDS += "qtdeclarative" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
12 | 12 | ||
13 | SRCREV = "e693ad2c4ae22f8813befd5fe825c855537497ed" | 13 | SRCREV = "e80d273e6f19ba0a6a0f4e830724a36785ef19f6" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 17dd0fc1..a8c2870f 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = " \ | |||
10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 10 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
11 | " | 11 | " |
12 | 12 | ||
13 | DEPENDS += "qtdeclarative" | 13 | DEPENDS += "qtdeclarative qtdeclarative-native" |
14 | 14 | ||
15 | FILES_${PN}-qmlplugins += " \ | 15 | FILES_${PN}-qmlplugins += " \ |
16 | ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ | 16 | ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ |
17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "09ebb25aa686fc3f47f860905c2abb32a95c75d1" | 20 | SRCREV = "6c9f0bfcc4bc6511686559dd87c29cfaa3e88b33" |
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 19b526c9..977652e3 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 6235a3fdd0807205c818d70582033970ee008013 Mon Sep 17 00:00:00 2001 | 1 | From 2bf23e29ff3ec25e394fe1f633479013185a57d7 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 e70579ab..5d0dee15 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -11,8 +11,8 @@ require qt5-git.inc | |||
11 | 11 | ||
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.10 | 14 | # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.11 |
15 | # 5.10.meta-qt5.2 | 15 | # 5.11.meta-qt5.1 |
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 | " |
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
24 | 24 | ||
25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
26 | 26 | ||
27 | SRCREV = "61d2de26db7b90ad0ed3923b5deecd1c5b3be46a" | 27 | SRCREV = "db6d07b4a51813e72eee474a6ee2e91438841fa7" |
28 | 28 | ||
29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index d73eb44e..f4b2faf8 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -30,4 +30,4 @@ DEPENDS += "qtbase" | |||
30 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 30 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
31 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 31 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
32 | 32 | ||
33 | SRCREV = "76bcf9b526f96edb35469e9de4b032a112a2b1c0" | 33 | SRCREV = "781c745277f9b4faa87d341b10ec0ca46eb45a73" |
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 e734cf32..e4c72145 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 f83817b29477f33ee3b4abf8468a7b01bb347d2b Mon Sep 17 00:00:00 2001 | 1 | From 550a56d5cea4ff0b332c2c4d53a0cb33ccf6102e 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 feb333fe..2fd89730 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb | |||
@@ -10,10 +10,10 @@ require qt5-git.inc | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
12 | 12 | ||
13 | SRCREV = "d9b2f8c56d162c108d5427769a8e496dd7a3b62e" | 13 | SRCREV = "544f8c4ef7b77c5194605cba612fdde6fa02b06b" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.10 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.11 |
16 | # 5.10.meta-qt5.2 | 16 | # 5.11.meta-qt5.1 |
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/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 09e8e8b9..addfe149 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase qtdeclarative" | 13 | DEPENDS += "qtbase qtdeclarative" |
14 | 14 | ||
15 | SRCREV = "d5a94c5595170fed9a0f7d3d42ef4b0216909d0d" | 15 | SRCREV = "e8588efb2fbd4a31aa1e4349f03b2bc18e3c0e2b" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 85c4669f..fca80af8 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "d5d35d64d06729322c80327de40badaf553df87e" | 14 | SRCREV = "7c6e9d8f29148793dc619a743a0b5d3a601ec34b" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index ddc6957a..b05c93d4 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
17 | 17 | ||
18 | SRCREV = "fa688ac5c36a16aa3b44d4ca1509f9386e670a89" | 18 | SRCREV = "aee027f581839caf44de1b176099ef2b22d2fc84" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 12fcff1f..2f0e98aa 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "af35137016f082c3fa15e61414f3c78c73ac322f" | 16 | SRCREV = "f4554e29a44af2cdd9e518f5931e28cf349883c6" |
diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index 7a081a1c..45be54f2 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 9557b7b0100c335b42503c3f3b6a9a193c3bf9cf Mon Sep 17 00:00:00 2001 | 1 | From 1a20dc06de52a88691dc8270d449506aa0b9d457 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 a4909f75..5472ef55 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 a260d3a5b1664027e09c7de368ee5e94d22ff8bf Mon Sep 17 00:00:00 2001 | 1 | From 1a7ca3de9880a10cf4f4eb51fd3cf51e64eb5548 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 df15d88b..a8728a23 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" | 15 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" |
16 | 16 | ||
17 | # Patches from https://github.com/meta-qt5/qttools/commits/b5.10 | 17 | # Patches from https://github.com/meta-qt5/qttools/commits/b5.11 |
18 | # 5.10.meta-qt5.2 | 18 | # 5.11.meta-qt5.1 |
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 \ |
@@ -29,7 +29,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
29 | 29 | ||
30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
31 | 31 | ||
32 | SRCREV = "03ebf1c3d6ceae715c696a171920a0204c58dd0a" | 32 | SRCREV = "c29a1b03fd0fe6cc3496a6a14c56f6ef3390b713" |
33 | 33 | ||
34 | BBCLASSEXTEND = "native nativesdk" | 34 | BBCLASSEXTEND = "native nativesdk" |
35 | 35 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index a8c71668..00ffa7cb 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -106,4 +106,4 @@ FILES_${PN}-qt = " \ | |||
106 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 106 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
107 | " | 107 | " |
108 | 108 | ||
109 | SRCREV = "c3486e072ebc704f9c82c005044143b07bb88f12" | 109 | SRCREV = "f1c17f060d09ea3d225803afa9f82fa22117cd3b" |
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 1e50d5ad..6f5bc45f 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 d479fe395566ed84cde2579011e2ca2358f22c41 Mon Sep 17 00:00:00 2001 | 1 | From c437e90e3bcf8457d300c49041f7e35fae37ebea 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 0029170f..b89aae9b 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \ | |||
6 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 6 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
7 | " | 7 | " |
8 | 8 | ||
9 | # Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.10 | 9 | # Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.11 |
10 | # 5.10.meta-qt5.2 | 10 | # 5.11.meta-qt5.1 |
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 |
@@ -51,6 +51,6 @@ RRECOMMENDS_${PN} += "${PN}-dictionaries" | |||
51 | FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" | 51 | FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" |
52 | FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | 52 | FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" |
53 | 53 | ||
54 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" | 54 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
55 | 55 | ||
56 | SRCREV = "85d35bb12235dd6b92c898ddb6d6e84703d25d48" | 56 | SRCREV = "9055bd56653d2e488b52c66d884109fcccd23c2d" |
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 04ae7e0e..cfb2ee3e 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 e41bc392aa79073926aba917796e836f5b0d9f32 Mon Sep 17 00:00:00 2001 | 1 | From 4e1945bd0867c018d06b5fa9c2dcb60619f260b2 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 |
@@ -26,17 +26,17 @@ index eae7ad5..0bb7b18 100644 | |||
26 | + | 26 | + |
27 | +LIBS += -lxkbcommon | 27 | +LIBS += -lxkbcommon |
28 | diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro | 28 | diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro |
29 | index dc9000d..4eebfd6 100644 | 29 | index 47be591..805c81e 100644 |
30 | --- a/src/compositor/compositor.pro | 30 | --- a/src/compositor/compositor.pro |
31 | +++ b/src/compositor/compositor.pro | 31 | +++ b/src/compositor/compositor.pro |
32 | @@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) | 32 | @@ -34,3 +34,5 @@ MODULE_PLUGIN_TYPES = \ |
33 | MODULE_PLUGIN_TYPES = \ | 33 | wayland-hardware-layer-integration \ |
34 | wayland-graphics-integration-server | 34 | |
35 | load(qt_module) | 35 | load(qt_module) |
36 | + | 36 | + |
37 | +LIBS += -lxkbcommon | 37 | +LIBS += -lxkbcommon |
38 | diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp | 38 | diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp |
39 | index c30f7b1..e6f1a0b 100644 | 39 | index e35c0f3..45e82ca 100644 |
40 | --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp | 40 | --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp |
41 | +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp | 41 | +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp |
42 | @@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) | 42 | @@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 91ffcd77..272bed1d 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -37,10 +37,10 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature | |||
37 | 37 | ||
38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | SRCREV = "db36bc0d9ccae21e84cd54be3e18ae539542eadc" | 40 | SRCREV = "ec495c98189f1d849e793108b09b5af0ce2c8984" |
41 | 41 | ||
42 | # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.10 | 42 | # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.11 |
43 | # 5.10.meta-qt5.2 | 43 | # 5.11.meta-qt5.1 |
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/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 2b4a4875..0bcbf564 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtdeclarative qtwebsockets" | 13 | DEPENDS += "qtdeclarative qtwebsockets" |
14 | 14 | ||
15 | SRCREV = "7540a85c82cd940b7da3ea75eccad7e733bd0ae6" | 15 | SRCREV = "01241eb3704af785e8d98fb2f6e223ca62a64175" |
diff --git a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index a324dc64..f7cbad51 100644 --- a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a70b6d2183934e4d9a3ad00167acfaf0a78a90a9 Mon Sep 17 00:00:00 2001 | 1 | From ded0b78fe690b5c6ddfca08a098e824ed23ae80d 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 |
@@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | |||
9 | 1 file changed, 2 insertions(+) | 9 | 1 file changed, 2 insertions(+) |
10 | 10 | ||
11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h | 11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h |
12 | index 1b8edc8..03d6558 100644 | 12 | index 1b718a3..8c1de74 100644 |
13 | --- a/src/webengine/api/qquickwebengineview_p_p.h | 13 | --- a/src/webengine/api/qquickwebengineview_p_p.h |
14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h | 14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h |
15 | @@ -59,6 +59,8 @@ | 15 | @@ -61,6 +61,8 @@ |
16 | #include <QString> | 16 | #include <QString> |
17 | #include <QtCore/qcompilerdetection.h> | 17 | #include <QtCore/qcompilerdetection.h> |
18 | #include <QtGui/qaccessibleobject.h> | 18 | #include <QtGui/qaccessibleobject.h> |
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch index 69e05660..3d5d286d 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d760fcdd764985f05a480ba475855f92844a6f0d Mon Sep 17 00:00:00 2001 | 1 | From 3e08f22dbe2ca570bf853b6dfad8831f21ddbe14 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,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | 14 | 1 file changed, 3 insertions(+), 3 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 b1ff7e7..bccabbb 100755 | 17 | index 43392ef..9ef521f 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 | @@ -318,10 +318,10 @@ def write_gn_ninja(path, root_gen_dir, options): | 20 | @@ -326,10 +326,10 @@ def write_gn_ninja(path, root_gen_dir, options): |
21 | ld = os.environ.get('LD', cxx) | 21 | ld = os.environ.get('LD', cxx) |
22 | ar = os.environ.get('AR', 'ar -X64') | 22 | ar = os.environ.get('AR', 'ar -X64') |
23 | else: | 23 | else: |
diff --git a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch index e41636a3..061df820 100644 --- a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 838bb0afe93321ae3d225988728a5736cd4844fc Mon Sep 17 00:00:00 2001 | 1 | From 695e80ba773eae1d6239828b8b3218ac6584e1e1 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/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch index 592a30f3..3e30ac5c 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d76853bd469881625bedc85afabc69d36ecb05ed Mon Sep 17 00:00:00 2001 | 1 | From 51313e2d2739c9a9ca5e86979e868e9bd80e9bfd 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 |
diff --git a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch index 84e430b7..8cdab4b7 100644 --- a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 36657d556e4f97d06aa44d874d7256c970cdad3c Mon Sep 17 00:00:00 2001 | 1 | From afbaa51b52482f71e683389e7565aceb6c59e8a6 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 |
@@ -57,10 +57,10 @@ index dd0d3e3..70161c8 100644 | |||
57 | " nm = \"$$which(nm)\" " \ | 57 | " nm = \"$$which(nm)\" " \ |
58 | " toolchain_args = { " \ | 58 | " toolchain_args = { " \ |
59 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri | 59 | diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri |
60 | index 1ce3ea8..23d0793 100644 | 60 | index daac6fa..d858021 100644 |
61 | --- a/src/core/config/linux.pri | 61 | --- a/src/core/config/linux.pri |
62 | +++ b/src/core/config/linux.pri | 62 | +++ b/src/core/config/linux.pri |
63 | @@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") { | 63 | @@ -90,7 +90,7 @@ contains(QT_ARCH, "mips") { |
64 | 64 | ||
65 | host_build { | 65 | host_build { |
66 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" | 66 | gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" |
diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index 1fb85fb3..e808eb70 100644 --- a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c6e7171bf8f5ecb8b82d911581a45defe93854e1 Mon Sep 17 00:00:00 2001 | 1 | From 5d7080bf2001a022223c4089a199605b5f9a5cce 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 |
diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index 5dbd07f1..359ee26e 100644 --- a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 104d93f24a44dc4a1939d6e2c99f346526a5a7d9 Mon Sep 17 00:00:00 2001 | 1 | From f3478cde99da29faebbdb3d13a479b50af9804fd 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 |
@@ -32,7 +32,7 @@ index 0eb5c1f..8af7799 100644 | |||
32 | return 0; | 32 | return 0; |
33 | #endif | 33 | #endif |
34 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc | 34 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc |
35 | index 14ba0a2..e5d9581 100644 | 35 | index f1cc52a..256138d 100644 |
36 | --- a/chromium/base/trace_event/malloc_dump_provider.cc | 36 | --- a/chromium/base/trace_event/malloc_dump_provider.cc |
37 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc | 37 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc |
38 | @@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() {} | 38 | @@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() {} |
@@ -43,7 +43,7 @@ index 14ba0a2..e5d9581 100644 | |||
43 | size_t total_virtual_size = 0; | 43 | size_t total_virtual_size = 0; |
44 | size_t resident_size = 0; | 44 | size_t resident_size = 0; |
45 | size_t allocated_objects_size = 0; | 45 | size_t allocated_objects_size = 0; |
46 | @@ -317,7 +318,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, | 46 | @@ -316,7 +317,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, |
47 | pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); | 47 | pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); |
48 | } | 48 | } |
49 | tid_dumping_heap_ = kInvalidThreadId; | 49 | tid_dumping_heap_ = kInvalidThreadId; |
diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index 76160d16..e4d44f39 100644 --- a/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1a23cb4027692535aeace4c6070864af672de70d Mon Sep 17 00:00:00 2001 | 1 | From ac6d09a3bb56dee9fc377f4042b23b209fd0726d 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, 12 Dec 2017 16:06:14 +0200 | 3 | Date: Tue, 12 Dec 2017 16:06:14 +0200 |
4 | Subject: [PATCH] musl: don't use pvalloc as it's not available on musl | 4 | Subject: [PATCH] musl: don't use pvalloc as it's not available on musl |
diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch index e0a3f804..2af1f3cb 100644 --- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1e51c5e3a299213b632dd2d448c86dabf45b2258 Mon Sep 17 00:00:00 2001 | 1 | From 660cc2ad6e2c92e0a86948c80f356b754ecd43f5 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 |
diff --git a/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch index 45a45f9b..84c1cec3 100644 --- a/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e735b0adfa9b1dcaa93e3ce65d9cc01255ab340b Mon Sep 17 00:00:00 2001 | 1 | From 52ef357f629a2c210b3b0fe13cba90fe379afee9 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, 14 Dec 2017 11:28:10 +0200 | 3 | Date: Thu, 14 Dec 2017 11:28:10 +0200 |
4 | Subject: [PATCH] musl: link against libexecinfo | 4 | Subject: [PATCH] musl: link against libexecinfo |
diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index f8c4150a..c07ffa44 100644 --- a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f0fba131a285144c5d71dad8b98ff0f15ce454ad Mon Sep 17 00:00:00 2001 | 1 | From 80e2b20ed6aa48b692b7de585c8ea92263c99d72 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 |
diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch index fbff2883..6f578a06 100644 --- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 42a0586aa7040caef931db8657b2ac8d345e4dd3 Mon Sep 17 00:00:00 2001 | 1 | From 671dc6a1d7d507a81d5a53a106d72d6c14f50e13 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 |
diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch index d040057a..1ef7e40a 100644 --- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ff7af7ff21d259cfc580541b931d478e3d604f01 Mon Sep 17 00:00:00 2001 | 1 | From f1c0433093b5511dceb0cf80287d281fd24ac941 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 |
diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch index c2a9c8a0..aba7c05c 100644 --- a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 74171f47edb76dc89edcc7116cd33d234e0e0490 Mon Sep 17 00:00:00 2001 | 1 | From 3789c3d611ee4fd258f85eac9d575af09791585e 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 |
diff --git a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index 9b274913..032ff303 100644 --- a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1781911655bddf8a8352f9bd0a7ce4867df6981b Mon Sep 17 00:00:00 2001 | 1 | From b4cc182b9cc6b6362cf4039883e4e1953357843a 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,10 +13,10 @@ 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 088fb9b..98d0a35 100644 | 16 | index 8898f85..28530d5 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 | @@ -26,6 +26,10 @@ | 19 | @@ -28,6 +28,10 @@ |
20 | #include "net/dns/notify_watcher_mac.h" | 20 | #include "net/dns/notify_watcher_mac.h" |
21 | #include "net/dns/serial_worker.h" | 21 | #include "net/dns/serial_worker.h" |
22 | 22 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch deleted file mode 100644 index 7be83c55..00000000 --- a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From ce23b6a6e5a5ebae15dedeebf7044ac9a0249a80 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 15:24:49 -0700 | ||
4 | Subject: [PATCH] chromium: musl: Match syscalls to match musl | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | chromium/third_party/lss/linux_syscall_support.h | 16 ++++++++++++++++ | ||
9 | 1 file changed, 16 insertions(+) | ||
10 | |||
11 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | ||
12 | index 80a3e56..1e57b1a 100644 | ||
13 | --- a/chromium/third_party/lss/linux_syscall_support.h | ||
14 | +++ b/chromium/third_party/lss/linux_syscall_support.h | ||
15 | @@ -794,6 +794,14 @@ struct kernel_statfs { | ||
16 | #endif | ||
17 | |||
18 | |||
19 | +#undef stat64 | ||
20 | +#undef fstat64 | ||
21 | + | ||
22 | +#ifndef __NR_fstatat | ||
23 | +#define __NR_fstatat __NR_fstatat64 | ||
24 | +#endif | ||
25 | + | ||
26 | + | ||
27 | #if defined(__x86_64__) | ||
28 | #ifndef ARCH_SET_GS | ||
29 | #define ARCH_SET_GS 0x1001 | ||
30 | @@ -1211,6 +1219,14 @@ struct kernel_statfs { | ||
31 | #ifndef __NR_fallocate | ||
32 | #define __NR_fallocate 285 | ||
33 | #endif | ||
34 | + | ||
35 | +#ifndef __NR_pread | ||
36 | +#define __NR_pread __NR_pread64 | ||
37 | +#endif | ||
38 | +#ifndef __NR_pwrite | ||
39 | +#define __NR_pwrite __NR_pwrite64 | ||
40 | +#endif | ||
41 | + | ||
42 | /* End of x86-64 definitions */ | ||
43 | #elif defined(__mips__) | ||
44 | #if _MIPS_SIM == _MIPS_SIM_ABI32 | ||
diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch index e6863251..6223ee5b 100644 --- a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a968ea31e3ac6a007fd157c61faf9f6f632d8230 Mon Sep 17 00:00:00 2001 | 1 | From e8172c5252dec386fbd95a18f2c59f08307f65c0 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 |
diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch index c1d6ec32..cacd623e 100644 --- a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a56debd9f26bacf76f0d734e98191485deba03fa Mon Sep 17 00:00:00 2001 | 1 | From 6c3233f1eec1a80bc771848af062cc92445b143b 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,10 +10,10 @@ 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 8d411ed..4b56cf3 100644 | 13 | index 9917a7b..cb40665 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 | @@ -173,7 +173,8 @@ void TerminateOnThread() {} |
17 | 17 | ||
18 | size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { | 18 | size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { |
19 | #if !defined(THREAD_SANITIZER) | 19 | #if !defined(THREAD_SANITIZER) |
diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch index 81e71e7d..d9c76017 100644 --- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +++ b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5809e73146cdf43d13aa1b3789bfc7ff2ff723af Mon Sep 17 00:00:00 2001 | 1 | From 9624b45166cd5e7976a6ecf99f2545c9cc883986 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 8ffba12..82fb09f 100644 | 12 | index eca131f..80a6cec 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/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch index 03aa77a0..f7880f81 100644 --- a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch +++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0aca8610a03cc100464d0d52a2c5425c52ab1e66 Mon Sep 17 00:00:00 2001 | 1 | From d723d506ff8b5e0dd1bb3f2c11805a2ec1f0b712 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 |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index db089c14..1d1763d0 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -121,10 +121,10 @@ RDEPENDS_${PN}-examples += " \ | |||
121 | qtdeclarative-qmlplugins \ | 121 | qtdeclarative-qmlplugins \ |
122 | " | 122 | " |
123 | 123 | ||
124 | QT_MODULE_BRANCH_CHROMIUM = "61-based" | 124 | QT_MODULE_BRANCH_CHROMIUM = "63-based" |
125 | 125 | ||
126 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.10 | 126 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11 |
127 | # 5.10.meta-qt5.2 | 127 | # 5.11.meta-qt5.1 |
128 | SRC_URI += " \ | 128 | SRC_URI += " \ |
129 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 129 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
130 | file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ | 130 | file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ |
@@ -136,8 +136,8 @@ SRC_URI_append_libc-musl = "\ | |||
136 | file://0005-musl-link-against-libexecinfo.patch \ | 136 | file://0005-musl-link-against-libexecinfo.patch \ |
137 | " | 137 | " |
138 | 138 | ||
139 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/61-based | 139 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/63-based |
140 | # 61-based.meta-qt5.2 | 140 | # 63-based.meta-qt5.1 |
141 | SRC_URI += " \ | 141 | SRC_URI += " \ |
142 | file://0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ | 142 | file://0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ |
143 | file://0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ | 143 | file://0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ |
@@ -151,16 +151,15 @@ SRC_URI_append_libc-musl = "\ | |||
151 | file://0007-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ | 151 | file://0007-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ |
152 | file://0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ | 152 | file://0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ |
153 | file://0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ | 153 | file://0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ |
154 | file://0010-chromium-musl-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty \ | 154 | file://0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ |
155 | file://0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ | 155 | file://0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ |
156 | file://0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ | 156 | file://0012-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ |
157 | file://0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ | 157 | file://0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ |
158 | file://0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ | 158 | file://0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
159 | file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | ||
160 | " | 159 | " |
161 | 160 | ||
162 | SRCREV_qtwebengine = "9dc8dff7a8f4d58f71d816375d49f8829f06aae5" | 161 | SRCREV_qtwebengine = "732d09331c1e4efa51501aae9bcd6924eecdd5c3" |
163 | SRCREV_chromium = "c858cc76099db0af82a264b3c6f921a287cfcb42" | 162 | SRCREV_chromium = "3fa04d22883e42bd987e4f83d394a1040b410024" |
164 | SRCREV = "${SRCREV_qtwebengine}" | 163 | SRCREV = "${SRCREV_qtwebengine}" |
165 | 164 | ||
166 | SRCREV_FORMAT = "qtwebengine_chromium" | 165 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 114fab7a..c19fecdb 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -17,6 +17,6 @@ DEPENDS += "qtwebkit qtxmlpatterns" | |||
17 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" | 17 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" |
18 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" | 18 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" |
19 | 19 | ||
20 | QT_MODULE_BRANCH = "5.9" | 20 | QT_MODULE_BRANCH = "dev" |
21 | 21 | ||
22 | SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55" | 22 | SRCREV = "2d68492004bf4ba49cf58c9bd72706cb282cf59b" |
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 deleted file mode 100644 index f35c5d47..00000000 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From c4e691a8dd2037d9b359e0de9d4790da9078f74e Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Woerner <trevor.woerner@linaro.org> | ||
3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 | ||
4 | Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) | ||
5 | |||
6 | Building qtwebkit causes a QA issue such that QtWebPluginProcess and | ||
7 | QtWebProcess contain bad RPATHs which point into the build location. This fix | ||
8 | adds a patch to not include the rpath.prf which causes this problem. | ||
9 | |||
10 | Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | Tools/qmake/mkspecs/features/unix/default_post.prf | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
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 | ||
18 | --- a/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++* { | ||
21 | } | ||
22 | } | ||
23 | |||
24 | -contains(TEMPLATE, app): CONFIG += rpath | ||
25 | |||
26 | CONFIG(debug, debug|release)|force_debug_info { | ||
27 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. | ||
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 deleted file mode 100644 index 6affd2e6..00000000 --- a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From fc2773961eaa536e6a617ded7c1a972d979fa2e4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 5 Jun 2015 19:55:05 -0700 | ||
4 | Subject: [PATCH] Exclude backtrace() API for non-glibc libraries | ||
5 | |||
6 | It was excluding musl with current checks, so lets make it such that it | ||
7 | considers only glibc when using backtrace API | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | Source/WTF/wtf/Assertions.cpp | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp | ||
15 | index 1b2091f..ba03a28 100644 | ||
16 | --- a/Source/WTF/wtf/Assertions.cpp | ||
17 | +++ b/Source/WTF/wtf/Assertions.cpp | ||
18 | @@ -61,7 +61,7 @@ | ||
19 | #include <windows.h> | ||
20 | #endif | ||
21 | |||
22 | -#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) | ||
23 | +#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) | ||
24 | #include <cxxabi.h> | ||
25 | #include <dlfcn.h> | ||
26 | #include <execinfo.h> | ||
27 | @@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f | ||
28 | |||
29 | void WTFGetBacktrace(void** stack, int* size) | ||
30 | { | ||
31 | -#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) | ||
32 | +#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) | ||
33 | *size = backtrace(stack, *size); | ||
34 | #elif OS(WINDOWS) && !OS(WINCE) | ||
35 | // The CaptureStackBackTrace function is available in XP, but it is not defined | ||
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index c8e83281..36c967f4 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -3,9 +3,7 @@ require qt5-git.inc | |||
3 | 3 | ||
4 | LICENSE = "BSD & LGPLv2+ | GPL-2.0" | 4 | LICENSE = "BSD & LGPLv2+ | GPL-2.0" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 6 | file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ |
7 | file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ | ||
8 | file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ | ||
9 | file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee \ | 7 | file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee \ |
10 | " | 8 | " |
11 | 9 | ||
@@ -26,13 +24,6 @@ ARM_INSTRUCTION_SET_armv7a = "thumb" | |||
26 | ARM_INSTRUCTION_SET_armv7r = "thumb" | 24 | ARM_INSTRUCTION_SET_armv7r = "thumb" |
27 | ARM_INSTRUCTION_SET_armv7ve = "thumb" | 25 | ARM_INSTRUCTION_SET_armv7ve = "thumb" |
28 | 26 | ||
29 | # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.10 | ||
30 | # 5.10.meta-qt5.1 | ||
31 | SRC_URI += "\ | ||
32 | file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ | ||
33 | file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \ | ||
34 | " | ||
35 | |||
36 | PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ | 27 | PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ |
37 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxrender', '', d)} \ | 28 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxrender', '', d)} \ |
38 | fontconfig \ | 29 | fontconfig \ |
@@ -50,27 +41,6 @@ PACKAGECONFIG[fontconfig] = "OE_FONTCONFIG_ENABLED,,fontconfig" | |||
50 | 41 | ||
51 | do_configure_prepend() { | 42 | do_configure_prepend() { |
52 | export QMAKE_CACHE_EVAL="CONFIG+=${PACKAGECONFIG_CONFARGS}" | 43 | export QMAKE_CACHE_EVAL="CONFIG+=${PACKAGECONFIG_CONFARGS}" |
53 | # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG | ||
54 | sed -e 's/\s\(packagesExist(".*\<gstreamer-1.0\>.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | ||
55 | # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG | ||
56 | sed -e 's/\s\(packagesExist(".*\<gstreamer-0.10\>.*")\)/ OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | ||
57 | # disable qtlocation test if it isn't enabled by PACKAGECONFIG | ||
58 | sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | ||
59 | # disable qtmultimedia test if it isn't enabled by PACKAGECONFIG | ||
60 | sed -e 's/(video):\(qtHaveModule(multimediawidgets)\)/(video):OE_QTMULTIMEDIA_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | ||
61 | # disable qtsensors test if it isn't enabled by PACKAGECONFIG | ||
62 | sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | ||
63 | # disable qtwebchannel test if it isn't enabled by PACKAGECONFIG | ||
64 | sed -e 's/\s\(qtHaveModule(webchannel)\)/ OE_QTWEBCHANNEL_ENABLED:\1/' -i ${S}/Source/WebKit2/Target.pri | ||
65 | sed -e 's/\s\(qtHaveModule(webchannel)\)/ OE_QTWEBCHANNEL_ENABLED:\1/' -i ${S}/Source/WebKit2/WebKit2.pri | ||
66 | # disable libwebp test if it isn't enabled by PACKAGECONFIG | ||
67 | sed -e 's/\s\(config_libwebp: \)/ OE_LIBWEBP_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | ||
68 | # disable libxcomposite test if it isn't enabled by PACKAGECONFIG | ||
69 | sed -e 's/\s\(config_libXcomposite: \)/ OE_LIBXCOMPOSITE_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | ||
70 | # disable libxrender test if it isn't enabled by PACKAGECONFIG | ||
71 | sed -e 's/\s\(config_libXrender: \)/ OE_LIBXRENDER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | ||
72 | # disable fontconfig test if it isn't enabled by PACKAGECONFIG | ||
73 | sed -e 's/\s\(config_fontconfig: \)/ OE_FONTCONFIG_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | ||
74 | } | 44 | } |
75 | 45 | ||
76 | # Forcibly enable ICU, so qtbase doesn't need it. | 46 | # Forcibly enable ICU, so qtbase doesn't need it. |
@@ -80,12 +50,6 @@ EXTRA_QMAKEVARS_PRE += "QT_CONFIG+=icu" | |||
80 | QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" | 50 | QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" |
81 | EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" | 51 | EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" |
82 | 52 | ||
83 | do_install_append() { | ||
84 | # Remove paths to workdir, qtwebkit is dead now, so I won't spend extra time trying to prevent this | ||
85 | # from some .prl or .prf file like for other modules | ||
86 | sed -i 's@-Wl,-no-whole-archive -L${B}[^ ]* @ @g' ${D}${libdir}/pkgconfig/Qt5WebKit.pc | ||
87 | } | ||
88 | |||
89 | # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe | 53 | # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe |
90 | PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples" | 54 | PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples" |
91 | 55 | ||
@@ -95,6 +59,6 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db | |||
95 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" | 59 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" |
96 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" | 60 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" |
97 | 61 | ||
98 | QT_MODULE_BRANCH = "5.9" | 62 | QT_MODULE_BRANCH = "dev" |
99 | 63 | ||
100 | SRCREV = "bd0657f98aff85b9f06d85a8cf4da6a27f61a56e" | 64 | SRCREV = "beaeeb99881184fd368c121fcbb1a31c78b794a3" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 5d429ca0..1e8719a7 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "2160c268ec80012f86be3eef20e05c267cdd2926" | 14 | SRCREV = "8a549aca7b371722cbf012d85216e4560ef1cf33" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index f164c6af..ceecfb0b 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
21 | 21 | ||
22 | SRCREV = "7445cd28616e68af3cf5e074a5576cbe6c5bf491" | 22 | SRCREV = "cf23a402b97b459309ec32fe49c82a845a3636af" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 443e9d50..8a98f548 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "a751298bc381b0fd0c6867e43d2613b98c2cb71f" | 16 | SRCREV = "78a10dad08d1c354f7afb539bd89f0d75a9fe3b1" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 77d7fe20..2325eb03 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | DEPENDS += "qtbase" | 15 | DEPENDS += "qtbase" |
16 | 16 | ||
17 | SRCREV = "7c4113d6e6215b26b866ed2a0da0fa5e0c12b8ea" | 17 | SRCREV = "c892ceec1c301f12d5c276e12be0bee8fd7d4cbf" |
18 | 18 | ||
19 | BBCLASSEXTEND =+ "native nativesdk" | 19 | BBCLASSEXTEND =+ "native nativesdk" |
20 | 20 | ||