summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb22
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch15
-rw-r--r--recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch56
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qt5.inc10
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb24
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch14
-rw-r--r--recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch (renamed from recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (renamed from recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch34
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch106
-rw-r--r--recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch (renamed from recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch33
-rw-r--r--recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch (renamed from recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch)4
-rw-r--r--recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch (renamed from recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch)2
-rw-r--r--recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch (renamed from recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch)10
-rw-r--r--recipes-qt/qt5/qtbase/0009-Always-build-uic.patch (renamed from recipes-qt/qt5/qtbase/0011-Always-build-uic.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch28
-rw-r--r--recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch75
-rw-r--r--recipes-qt/qt5/qtbase_git.bb26
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb6
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch44
-rw-r--r--recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch84
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb8
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb5
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb4
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch27
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb15
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb8
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb3
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch28
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb10
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb7
-rw-r--r--recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch37
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb27
-rw-r--r--recipes-qt/qt5/qtscript_git.bb4
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch29
-rw-r--r--recipes-qt/qt5/qttools_git.bb8
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb6
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch (renamed from recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch24
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch27
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch (renamed from recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch)14
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch (renamed from recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch)4
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch40
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch26
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch (renamed from recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch)8
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch (renamed from recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch131
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch44
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch41
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch (renamed from recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch)8
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch (renamed from recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch (renamed from recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch (renamed from recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch (renamed from recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch (renamed from recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch (renamed from recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch)8
-rw-r--r--recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch (renamed from recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch (renamed from recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch (renamed from recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch)30
-rw-r--r--recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch (renamed from recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch (renamed from recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch22
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb88
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch76
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb3
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch22
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb24
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
88 files changed, 514 insertions, 1049 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 6f334c12..e1b30c9a 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -27,20 +27,18 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
27# common for qtbase-native, qtbase-nativesdk and qtbase 27# common for qtbase-native, qtbase-nativesdk and qtbase
28SRC_URI += "\ 28SRC_URI += "\
29 file://0001-Add-linux-oe-g-platform.patch \ 29 file://0001-Add-linux-oe-g-platform.patch \
30 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 30 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
31 file://0003-Add-external-hostbindir-option.patch \ 31 file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
32 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 32 file://0004-configure-bump-path-length-from-256-to-512-character.patch \
33 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 33 file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \
34 file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \ 34 file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
35 file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 35 file://0007-Delete-qlonglong-and-qulonglong.patch \
36 file://0008-Delete-qlonglong-and-qulonglong.patch \ 36 file://0008-Replace-pthread_yield-with-sched_yield.patch \
37 file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \
38 file://0010-Replace-pthread_yield-with-sched_yield.patch \
39" 37"
40 38
41# common for qtbase-native and nativesdk-qtbase 39# common for qtbase-native and nativesdk-qtbase
42SRC_URI += " \ 40SRC_URI += " \
43 file://0011-Always-build-uic.patch \ 41 file://0009-Always-build-uic.patch \
44" 42"
45 43
46# CMake's toolchain configuration of nativesdk-qtbase 44# CMake's toolchain configuration of nativesdk-qtbase
@@ -118,6 +116,7 @@ do_configure() {
118 -no-opengl \ 116 -no-opengl \
119 -no-openssl \ 117 -no-openssl \
120 -no-xcb \ 118 -no-xcb \
119 -no-feature-bearermanagement \
121 -no-icu \ 120 -no-icu \
122 -verbose \ 121 -verbose \
123 -release \ 122 -release \
@@ -137,7 +136,6 @@ do_configure() {
137 -testsdir ${OE_QMAKE_PATH_TESTS} \ 136 -testsdir ${OE_QMAKE_PATH_TESTS} \
138 -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \ 137 -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \
139 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ 138 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \
140 -host-option CROSS_COMPILE=${HOST_PREFIX} \
141 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ 139 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \
142 -no-glib \ 140 -no-glib \
143 -no-iconv \ 141 -no-iconv \
@@ -195,4 +193,4 @@ fakeroot do_generate_qt_environment_file() {
195 193
196addtask generate_qt_environment_file after do_install before do_package 194addtask generate_qt_environment_file after do_install before do_package
197 195
198SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980" 196SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
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 ba4e2d01..8cf1f501 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 @@
1From 22ccc94b5501509b516fce17195a598d04dcc2f3 Mon Sep 17 00:00:00 2001 1From dd0f3fefeeefb31ec8cf2417bd3f447f7b9c25c6 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
@@ -6,7 +6,8 @@ Subject: [PATCH] Allow a tools-only build
6--- 6---
7 qt3d.pro | 7 ++++++- 7 qt3d.pro | 7 ++++++-
8 src/3rdparty/assimp/assimp_dependency.pri | 2 +- 8 src/3rdparty/assimp/assimp_dependency.pri | 2 +-
9 2 files changed, 7 insertions(+), 2 deletions(-) 9 tools/tools.pro | 2 +-
10 3 files changed, 8 insertions(+), 3 deletions(-)
10 11
11diff --git a/qt3d.pro b/qt3d.pro 12diff --git a/qt3d.pro b/qt3d.pro
12index 2cc347a1c..81cdeefb0 100644 13index 2cc347a1c..81cdeefb0 100644
@@ -38,3 +39,13 @@ index 8ba2d9a41..e973d93dd 100644
38 QMAKE_USE_PRIVATE += assimp 39 QMAKE_USE_PRIVATE += assimp
39 } else { 40 } else {
40 include(assimp.pri) 41 include(assimp.pri)
42diff --git a/tools/tools.pro b/tools/tools.pro
43index 8e973aecb..ad51db585 100644
44--- a/tools/tools.pro
45+++ b/tools/tools.pro
46@@ -1,4 +1,4 @@
47 TEMPLATE = subdirs
48 QT_FOR_CONFIG += 3dcore-private
49-!android:qtConfig(assimp):qtConfig(commandlineparser): \
50+!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \
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 95b5479e..eeb402f6 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 @@
1From bc5ef10fc6f71cb340ad339bc43f6ce48adb1f59 Mon Sep 17 00:00:00 2001 1From ec40913bc563e3cb0abc1965ce457d3a2fe663b3 Mon Sep 17 00:00:00 2001
2From: Kim Kulling <kim.kulling@googlemail.com> 2From: Kim Kulling <kim.kulling@googlemail.com>
3Date: Mon, 7 Nov 2016 17:19:49 +0100 3Date: Mon, 7 Nov 2016 17:19:49 +0100
4Subject: [PATCH] Fix BlenderDNA for clang cross compiler. 4Subject: [PATCH] Fix BlenderDNA for clang cross compiler.
@@ -9,36 +9,36 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9 1 file changed, 8 insertions(+), 8 deletions(-) 9 1 file changed, 8 insertions(+), 8 deletions(-)
10 10
11diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp 11diff --git a/src/3rdparty/assimp/code/BlenderDNA.cpp b/src/3rdparty/assimp/code/BlenderDNA.cpp
12index b380fbe8d..3cc27dff1 100644 12index 18ec9f2b4..5b0b2090f 100644
13--- a/src/3rdparty/assimp/code/BlenderDNA.cpp 13--- a/src/3rdparty/assimp/code/BlenderDNA.cpp
14+++ b/src/3rdparty/assimp/code/BlenderDNA.cpp 14+++ b/src/3rdparty/assimp/code/BlenderDNA.cpp
15@@ -56,10 +56,10 @@ using namespace Assimp::Formatter; 15@@ -55,10 +55,10 @@ using namespace Assimp::Formatter;
16 #define for_each BOOST_FOREACH 16
17 bool match4(StreamReaderAny& stream, const char* string) { 17 bool match4(StreamReaderAny& stream, const char* string) {
18 char tmp[] = { 18 char tmp[] = {
19- (stream).GetI1(), 19- (stream).GetI1(),
20- (stream).GetI1(), 20- (stream).GetI1(),
21- (stream).GetI1(), 21- (stream).GetI1(),
22- (stream).GetI1() 22- (stream).GetI1()
23+ (const char)(stream).GetI1(), 23+ (const char)(stream).GetI1(),
24+ (const char)(stream).GetI1(), 24+ (const char)(stream).GetI1(),
25+ (const char)(stream).GetI1(), 25+ (const char)(stream).GetI1(),
26+ (const char)(stream).GetI1() 26+ (const char)(stream).GetI1()
27 }; 27 };
28 return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]); 28 return (tmp[0]==string[0] && tmp[1]==string[1] && tmp[2]==string[2] && tmp[3]==string[3]);
29 } 29 }
30@@ -344,10 +344,10 @@ void SectionParser :: Next() 30@@ -345,10 +345,10 @@ void SectionParser :: Next()
31 stream.SetCurrentPos(current.start + current.size); 31 stream.SetCurrentPos(current.start + current.size);
32 32
33 const char tmp[] = { 33 const char tmp[] = {
34- stream.GetI1(), 34- stream.GetI1(),
35- stream.GetI1(), 35- stream.GetI1(),
36- stream.GetI1(), 36- stream.GetI1(),
37- stream.GetI1() 37- stream.GetI1()
38+ (const char)stream.GetI1(), 38+ (const char)stream.GetI1(),
39+ (const char)stream.GetI1(), 39+ (const char)stream.GetI1(),
40+ (const char)stream.GetI1(), 40+ (const char)stream.GetI1(),
41+ (const char)stream.GetI1() 41+ (const char)stream.GetI1()
42 }; 42 };
43 current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1); 43 current.id = std::string(tmp,tmp[3]?4:tmp[2]?3:tmp[1]?2:1);
44 44
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 2891470d..41b5fbc3 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -35,6 +35,6 @@ do_configure_prepend() {
35 ${S}/src/quick3d/imports/input/importsinput.pro 35 ${S}/src/quick3d/imports/input/importsinput.pro
36} 36}
37 37
38SRCREV = "440589a0747d9668fec3ff924b390d75be5c6733" 38SRCREV = "f39d0a0c32cc489849a0cd5c2880f6e824223485"
39 39
40BBCLASSEXTEND += "native nativesdk" 40BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 1cb115f3..927912fd 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2016 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.8" 5QT_MODULE_BRANCH ?= "5.9"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
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
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.8.0+git${SRCPV}" 17PV = "5.9.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 90d7896f..4b5fe8a8 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -97,34 +97,42 @@ FILES_${PN}-qmldesigner += " \
97 ${OE_QMAKE_PATH_QML}/*/*/*/designer \ 97 ${OE_QMAKE_PATH_QML}/*/*/*/designer \
98" 98"
99 99
100# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js} 100# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*.qmlc,*.js,*.jsc}
101FILES_${PN}-qmlplugins = " \ 101FILES_${PN}-qmlplugins = " \
102 ${OE_QMAKE_PATH_QML}/*.qmltypes \ 102 ${OE_QMAKE_PATH_QML}/*.qmltypes \
103 ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ 103 ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
104 ${OE_QMAKE_PATH_QML}/*/qmldir \ 104 ${OE_QMAKE_PATH_QML}/*/qmldir \
105 ${OE_QMAKE_PATH_QML}/*/*.qmltypes \ 105 ${OE_QMAKE_PATH_QML}/*/*.qmltypes \
106 ${OE_QMAKE_PATH_QML}/*/*.qml \ 106 ${OE_QMAKE_PATH_QML}/*/*.qml \
107 ${OE_QMAKE_PATH_QML}/*/*.qmlc \
107 ${OE_QMAKE_PATH_QML}/*/*.js \ 108 ${OE_QMAKE_PATH_QML}/*/*.js \
109 ${OE_QMAKE_PATH_QML}/*/*.jsc \
108 ${OE_QMAKE_PATH_QML}/*/*.png \ 110 ${OE_QMAKE_PATH_QML}/*/*.png \
109 ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \ 111 ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \
110 ${OE_QMAKE_PATH_QML}/*/*/qmldir \ 112 ${OE_QMAKE_PATH_QML}/*/*/qmldir \
111 ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \ 113 ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \
112 ${OE_QMAKE_PATH_QML}/*/*/*.qml \ 114 ${OE_QMAKE_PATH_QML}/*/*/*.qml \
115 ${OE_QMAKE_PATH_QML}/*/*/*.qmlc \
113 ${OE_QMAKE_PATH_QML}/*/*/*.js \ 116 ${OE_QMAKE_PATH_QML}/*/*/*.js \
117 ${OE_QMAKE_PATH_QML}/*/*/*.jsc \
114 ${OE_QMAKE_PATH_QML}/*/*/*.png \ 118 ${OE_QMAKE_PATH_QML}/*/*/*.png \
115 ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \ 119 ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \
116 ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \ 120 ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \
117 ${OE_QMAKE_PATH_QML}/*/*/*/images \ 121 ${OE_QMAKE_PATH_QML}/*/*/*/images \
118 ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \ 122 ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \
119 ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ 123 ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \
124 ${OE_QMAKE_PATH_QML}/*/*/*/*.qmlc \
120 ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ 125 ${OE_QMAKE_PATH_QML}/*/*/*/*.js \
126 ${OE_QMAKE_PATH_QML}/*/*/*/*.jsc \
121 ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ 127 ${OE_QMAKE_PATH_QML}/*/*/*/*.png \
122 ${OE_QMAKE_PATH_QML}/*/*/*/*.metainfo \ 128 ${OE_QMAKE_PATH_QML}/*/*/*/*.metainfo \
123 ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \ 129 ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \
124 ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \ 130 ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \
125 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \ 131 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \
126 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \ 132 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \
133 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmlc \
127 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \ 134 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \
135 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.jsc \
128 ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \ 136 ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \
129 ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \ 137 ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \
130 ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \ 138 ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index c8bf0083..84cb2b00 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -22,20 +22,18 @@ require qt5-git.inc
22# common for qtbase-native, qtbase-nativesdk and qtbase 22# common for qtbase-native, qtbase-nativesdk and qtbase
23SRC_URI += "\ 23SRC_URI += "\
24 file://0001-Add-linux-oe-g-platform.patch \ 24 file://0001-Add-linux-oe-g-platform.patch \
25 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 25 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
26 file://0003-Add-external-hostbindir-option.patch \ 26 file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
27 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 27 file://0004-configure-bump-path-length-from-256-to-512-character.patch \
28 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 28 file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \
29 file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \ 29 file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
30 file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 30 file://0007-Delete-qlonglong-and-qulonglong.patch \
31 file://0008-Delete-qlonglong-and-qulonglong.patch \ 31 file://0008-Replace-pthread_yield-with-sched_yield.patch \
32 file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \
33 file://0010-Replace-pthread_yield-with-sched_yield.patch \
34" 32"
35 33
36# common for qtbase-native and nativesdk-qtbase 34# common for qtbase-native and nativesdk-qtbase
37SRC_URI += " \ 35SRC_URI += " \
38 file://0011-Always-build-uic.patch \ 36 file://0009-Always-build-uic.patch \
39" 37"
40 38
41CLEANBROKEN = "1" 39CLEANBROKEN = "1"
@@ -109,9 +107,7 @@ do_install() {
109 done 107 done
110 fi 108 fi
111 109
112 # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) 110 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
113 # e.g. qt3d, qtwayland
114 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
115} 111}
116 112
117SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980" 113SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
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 3f373c76..28c26603 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 @@
1From 805b338154ed0262a7b8bf5c582ff5b193a55492 Mon Sep 17 00:00:00 2001 1From e13425e6f1e784b0b016cf68a54dfbae32995b86 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH] Add linux-oe-g++ platform 4Subject: [PATCH] Add linux-oe-g++ platform
@@ -30,10 +30,10 @@ 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
32diff --git a/configure b/configure 32diff --git a/configure b/configure
33index bc18e614d2..579a96d787 100755 33index 73679de621..5a0eebce50 100755
34--- a/configure 34--- a/configure
35+++ b/configure 35+++ b/configure
36@@ -1614,7 +1614,7 @@ fi 36@@ -709,7 +709,7 @@ fi
37 # is where the resulting variable is written to 37 # is where the resulting variable is written to
38 setBootstrapVariable() 38 setBootstrapVariable()
39 { 39 {
@@ -43,10 +43,10 @@ index bc18e614d2..579a96d787 100755
43 43
44 # build qmake 44 # build qmake
45diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 45diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
46index 4ca7c6ba07..5b5ac13f1d 100644 46index 934a18a924..0f5b1b6333 100644
47--- a/mkspecs/features/configure.prf 47--- a/mkspecs/features/configure.prf
48+++ b/mkspecs/features/configure.prf 48+++ b/mkspecs/features/configure.prf
49@@ -44,14 +44,14 @@ defineTest(qtCompileTest) { 49@@ -46,14 +46,14 @@ defineTest(qtCompileTest) {
50 } 50 }
51 51
52 # Clean up after previous run 52 # Clean up after previous run
@@ -64,10 +64,10 @@ index 4ca7c6ba07..5b5ac13f1d 100644
64 msg = "test $$1 succeeded" 64 msg = "test $$1 succeeded"
65 write_file($$QMAKE_CONFIG_LOG, msg, append) 65 write_file($$QMAKE_CONFIG_LOG, msg, append)
66diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 66diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
67index 999cd18154..2ac91ba519 100644 67index c00fdb73f8..0cf4de7b49 100644
68--- a/mkspecs/features/qt_functions.prf 68--- a/mkspecs/features/qt_functions.prf
69+++ b/mkspecs/features/qt_functions.prf 69+++ b/mkspecs/features/qt_functions.prf
70@@ -67,7 +67,7 @@ defineTest(qtHaveModule) { 70@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
71 defineTest(qtPrepareTool) { 71 defineTest(qtPrepareTool) {
72 cmd = $$eval(QT_TOOL.$${2}.binary) 72 cmd = $$eval(QT_TOOL.$${2}.binary)
73 isEmpty(cmd) { 73 isEmpty(cmd) {
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
index 9f1a2b2c..5ee6e049 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
@@ -1,9 +1,9 @@
1From 67977e16e5d0aecd931d8e4355c12cc907df592f Mon Sep 17 00:00:00 2001 1From 5ed152f8caa7ef00fb20d19a06ab5f7887e9aba6 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH] Add -external-hostbindir option 4Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
5 5
6* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries 6... to determine path to host binaries
7 7
8Upstream-Status: Inappropriate [OE specific] 8Upstream-Status: Inappropriate [OE specific]
9 9
diff --git a/recipes-qt/qt5/qtbase/0002-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 f9859620..7ff1ff71 100644
--- a/recipes-qt/qt5/qtbase/0002-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 @@
1From 18e2f4368f22bf5ac8b2a36c30a7ad39ed97bf49 Mon Sep 17 00:00:00 2001 1From 77fab782e8a199f9ede83bc97cbce21a544961c2 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the 4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -19,10 +19,10 @@ 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
21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
22index 27fe10a79e..29ffcda203 100644 22index b4ba0b5b2e..11d4c00f39 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@@ -164,7 +164,10 @@ void QLibrarySettings::load() 25@@ -172,7 +172,10 @@ void QLibrarySettings::load()
26 QSettings *QLibraryInfoPrivate::findConfiguration() 26 QSettings *QLibraryInfoPrivate::findConfiguration()
27 { 27 {
28 #ifdef QT_BUILD_QMAKE 28 #ifdef QT_BUILD_QMAKE
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
new file mode 100644
index 00000000..5ab6a7b1
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
@@ -0,0 +1,34 @@
1From 4848804312f0045b53c85db113ac9e42fe1b7360 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 25 Aug 2015 10:05:15 -0400
4Subject: [PATCH] configure: bump path length from 256 to 512 characters
5
6Increase the path length that gets hardcoded into generated config.cpp file
7from 256 to 512 characters, as nativesdk path can be quite long.
8
9Also update length of EXT_PREFIX and HOST_PREFIX now.
10
11Change-Id: If98dd57160efe9c98c36148cdf872f50b3d38118
12Signed-off-by: Denys Dmytriyenko <denys@ti.com>
13---
14 configure.pri | 6 +++---
15 1 file changed, 3 insertions(+), 3 deletions(-)
16
17diff --git a/configure.pri b/configure.pri
18index be1b166080..52f03bf3f2 100644
19--- a/configure.pri
20+++ b/configure.pri
21@@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) {
22 "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \
23 "" \
24 "/* Installation Info */" \
25- "static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \
26+ "static const char qt_configure_prefix_path_str [12+512] = \"qt_prfxpath=$$config.input.prefix\";" \
27 "$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \
28- "static const char qt_configure_ext_prefix_path_str [12+256] = \"qt_epfxpath=$$config.input.extprefix\";" \
29- "static const char qt_configure_host_prefix_path_str [12+256] = \"qt_hpfxpath=$$config.input.hostprefix\";" \
30+ "static const char qt_configure_ext_prefix_path_str [12+512] = \"qt_epfxpath=$$config.input.extprefix\";" \
31+ "static const char qt_configure_host_prefix_path_str [12+512] = \"qt_hpfxpath=$$config.input.hostprefix\";" \
32 "$${LITERAL_HASH}endif" \
33 "" \
34 "static const short qt_configure_str_offsets[] = {" \
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
deleted file mode 100644
index aa97b56f..00000000
--- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ /dev/null
@@ -1,106 +0,0 @@
1From fe9cfbde28c651d00b8f5fda7dc85a97af0c50a1 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9* in situation like this:
10 QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
11 QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
12 QT_INSTALL_LIBS/raw:/usr/lib
13 QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
14
15 I don't want the replacement like this:
16 sed
17 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
18 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
19 "../../lib/pkgconfig/Qt5Core.pc"
20 >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
21 because that way I'll end with -L/usr/lib in .pc file which is
22 cross-compile unfriendly, keeping ${libdir}/${includedir} works better
23 in my case
24
25* qt_module: Fix paths in .prl files
26* qmake does not prefix them with QT_SYSROOT when using them
27 so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
28 variable, which is unsafe for cross-compilation
29* writting QT_SYSROOT in .prl files is dangerous for sstate when
30 builds are in different directories, so we need
31 SSTATE_SCAN_FILES += "*.pri *.prl"
32 to make them relocateble
33
34* fix paths in packageconfig files
35 This reverts parts of:
36
37 enable path replacement in installed prl files on all platforms
38
39 Task-number: QTBUG-33794
40 Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b
41 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
42
43* to debug this, rebuild qtbase and read build/src/corelib/Makefile
44* this is example of broken install_target rule (added line feeds):
45 -$(SED) -e s,/OE/5.3.1-r0/build/lib,/usr/lib,g
46 -e 's,/OE/5.3.1-r0/build/include,$$\{includedir},g'
47 -e 's,/OE/5.3.1-r0/build/lib,$$\{libdir},g'
48 "../../lib/pkgconfig/Qt5Core.pc"
49 >"$(INSTALL_ROOT)/usr/lib/pkgconfig/Qt5Core.pc"
50 change .prf files, create copy of WORKDIR, re-excecute only
51 do_configure task and compare generated Makefile, repeat until
52 replace in generated Makefile works ok, then refresh patch and
53 try complete rebuild for qtbase
54* if everything is ok, then try:
55 image $ grep -R "\-L/usr" .
56 image $ grep -R "\-I/usr" .
57 and it should return only few cases of
58 qmake.conf:QMAKE_LFLAGS_THREAD = -L/usr/lib/threads
59 for aix* platformas
60
61Change-Id: Ie1c94b15f2a4e736b65b4d0924d99eb2a7d92a6c
62Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
63Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
64Signed-off-by: Jonathan Liu <net147@gmail.com>
65---
66 mkspecs/features/qt.prf | 13 +++++++++++++
67 mkspecs/features/qt_common.prf | 2 +-
68 2 files changed, 14 insertions(+), 1 deletion(-)
69
70diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
71index 98f794c485..bd8b7b52e4 100644
72--- a/mkspecs/features/qt.prf
73+++ b/mkspecs/features/qt.prf
74@@ -315,6 +315,19 @@ contains(TEMPLATE, .*app) {
75 QTPLUGIN = $$manualplugs $$autoplugs
76 }
77
78+contains(TEMPLATE, .*lib) {
79+ pkgconfig_prefix_replace.match = "prefix=$$[QT_SYSROOT]"
80+ pkgconfig_prefix_replace.replace = "prefix="
81+ pkgconfig_prefix_replace.CONFIG = path
82+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_prefix_replace
83+
84+ # drop -L/usr/lib in .prl files
85+ prl_replace.match = "-L\$${libdir}"
86+ prl_replace.replace = ""
87+ prl_replace.CONFIG = path
88+ QMAKE_PRL_INSTALL_REPLACE += prl_replace
89+}
90+
91 QT_PLUGIN_VERIFY = DEPLOYMENT_PLUGIN
92 qtConfig(static) {
93 QT_PLUGIN_VERIFY += QTPLUGIN
94diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
95index d30983f62b..6da07e032c 100644
96--- a/mkspecs/features/qt_common.prf
97+++ b/mkspecs/features/qt_common.prf
98@@ -37,7 +37,7 @@ contains(TEMPLATE, .*lib) {
99 lib_replace.replace =
100 } else {
101 lib_replace.match = $$rplbase/lib
102- lib_replace.replace = $$qqt_libdir
103+ lib_replace.replace = "\$$\\{libdir}"
104 }
105 lib_replace.CONFIG = path
106 QMAKE_PRL_INSTALL_REPLACE += lib_replace
diff --git a/recipes-qt/qt5/qtbase/0006-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 c2b44381..8538901f 100644
--- a/recipes-qt/qt5/qtbase/0006-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 @@
1From 8acdd69a4083080f4dd40001eee30209ec5de0b2 Mon Sep 17 00:00:00 2001 1From 6ecb404346525a92f4c8926aa285662f3f5010b3 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 24 Oct 2016 09:45:18 +0300 3Date: Mon, 24 Oct 2016 09:45:18 +0300
4Subject: [PATCH] Disable all unknown features instead of erroring out 4Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
10 1 file changed, 2 insertions(+), 1 deletion(-) 10 1 file changed, 2 insertions(+), 1 deletion(-)
11 11
12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf 12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
13index eaaa161270..fa3addae11 100644 13index 966c43108c..32f0dd0041 100644
14--- a/mkspecs/features/qt_configure.prf 14--- a/mkspecs/features/qt_configure.prf
15+++ b/mkspecs/features/qt_configure.prf 15+++ b/mkspecs/features/qt_configure.prf
16@@ -1035,7 +1035,8 @@ defineReplace(qtConfEvaluateSingleExpression) { 16@@ -1180,7 +1180,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") 17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
18 return($$result) 18 return($$result)
19 } 19 }
diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
deleted file mode 100644
index 0c0d2c73..00000000
--- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From be9179d2cbb9009794940092d30dac7800708964 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 25 Aug 2015 10:05:15 -0400
4Subject: [PATCH] configure: bump path length from 256 to 512 characters
5
6Increase the path length that gets hardcoded into generated config.cpp file
7from 256 to 512 characters, as nativesdk path can be quite long.
8
9Also update length of EXT_PREFIX and HOST_PREFIX now.
10
11Signed-off-by: Denys Dmytriyenko <denys@ti.com>
12---
13 configure | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/configure b/configure
17index 579a96d787..5af98cd77e 100755
18--- a/configure
19+++ b/configure
20@@ -1551,10 +1551,10 @@ cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
21 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20";
22
23 /* Installation Info */
24-static const char qt_configure_prefix_path_str [256 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
25+static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
26 #ifdef QT_BUILD_QMAKE
27-static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
28-static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
29+static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
30+static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
31 #endif
32
33 static const short qt_configure_str_offsets[] = {
diff --git a/recipes-qt/qt5/qtbase/0007-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 b70b0d35..253815bd 100644
--- a/recipes-qt/qt5/qtbase/0007-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 @@
1From 5316b420dc408d3a47daa3ba854a7883c911f6b9 Mon Sep 17 00:00:00 2001 1From 3730ac03a1473a0e1fdfe1537b73818ab99961e9 Mon Sep 17 00:00:00 2001
2From: Pascal Bach <pascal.bach@siemens.com> 2From: Pascal Bach <pascal.bach@siemens.com>
3Date: Wed, 11 May 2016 15:20:41 +0200 3Date: Wed, 11 May 2016 15:20:41 +0200
4Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS 4Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
30 2 files changed, 10 insertions(+) 30 2 files changed, 10 insertions(+)
31 31
32diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 32diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
33index d2358cae4b..feb73c02a5 100644 33index 4f342d67d7..202b723882 100644
34--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 34--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
35+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 35+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
36@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) 36@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
diff --git a/recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
index c992586a..68e4b201 100644
--- a/recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch
+++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
@@ -1,4 +1,4 @@
1From 2755a80114433e75f08fbb0df0fee9f7526172aa Mon Sep 17 00:00:00 2001 1From 2fa6b447302abbaf1fd710e94b92692a300baaaf Mon Sep 17 00:00:00 2001
2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> 2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
3Date: Wed, 7 Jun 2017 21:00:49 +0900 3Date: Wed, 7 Jun 2017 21:00:49 +0900
4Subject: [PATCH] Delete qlonglong and qulonglong 4Subject: [PATCH] Delete qlonglong and qulonglong
diff --git a/recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
index 5c625e08..678de529 100644
--- a/recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch
+++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
@@ -1,4 +1,4 @@
1From bbe822066913c0908b6366009517c19e828e1458 Mon Sep 17 00:00:00 2001 1From 41d7028d2239a98a76cc91939edb2cb728019d08 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 27 Jul 2017 08:02:51 -0700 3Date: Thu, 27 Jul 2017 08:02:51 -0700
4Subject: [PATCH] Replace pthread_yield with sched_yield 4Subject: [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
16diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp 16diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
17index 7d9f56ef38..bc115ef61d 100644 17index b6106e8c9e..6d6ea0b739 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 @@
@@ -36,10 +36,10 @@ index 7d9f56ef38..bc115ef61d 100644
36 QMetaType info(tp); 36 QMetaType info(tp);
37 if (!info.isValid()) { 37 if (!info.isValid()) {
38diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 38diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
39index fe1057bdde..e23e97b259 100644 39index 7340817ade..f34162a105 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@@ -75,6 +75,7 @@ 42@@ -77,6 +77,7 @@
43 #include <stdlib.h> 43 #include <stdlib.h>
44 #include <sys/stat.h> 44 #include <sys/stat.h>
45 #include <unistd.h> 45 #include <unistd.h>
@@ -47,7 +47,7 @@ index fe1057bdde..e23e97b259 100644
47 #endif 47 #endif
48 48
49 #include "private/qhostinfo_p.h" 49 #include "private/qhostinfo_p.h"
50@@ -2129,8 +2130,8 @@ public slots: 50@@ -2131,8 +2132,8 @@ public slots:
51 51
52 #if defined(Q_OS_MAC) 52 #if defined(Q_OS_MAC)
53 pthread_yield_np(); 53 pthread_yield_np();
diff --git a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
index 244cc0bc..118a4f29 100644
--- a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
@@ -1,4 +1,4 @@
1From 7c42f9b42c34d75f6c8e21e55af9b0e58f5743cc Mon Sep 17 00:00:00 2001 1From 294e4c718407e66631ce36c37258217c9adb3f83 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100 3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH] Always build uic 4Subject: [PATCH] Always build uic
@@ -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
16diff --git a/src/src.pro b/src/src.pro 16diff --git a/src/src.pro b/src/src.pro
17index 90d7e2b76c..4ca6b0bd01 100644 17index 43fc06f2e5..1e9d4dcc0d 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -188,7 +188,7 @@ qtConfig(gui) { 20@@ -203,7 +203,7 @@ qtConfig(gui) {
21 } 21 }
22 } 22 }
23 } 23 }
diff --git a/recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch b/recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch
deleted file mode 100644
index 609cd846..00000000
--- a/recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 7bab0171601bc769403be62d145164137f1b7b66 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Jul 2017 19:40:52 -0700
4Subject: [PATCH] tst_qstring: Disable Wformat-security with clang as well
5
6Currently, its only disabled for gcc, but we need to disable
7it with clang as well in order to compile it successfully with
8clang
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 tests/auto/corelib/tools/qstring/tst_qstring.cpp | 3 +++
13 1 file changed, 3 insertions(+)
14
15diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
16index a0a872710c..20a9a9f9db 100644
17--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp
18+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
19@@ -1066,6 +1066,9 @@ void tst_QString::acc_01()
20
21 QT_WARNING_PUSH
22 QT_WARNING_DISABLE_GCC("-Wformat-security")
23+#ifdef __clang__
24+QT_WARNING_DISABLE_CLANG("-Wformat-security")
25+#endif
26
27 void tst_QString::isNull()
28 {
diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
deleted file mode 100644
index c527c131..00000000
--- a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1From b8e94df3d49be69659e8dfb0809c614f73c21706 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 13 Nov 2015 12:36:11 +0100
4Subject: [PATCH] configure paths for target qmake properly
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9to use this patch in all qtbase/qtbase-native(sdk) changes ore made
10conditionally based on QT_CROSS_COMPILE
11
12Upstream-Status: Inappropriate [OE specific]
13
14Change-Id: I2b2f00c496216e98fbe14801f9e840ef5333c4b6
15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 configure | 23 +++++++++++++++++++----
19 1 file changed, 19 insertions(+), 4 deletions(-)
20
21diff --git a/configure b/configure
22index 5af98cd77e..34dedafe91 100755
23--- a/configure
24+++ b/configure
25@@ -1500,8 +1500,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then
26 fi
27 fi
28
29-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
30-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
31+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
32+ shortxspec=linux-g++
33+ shortspec=linux-g++
34+else
35+ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
36+ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
37+fi
38
39 QT_CONFIGURE_STR_OFF=0
40
41@@ -1534,7 +1539,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
42
43 QT_CONFIGURE_STR_OFFSETS=
44 QT_CONFIGURE_STRS=
45-addConfStr "$CFG_SYSROOT"
46+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
47+ addConfStr ""
48+else
49+ addConfStr "$CFG_SYSROOT"
50+fi
51 addConfStr "$QT_REL_HOST_BINS"
52 addConfStr "$QT_REL_HOST_LIBS"
53 addConfStr "$QT_REL_HOST_DATA"
54@@ -1546,6 +1555,12 @@ addConfStr "$shortspec"
55 #-------------------------------------------------------------------------------
56 [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
57
58+if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
59+ QT_TARGET_PREFIX=$QT_EXT_PREFIX
60+else
61+ QT_TARGET_PREFIX=$QT_HOST_PREFIX
62+fi
63+
64 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
65 /* Installation date */
66 static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20";
67@@ -1554,7 +1569,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
68 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
69 #ifdef QT_BUILD_QMAKE
70 static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
71-static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
72+static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_TARGET_PREFIX";
73 #endif
74
75 static const short qt_configure_str_offsets[] = {
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 550968cd..c535380b 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -17,25 +17,18 @@ LIC_FILES_CHKSUM = " \
17# common for qtbase-native, qtbase-nativesdk and qtbase 17# common for qtbase-native, qtbase-nativesdk and qtbase
18SRC_URI += "\ 18SRC_URI += "\
19 file://0001-Add-linux-oe-g-platform.patch \ 19 file://0001-Add-linux-oe-g-platform.patch \
20 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 20 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
21 file://0003-Add-external-hostbindir-option.patch \ 21 file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
22 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 22 file://0004-configure-bump-path-length-from-256-to-512-character.patch \
23 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 23 file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \
24 file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \ 24 file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
25 file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 25 file://0007-Delete-qlonglong-and-qulonglong.patch \
26 file://0008-Delete-qlonglong-and-qulonglong.patch \ 26 file://0008-Replace-pthread_yield-with-sched_yield.patch \
27 file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \
28 file://0010-Replace-pthread_yield-with-sched_yield.patch \
29 file://run-ptest \ 27 file://run-ptest \
30" 28"
31 29
32inherit ptest 30inherit ptest
33 31
34# only for target qtbase
35SRC_URI += "\
36 file://0011-configure-paths-for-target-qmake-properly.patch \
37"
38
39# LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp 32# LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp
40 33
41# for syncqt 34# for syncqt
@@ -66,7 +59,7 @@ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f
66# separate some parts of PACKAGECONFIG which are often changed 59# separate some parts of PACKAGECONFIG which are often changed
67PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" 60PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
68PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 61PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
69PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrender xinput2 glib xkb xkbcommon-evdev', '', d)}" 62PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xinput2 glib xkb xkbcommon-evdev', '', d)}"
70PACKAGECONFIG_FONTS ?= "" 63PACKAGECONFIG_FONTS ?= ""
71PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" 64PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
72PACKAGECONFIG_DISTRO ?= "" 65PACKAGECONFIG_DISTRO ?= ""
@@ -130,7 +123,6 @@ PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2"
130PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite" 123PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite"
131PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3" 124PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3"
132PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi" 125PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi"
133PACKAGECONFIG[xrender] = "-xrender,-no-xrender,libxrender"
134PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" 126PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv"
135PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" 127PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon"
136PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config" 128PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config"
@@ -228,4 +220,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
228 220
229RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 221RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
230 222
231SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980" 223SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 3ca66472..b2a07247 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "5962967a3712ee711fd9ab58da664a3eb0acb24e" 13SRCREV = "116737dc8fa244282dda95a8f13624b66fdb5521"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 1369deee..6b895aaa 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "057b3e2d6a96b42b890a0d007a8801d260c3de48" 11SRCREV = "de7f741c428febfe3c81a28f955996d2314953fc"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index de7764d8..0d13dc40 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -4,13 +4,9 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 7 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 8 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 9 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
13 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
15" 11"
16 12
@@ -23,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
23 19
24EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
25 21
26SRCREV = "1afb57ed92a25bbc000ea4c4d7662cb8b9e267ee" 22SRCREV = "8dcbf68e4579e03ea6d2808ac0c670169b59d0df"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 7d6a51fc..0cbd04e6 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "a78f8d6bef57dd4283094a52551705ee02909970" 11SRCREV = "84490ff75be5acdaeb3fd93900e4ebf7ba8f539b"
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch b/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch
deleted file mode 100644
index 423681ee..00000000
--- a/recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 80e63c5a2981473dd7ee3a4f382e54948bb99f75 Mon Sep 17 00:00:00 2001
2From: Gunnar Sletta <gunnar@crimson.no>
3Date: Thu, 19 Jan 2017 09:05:46 +0100
4Subject: [PATCH 2/3] Fix memory leak in V4
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Transitions contain both an id and a set of flags, but the sorting
10failed to take the flags into account in the operator<. As a result
11we would some times end up with duplicate entries if the same id
12was added multiple times with different flags.
13
14If the same id was added again and again with varying flags, this
15could lead to an ever expanding list filled with duplicate entries.
16
17Fix this by also taking flags into account in operator< so that
18operator< and operator== are symetric and the list gets correctly
19sorted.
20
21Change-Id: I762ec3f0c5b4ed9a1aecb9a883187a0445491591
22Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
23Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
24Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
25---
26 src/qml/jsruntime/qv4internalclass_p.h | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29diff --git a/src/qml/jsruntime/qv4internalclass_p.h b/src/qml/jsruntime/qv4internalclass_p.h
30index dcda949..1d8ef4b 100644
31--- a/src/qml/jsruntime/qv4internalclass_p.h
32+++ b/src/qml/jsruntime/qv4internalclass_p.h
33@@ -234,7 +234,7 @@ struct InternalClassTransition
34 { return id == other.id && flags == other.flags; }
35
36 bool operator<(const InternalClassTransition &other) const
37- { return id < other.id; }
38+ { return id < other.id || (id == other.id && flags < other.flags); }
39 };
40
41 struct InternalClass : public QQmlJS::Managed {
42--
432.9.3
44
diff --git a/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch b/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch
deleted file mode 100644
index 79a48f54..00000000
--- a/recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch
+++ /dev/null
@@ -1,84 +0,0 @@
1From 6aa9001064c19e75e58c830eedc583e2342a7f20 Mon Sep 17 00:00:00 2001
2From: Shawn Rutledge <shawn.rutledge@qt.io>
3Date: Wed, 1 Feb 2017 12:06:26 +0100
4Subject: [PATCH 3/3] fix memory leak in
5 QQuickWindowPrivate::deliverTouchAsMouse
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10A QTouchEvent is allocated with a reduced subset of TouchPoints for
11each Item to which we attempt to deliver it, and thrown away afterwards.
12(Ιt's not efficient to heap-allocate it, but we can't avoid doing it
13at all without changing behavior.) So now it's stored in a QScopedPointer.
14
15Change-Id: I48badb493610d0a715e582a2eedae95e2006eb2b
16Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
17Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
18---
19 src/quick/items/qquickwindow.cpp | 14 +++++++-------
20 1 file changed, 7 insertions(+), 7 deletions(-)
21
22diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
23index 1297dde..c130aec 100644
24--- a/src/quick/items/qquickwindow.cpp
25+++ b/src/quick/items/qquickwindow.cpp
26@@ -629,8 +629,8 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
27
28 // FIXME: make this work for mouse events too and get rid of the asTouchEvent in here.
29 Q_ASSERT(pointerEvent->asPointerTouchEvent());
30- QTouchEvent *event = pointerEvent->asPointerTouchEvent()->touchEventForItem(item);
31- if (!event)
32+ QScopedPointer<QTouchEvent> event(pointerEvent->asPointerTouchEvent()->touchEventForItem(item));
33+ if (event.isNull())
34 return false;
35
36 // For each point, check if it is accepted, if not, try the next point.
37@@ -647,7 +647,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
38 break;
39
40 qCDebug(DBG_TOUCH_TARGET) << "TP (mouse)" << p.id() << "->" << item;
41- QScopedPointer<QMouseEvent> mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event, item, false));
42+ QScopedPointer<QMouseEvent> mousePress(touchToMouseEvent(QEvent::MouseButtonPress, p, event.data(), item, false));
43
44 // Send a single press and see if that's accepted
45 QCoreApplication::sendEvent(item, mousePress.data());
46@@ -661,7 +661,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
47 pointerEventPoint->setGrabber(item);
48
49 if (checkIfDoubleClicked(event->timestamp())) {
50- QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event, item, false));
51+ QScopedPointer<QMouseEvent> mouseDoubleClick(touchToMouseEvent(QEvent::MouseButtonDblClick, p, event.data(), item, false));
52 QCoreApplication::sendEvent(item, mouseDoubleClick.data());
53 event->setAccepted(mouseDoubleClick->isAccepted());
54 if (!mouseDoubleClick->isAccepted()) {
55@@ -678,7 +678,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
56 } else if (touchMouseDevice == device && p.id() == touchMouseId) {
57 if (p.state() & Qt::TouchPointMoved) {
58 if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) {
59- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event, mouseGrabberItem, false));
60+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), mouseGrabberItem, false));
61 QCoreApplication::sendEvent(item, me.data());
62 event->setAccepted(me->isAccepted());
63 if (me->isAccepted()) {
64@@ -689,7 +689,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
65 // no grabber, check if we care about mouse hover
66 // FIXME: this should only happen once, not recursively... I'll ignore it just ignore hover now.
67 // hover for touch???
68- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event, item, false));
69+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseMove, p, event.data(), item, false));
70 if (lastMousePosition.isNull())
71 lastMousePosition = me->windowPos();
72 QPointF last = lastMousePosition;
73@@ -707,7 +707,7 @@ bool QQuickWindowPrivate::deliverTouchAsMouse(QQuickItem *item, QQuickPointerEve
74 } else if (p.state() & Qt::TouchPointReleased) {
75 // currently handled point was released
76 if (QQuickItem *mouseGrabberItem = q->mouseGrabberItem()) {
77- QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event, mouseGrabberItem, false));
78+ QScopedPointer<QMouseEvent> me(touchToMouseEvent(QEvent::MouseButtonRelease, p, event.data(), mouseGrabberItem, false));
79 QCoreApplication::sendEvent(item, me.data());
80
81 if (item->acceptHoverEvents() && p.screenPos() != QGuiApplicationPrivate::lastCursorPosition) {
82--
832.9.3
84
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 34a8897d..2194d33a 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -5,20 +5,14 @@ require qt5-ptest.inc
5LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 5LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
6LIC_FILES_CHKSUM = " \ 6LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 7 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
8 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
10 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 8 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
11 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 9 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
12 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 10 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
16" 12"
17 13
18SRC_URI += " \ 14SRC_URI += " \
19 file://0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch \ 15 file://0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch \
20 file://0002-Fix-memory-leak-in-V4.patch \
21 file://0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch \
22" 16"
23 17
24DEPENDS += "qtbase" 18DEPENDS += "qtbase"
@@ -39,6 +33,6 @@ do_install_append_class-nativesdk() {
39 33
40EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 34EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
41 35
42SRCREV = "fffb997e192a72b4dcd66edc2fbad5473dd359f3" 36SRCREV = "96f6ba5f562073f508cd8569ac354592fdd48f4a"
43 37
44BBCLASSEXTEND =+ "native nativesdk" 38BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 2f32a884..8b4fb714 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -15,8 +15,3 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
15QT_MODULE_BRANCH = "dev" 15QT_MODULE_BRANCH = "dev"
16SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" 16SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d"
17 17
18do_install_append() {
19 if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then
20 sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Enginio.pc
21 fi
22}
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 6abf8b77..94f04a49 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
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16 16
17SRCREV = "13bbe6ea378d127b9b1d70e2858e41e86e754dc7" 17SRCREV = "ef8850fee38e2552d535379a8477c9abebdf8bb4"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index eadd4bc3..edb150e3 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -19,8 +19,8 @@ DEPENDS += "qtdeclarative"
19 19
20RDEPENDS_${PN}-dev = "" 20RDEPENDS_${PN}-dev = ""
21 21
22SRCREV = "1583bb5569cfc50141d879107a46146d5ccccf28"
23
24# The same issue as in qtbase: 22# The same issue as in qtbase:
25# http://errors.yoctoproject.org/Errors/Build/44912/ 23# http://errors.yoctoproject.org/Errors/Build/44912/
26LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 24LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
25
26SRCREV = "db93af5b2bb49af74fbad6c9cd80bd7010434e78"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 3725441c..4dd64df2 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
27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
28 28
29SRCREV = "cd2de115c6216ad747cf4803e65a4ce4af220795" 29SRCREV = "71ccf0dff82835ce7b5aed74c37829afdef44cde"
diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
new file mode 100644
index 00000000..49fcff6b
--- /dev/null
+++ b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
@@ -0,0 +1,27 @@
1From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 7 Jun 2017 13:29:29 +0300
4Subject: [PATCH] Make mapbox-gl build configurable
5
6mapbox-gl-native won't compile for ARMv5 or older, so disable the
7build by default.
8
9Task-number: QTBUG-61289
10Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b
11---
12 src/plugins/geoservices/geoservices.pro | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
16index 0810d39..03fc119 100644
17--- a/src/plugins/geoservices/geoservices.pro
18+++ b/src/plugins/geoservices/geoservices.pro
19@@ -6,7 +6,7 @@ qtConfig(concurrent) {
20 SUBDIRS += osm
21 }
22
23-qtConfig(c++14):!win32|mingw:!qnx {
24+mapboxgl:qtConfig(c++14):!win32|mingw:!qnx {
25 !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
26 warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
27 } else {
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index ab96029e..7d434a4b 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -13,15 +13,26 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
15 15
16SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch"
17
16PACKAGECONFIG ??= "" 18PACKAGECONFIG ??= ""
17# older geoclue 0.12.99 is needed 19# older geoclue 0.12.99 is needed
18PACKAGECONFIG[geoclue] = ",,geoclue" 20PACKAGECONFIG[geoclue] = ",,geoclue"
19PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" 21PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy"
22PACKAGECONFIG[mapboxgl] = ""
20 23
24EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'mapboxgl', 'CONFIG+=mapboxgl', '', d)}"
21EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 25EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
22 26
23SRCREV = "41cc347040226d2c5c16b9df001d03f2724b87e5"
24
25# The same issue as in qtbase: 27# The same issue as in qtbase:
26# http://errors.yoctoproject.org/Errors/Details/152640/ 28# http://errors.yoctoproject.org/Errors/Details/152640/
27LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 29LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
30
31SRC_URI += " \
32 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
33"
34
35SRCREV_qtlocation = "888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f"
36SRCREV_qtlocation-mapboxgl = "d45c177e8a23eefcc94930af9fa085e61136bb94"
37
38SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index aa79e3f0..19966183 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -4,13 +4,9 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 7 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 8 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 9 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
13 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
15" 11"
16 12
@@ -33,8 +29,8 @@ SRC_URI += "\
33 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ 29 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
34" 30"
35 31
36SRCREV = "544a8a4251ff9694780e563ddb6e4af1325e0115"
37
38# The same issue as in qtbase: 32# The same issue as in qtbase:
39# http://errors.yoctoproject.org/Errors/Build/44914/ 33# http://errors.yoctoproject.org/Errors/Build/44914/
40LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 34LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
35
36SRCREV = "559c305ded730e23505e8b29536a98dc59e2acfa"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 5657c869..eb5e4f61 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -1,7 +1,6 @@
1LICENSE = "BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" 1LICENSE = "BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
2LIC_FILES_CHKSUM = " \ 2LIC_FILES_CHKSUM = " \
3 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 3 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
4 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
5 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 4 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
6" 5"
7 6
@@ -10,4 +9,4 @@ require qt5-git.inc
10 9
11DEPENDS += "qtbase" 10DEPENDS += "qtbase"
12 11
13SRCREV = "ec7663382bc6382323f3261ab199ec2edbeb5e37" 12SRCREV = "86c5036848ad004208803d9d497cfcd08c9623d6"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index d41b8382..1f680e62 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -24,4 +24,4 @@ do_configure_prepend() {
24} 24}
25 25
26QT_MODULE_BRANCH = "dev" 26QT_MODULE_BRANCH = "dev"
27SRCREV = "64faeb0d8003e699a4d09e7dcee1ef6eb10302ad" 27SRCREV = "695460401d9a89d2f156016d51601b2e59b64105"
diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch b/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch
deleted file mode 100644
index d08c57e9..00000000
--- a/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 3696a416bd594d3f280c281cb2a66bc837829238 Mon Sep 17 00:00:00 2001
2From: Steffen Sledz <sledz@dresearch-fe.de>
3Date: Thu, 6 Jul 2017 13:28:07 +0200
4Subject: [PATCH] qtquickcontrols2: fix compilation of examples/texteditor
5
6git/examples/quickcontrols2/texteditor/documenthandler.cpp:284:18: error: invalid use of incomplete type 'class QDebug'
7 qWarning() << "load() called before DocumentHandler has QQmlEngine";
8
9Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
10---
11 examples/quickcontrols2/texteditor/documenthandler.cpp | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/examples/quickcontrols2/texteditor/documenthandler.cpp b/examples/quickcontrols2/texteditor/documenthandler.cpp
15index e57946fd..94ca82ad 100644
16--- a/examples/quickcontrols2/texteditor/documenthandler.cpp
17+++ b/examples/quickcontrols2/texteditor/documenthandler.cpp
18@@ -59,6 +59,7 @@
19 #include <QTextCharFormat>
20 #include <QTextCodec>
21 #include <QTextDocument>
22+#include <QtCore/QDebug>
23
24 DocumentHandler::DocumentHandler(QObject *parent)
25 : QObject(parent)
26--
272.13.2
28
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 371f4aef..a84cfb32 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -4,14 +4,10 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" 4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
7 file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \ 7 file://LICENSE.LGPLv3;md5=382747d0119037529ec2b98b24038eb0 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 8 file://LICENSE.GPLv3;md5=dce746aa5261707df6d6999ab9958d8b \
9" 9"
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRC_URI += " \ 13SRCREV = "ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3"
14 file://0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch \
15"
16
17SRCREV = "6f7852a307c7ebbdb3b6efa00cbf7626b072bbc1"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 69f3d3ba..83ed908d 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,8 +17,13 @@ DEPENDS += "qtdeclarative"
17 17
18RDEPENDS_${PN}-dev = "" 18RDEPENDS_${PN}-dev = ""
19 19
20FILES_${PN}-qmlplugins += " \
21 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \
22 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
23"
24
20SRC_URI += " \ 25SRC_URI += " \
21 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 26 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
22" 27"
23 28
24SRCREV = "201c86391c7ff78d570fdec6e0c0b71eb1e9aae4" 29SRCREV = "dacb91916b202208681471ba764504c7c7d086f0"
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
new file mode 100644
index 00000000..dfebc184
--- /dev/null
+++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch
@@ -0,0 +1,37 @@
1From dd9d1e5ecdcd8267215523ad08ea893656a7f42d Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 7 Jun 2017 15:17:12 +0300
4Subject: [PATCH] Allow a tools-only build
5
6Change-Id: I3b33fc1c8877fc82568bd386b063e7a0aa57b706
7---
8 mkspecs/features/repccommon.pri | 2 +-
9 qtremoteobjects.pro | 5 +++++
10 2 files changed, 6 insertions(+), 1 deletion(-)
11
12diff --git a/mkspecs/features/repccommon.pri b/mkspecs/features/repccommon.pri
13index 5e88bf8..6efd19e 100644
14--- a/mkspecs/features/repccommon.pri
15+++ b/mkspecs/features/repccommon.pri
16@@ -3,7 +3,7 @@ cmd = $${QT.remoteobjects.bins}/repc
17 contains(QMAKE_HOST.os, Windows) {
18 cmd = $$system_path($${cmd}.exe)
19 }
20-exists($$cmd): QT_TOOL.repc.binary = $$cmd
21+false:exists($$cmd): QT_TOOL.repc.binary = $$cmd
22
23 # qtPrepareTool honors QT_TOOL.repc.binary if set
24 qtPrepareTool(QMAKE_REPC, repc)
25diff --git a/qtremoteobjects.pro b/qtremoteobjects.pro
26index c2e2b6b..93c2bb5 100644
27--- a/qtremoteobjects.pro
28+++ b/qtremoteobjects.pro
29@@ -2,3 +2,8 @@ CONFIG += examples_need_tools tests_need_tools
30 load(qt_parts)
31
32 SUBDIRS += mkspecs
33+
34+tools-only {
35+ sub_tools.depends -= sub_src
36+ SUBDIRS = sub_tools
37+}
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
new file mode 100644
index 00000000..f563818d
--- /dev/null
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -0,0 +1,27 @@
1LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
2LIC_FILES_CHKSUM = " \
3 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
4 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
5 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7"
8
9require qt5.inc
10require qt5-git.inc
11
12DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
13
14SRC_URI += " \
15 file://0001-Allow-a-tools-only-build.patch \
16"
17
18PACKAGECONFIG ??= ""
19PACKAGECONFIG_class-native ??= "tools-only"
20PACKAGECONFIG_class-nativesdk ??= "tools-only"
21PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
22
23EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
24
25SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f"
26
27BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 2875988e..e7acafe5 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -25,8 +25,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
25 25
26DEPENDS += "qtbase" 26DEPENDS += "qtbase"
27 27
28SRCREV = "c35df2ec0ee05351912e768d298a7c627dbdd1ef"
29
30# The same issue as in qtbase: 28# The same issue as in qtbase:
31# http://errors.yoctoproject.org/Errors/Build/44915/ 29# http://errors.yoctoproject.org/Errors/Build/44915/
32LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 30LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
31
32SRCREV = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index d69d00fe..c2c00e1b 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "4704292500b98143eee9b0fb0b6a34a858ed1253" 13SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1"
14 14
15SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" 15SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
16 16
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 93a09719..17d06394 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase qtdeclarative" 14DEPENDS += "qtbase qtdeclarative"
15 15
16SRCREV = "1220a31e6c2f91b34b4a05773621dddab8c4315a" 16SRCREV = "0c3c4d01ea34ed98a0d2928662f07b673f00535d"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 325d9754..93a826bd 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "c8fe92ef54b2d310e8c8c143962fd6f43bf46c27" 14SRCREV = "20811e3b004af817e3f02982c755e8b1560b8c3d"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index edecc041..957000c4 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "74aad2578ecb6739007449a06a54dd7abd64c85b" 18SRCREV = "687f5a9bd44a45a29d24925f29470c43d6729dee"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 24a0d911..fb8d44e1 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "1b3a7ae14d25f1caa3f6bedad3cfeb7d83b3904e" 15SRCREV = "4fd787e90c70afbaa168abb3efdb8757ba77f3a4"
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
deleted file mode 100644
index 17d5d514..00000000
--- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 95a418157ce5f49052ec1c349581d1811a79c9eb Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 17 Jan 2014 14:33:19 +0100
4Subject: [PATCH] assistant/help: fix linking of dependent libraries
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9else we get:
10| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link)
11| ...undefined reference to `QCLucenePhraseQuery::getTerms() const'
12
13Upstream-Status: Inappropriate [configuration]
14
15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16---
17 src/assistant/help/help.pro | 2 ++
18 1 file changed, 2 insertions(+)
19
20diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
21index 37d5ba4..8de8763 100644
22--- a/src/assistant/help/help.pro
23+++ b/src/assistant/help/help.pro
24@@ -60,3 +60,5 @@ HEADERS += qhelpsearchindexwriter_clucene_p.h \
25 qhelpsearchindexreader_clucene_p.h
26
27 load(qt_module)
28+
29+LIBS += -lQt5CLucene
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 5c0f51cc..9ca90a2c 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -4,13 +4,9 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \
8 file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 7 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 8 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 9 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv3;md5=bfdd8aa675169432d6d9b63d056de148 \
13 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
15" 11"
16 12
@@ -20,8 +16,6 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
20 16
21SRC_URI += " \ 17SRC_URI += " \
22 file://run-ptest \ 18 file://run-ptest \
23 file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
24 file://0003-add-noqtwebkit-configuration.patch \
25 file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \ 19 file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \
26" 20"
27 21
@@ -33,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
33 27
34EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
35 29
36SRCREV = "30c10900adecca55faa1d59c2f0caac74b1f9df6" 30SRCREV = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9"
37 31
38BBCLASSEXTEND = "native nativesdk" 32BBCLASSEXTEND = "native nativesdk"
39 33
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 53ab1996..822517f6 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \
114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
115" 115"
116 116
117SRCREV = "c0ae29b2328922f16cb2305f8579c2a869c871b0" 117SRCREV = "3e727a890f7856978469ee38ef0619b1b59a8ca7"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 244e529d..2b865bbb 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -50,4 +50,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
50 50
51DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 51DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
52 52
53SRCREV = "cfa4ab4cbf13971d4b71ee920353822755a3bf31" 53SRCREV = "bdf61afe76e94ef03da1332c4540646f18f5852f"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index ffe22086..91c7230a 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -7,13 +7,9 @@ DEPENDS_append_class-target = " libxkbcommon"
7LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 7LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
8LIC_FILES_CHKSUM = " \ 8LIC_FILES_CHKSUM = " \
9 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 9 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
10 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
11 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
12 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 10 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
13 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 11 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
14 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 12 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
15 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
16 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
17 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
18" 14"
19 15
@@ -41,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
41 37
42EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
43 39
44SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e" 40SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b"
45 41
46# From https://bugreports.qt.io/browse/QTBUG-57767 42# From https://bugreports.qt.io/browse/QTBUG-57767
47SRC_URI += " \ 43SRC_URI += " \
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index d5f86850..f1167a9e 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = " \
17 17
18DEPENDS += "qtdeclarative qtwebsockets" 18DEPENDS += "qtdeclarative qtwebsockets"
19 19
20SRCREV = "e3ddde4b26a72d57beeeed4e2d3384896e3a399d" 20SRCREV = "6383f0fc5eec4935697a6d2d2f87b511bbeb678e"
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
index 587b632f..44c3f0b2 100644
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
@@ -1,4 +1,4 @@
1From 79a62dbe498946f487edcb0228c350d9fe7e4d09 Mon Sep 17 00:00:00 2001 1From 1634633d27cea7369111c9ea6d08be8515c15ccd Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 12:46:58 -0200 3Date: Thu, 24 Dec 2015 12:46:58 -0200
4Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX 4Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
deleted file mode 100644
index 560a0277..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From d70a7ccba09ba96e0068ad253b3aac7a47125f8e Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 3 Oct 2014 03:52:11 +0200
4Subject: [PATCH] chromium base.gypi: include atomicops_internals_x86_gcc.cc
5 when building for x64 arch
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 chromium/base/base.gypi | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi
13index a4da596070..13173d621e 100644
14--- a/chromium/base/base.gypi
15+++ b/chromium/base/base.gypi
16@@ -845,7 +845,7 @@
17 ['include', '^nix/'],
18 ],
19 }],
20- ['use_qt==1 and target_arch=="ia32"', {
21+ ['use_qt==1 and target_arch=="ia32" or target_arch=="x64"', {
22 'sources/': [
23 ['include', 'atomicops_internals_x86_gcc.cc'],
24 ],
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
deleted file mode 100644
index 3d8b3b0f..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 2f3a16a0efaf02521425da2db7d88710da3074b4 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 30 Jun 2014 20:08:17 +0200
4Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
5 anywhere in path, but at the end
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 tools/qmake/mkspecs/features/functions.prf | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
13index 236ee8ac..0333bdd1 100644
14--- a/tools/qmake/mkspecs/features/functions.prf
15+++ b/tools/qmake/mkspecs/features/functions.prf
16@@ -319,9 +319,9 @@ defineReplace(mocOutput) {
17 out = $$1
18 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
19 for(ext, $$list($${QMAKE_EXT_CPP})): \
20- out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
21+ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
22 for(ext, $$list($${QMAKE_EXT_H})): \
23- out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
24+ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
25 return($$out)
26 }
27
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
index a4601780..a91a2982 100644
--- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
1From 5ff09196304a38304893e0703a8a7d2df2ec889a Mon Sep 17 00:00:00 2001 1From 491576d7e67d00b93106592140e5d7f0f34ea641 Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de> 2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000 3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform 4Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
@@ -8,14 +8,14 @@ Upstream-Status: Inappropriate [OE specific]
8Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de> 8Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de>
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10--- 10---
11 tools/qmake/mkspecs/features/functions.prf | 6 ++++++ 11 mkspecs/features/functions.prf | 6 ++++++
12 1 file changed, 6 insertions(+) 12 1 file changed, 6 insertions(+)
13 13
14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 14diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
15index 687d34f8..5c0c40fd 100644 15index eb421f8b..4513742d 100644
16--- a/tools/qmake/mkspecs/features/functions.prf 16--- a/mkspecs/features/functions.prf
17+++ b/tools/qmake/mkspecs/features/functions.prf 17+++ b/mkspecs/features/functions.prf
18@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) { 18@@ -33,6 +33,12 @@ defineTest(isPlatformSupported) {
19 return(false) 19 return(false)
20 } 20 }
21 gcc:!clang:!isGCCVersionSupported(): return(false) 21 gcc:!clang:!isGCCVersionSupported(): return(false)
diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
index 40015637..d5567c35 100644
--- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
@@ -1,4 +1,4 @@
1From 0e1143af443c80cd49663b55128ab4dd8e570ee1 Mon Sep 17 00:00:00 2001 1From 6b48d76b5af38a49f8e438e45c387f01b263e483 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Fri, 25 Dec 2015 18:16:05 -0200 3Date: Fri, 25 Dec 2015 18:16:05 -0200
4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor 4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
9 1 file changed, 2 insertions(+) 9 1 file changed, 2 insertions(+)
10 10
11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h 11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
12index d692140e..58528114 100644 12index 2ecd70d7..703d1a92 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@@ -59,6 +59,8 @@
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
new file mode 100644
index 00000000..5f9eb3a7
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
@@ -0,0 +1,40 @@
1From b1a6f73d49a340e99145a4c4cf70dc796ed632ff Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] chromium: Force host toolchain configuration
5
6Force gcc/g++ to be used for parts using host toolchain, since
7the option(host_build) does not work in yocto builds.
8
9Upstream-Status: Inappropriate [OE specific]
10Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 chromium/tools/gn/bootstrap/bootstrap.py | 12 ++++++------
14 1 file changed, 6 insertions(+), 6 deletions(-)
15
16diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py
17index 43d252b43e..e58347848e 100755
18--- a/chromium/tools/gn/bootstrap/bootstrap.py
19+++ b/chromium/tools/gn/bootstrap/bootstrap.py
20@@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options):
21 ld = os.environ.get('LD', 'link.exe')
22 ar = os.environ.get('AR', 'lib.exe')
23 else:
24- cc = os.environ.get('CC', 'cc')
25- cxx = os.environ.get('CXX', 'c++')
26+ cc = os.environ.get('CC_host', 'gcc')
27+ cxx = os.environ.get('CXX_host', 'g++')
28 ld = cxx
29- ar = os.environ.get('AR', 'ar')
30+ ar = os.environ.get('AR_host', 'ar')
31
32- cflags = os.environ.get('CFLAGS', '').split()
33- cflags_cc = os.environ.get('CXXFLAGS', '').split()
34- ldflags = os.environ.get('LDFLAGS', '').split()
35+ cflags = os.environ.get('CFLAGS_host', '').split()
36+ cflags_cc = os.environ.get('CXXFLAGS_host', '').split()
37+ ldflags = os.environ.get('LDFLAGS_host', '').split()
38 include_dirs = [root_gen_dir, SRC_ROOT]
39 libs = []
40
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
deleted file mode 100644
index 93e68b51..00000000
--- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From bf7f70ae0bf7345c2546f4f4bc371a9e8eeb0bd3 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH] functions.prf: Make sure we only use the file name to
5 generate it's moc'ed abbreviation
6
7Signed-off-by: Simon Busch <morphis@gravedo.de>
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 tools/qmake/mkspecs/features/functions.prf | 3 ++-
11 1 file changed, 2 insertions(+), 1 deletion(-)
12
13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
14index 0333bdd1..687d34f8 100644
15--- a/tools/qmake/mkspecs/features/functions.prf
16+++ b/tools/qmake/mkspecs/features/functions.prf
17@@ -316,7 +316,8 @@ defineReplace(findIncludedMocFiles) {
18 }
19
20 defineReplace(mocOutput) {
21- out = $$1
22+ in = $$1
23+ out = $$basename(in)
24 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
25 for(ext, $$list($${QMAKE_EXT_CPP})): \
26 out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
index 196ef4c2..2fa1764d 100644
--- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
@@ -1,4 +1,4 @@
1From d8fd8c8388c54a0322e60e8be49236df3862ec56 Mon Sep 17 00:00:00 2001 1From 95a6e3fd9e8498cb1f59120d402ec8ecfcd3ec59 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200 3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH] Include dependency to QCoreApplication::translate() 4Subject: [PATCH] Include dependency to QCoreApplication::translate()
@@ -9,12 +9,12 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
9 1 file changed, 2 insertions(+) 9 1 file changed, 2 insertions(+)
10 10
11diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h 11diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
12index b21d40b8..758d5335 100644 12index c378c327..1d33d956 100644
13--- a/src/core/media_capture_devices_dispatcher.h 13--- a/src/core/media_capture_devices_dispatcher.h
14+++ b/src/core/media_capture_devices_dispatcher.h 14+++ b/src/core/media_capture_devices_dispatcher.h
15@@ -46,6 +46,8 @@ 15@@ -45,6 +45,8 @@
16 #include <list>
16 #include <map> 17 #include <map>
17 #include <QtCore/qcompilerdetection.h>
18 18
19+#include <QCoreApplication> 19+#include <QCoreApplication>
20+ 20+
diff --git a/recipes-qt/qt5/qtwebengine/0005-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 b1a08571..8785842a 100644
--- a/recipes-qt/qt5/qtwebengine/0005-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 @@
1From fac50c58630264d67e447c2dcdcf54b4f806d35e Mon Sep 17 00:00:00 2001 1From 8910e65fd777120261f16c4a35ace2b0dc6181b3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:01:12 -0700 3Date: Fri, 7 Jul 2017 14:01:12 -0700
4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not 4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch
deleted file mode 100644
index f2456dd6..00000000
--- a/recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch
+++ /dev/null
@@ -1,131 +0,0 @@
1From 944746d5d04ea8eaf268a97440c98136beae1e47 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 11 Jul 2017 10:15:41 +0200
4Subject: [PATCH] chromium: v8 fix build with gcc7
5
6Use the fix from nodejs:
7https://github.com/nodejs/node/commit/2a2a5565c298639b823250b571101f51210c50e8
8
9* fixes:
10| ../../git/src/v8/src/objects-body-descriptors.h: In static member function 'static void v8::internal::FixedBodyDescriptor<start_offset, end_offset, size>::IterateBody(v8::internal::HeapObject*, int)':
11| ../../git/src/v8/src/objects-body-descriptors.h:102:20: error: no matching function for call to 'v8::internal::FixedBodyDescriptor<start_offset, end_offset, size>::IterateBody(v8::internal::HeapObject*&)'
12| IterateBody(obj);
13| ^
14
15and
16
17| ../../v8/src/objects.h: In member function 'uint32_t v8::internal::HashTable<Derived, Shape, Key>::Hash(Key)':
18| ../../v8/src/objects.h:3205:46: error: invalid use of incomplete type 'class v8::internal::Heap' [-Werror]
19| return Shape::SeededHash(key, GetHeap()->HashSeed());
20| ^~
21
22and
23
24../../v8/src/heap/mark-compact.cc:3660:43: error: 'v8::internal::PointerUpdateJobTraits<direction>::UpdateTypedPointers(v8::internal::Heap*, v8::internal::MemoryChunk*)::<lambda(v8::internal::SlotType, v8::internal::Address, v8::internal::Address)> [with v8::internal::PointerDirection direction = (v8::internal::PointerDirection)1; v8::internal::Address = unsigned char*; v8::internal::byte = unsigned char]::<lambda(v8::internal::Object**)>' declared with greater visibility than the type of its field 'v8::internal::PointerUpdateJobTraits<direction>::UpdateTypedPointers(v8::internal::Heap*, v8::internal::MemoryChunk*)::<lambda(v8::internal::SlotType, v8::internal::Address, v8::internal::Address)> [with v8::internal::PointerDirection direction = (v8::internal::PointerDirection)1; v8::internal::Address = unsigned char*; v8::internal::byte = unsigned char]::<lambda(v8::internal::Object**)>::<heap capture>' [-Werror=attributes]
25
26Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
27---
28 chromium/v8/src/heap/mark-compact.cc | 5 +++++
29 chromium/v8/src/objects-body-descriptors.h | 2 +-
30 chromium/v8/src/objects-inl.h | 20 ++++++++++++++++++++
31 chromium/v8/src/objects.h | 20 ++++----------------
32 4 files changed, 30 insertions(+), 17 deletions(-)
33
34diff --git a/chromium/v8/src/heap/mark-compact.cc b/chromium/v8/src/heap/mark-compact.cc
35index f9a55dfc61..da46270aec 100644
36--- a/chromium/v8/src/heap/mark-compact.cc
37+++ b/chromium/v8/src/heap/mark-compact.cc
38@@ -3614,6 +3614,9 @@ void MarkCompactCollector::EvacuateNewSpaceAndCandidates() {
39 #endif
40 }
41
42+#pragma GCC diagnostic push
43+#pragma GCC diagnostic warning "-Wattributes"
44+
45 template <PointerDirection direction>
46 class PointerUpdateJobTraits {
47 public:
48@@ -3701,6 +3704,8 @@ class PointerUpdateJobTraits {
49 }
50 };
51
52+#pragma GCC diagnostic pop
53+
54 int NumberOfPointerUpdateTasks(int pages) {
55 if (!FLAG_parallel_pointer_update) return 1;
56 const int kMaxTasks = 4;
57diff --git a/chromium/v8/src/objects-body-descriptors.h b/chromium/v8/src/objects-body-descriptors.h
58index 91cb8883be..a1c3634bd7 100644
59--- a/chromium/v8/src/objects-body-descriptors.h
60+++ b/chromium/v8/src/objects-body-descriptors.h
61@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase {
62
63 template <typename StaticVisitor>
64 static inline void IterateBody(HeapObject* obj, int object_size) {
65- IterateBody(obj);
66+ IterateBody<StaticVisitor>(obj);
67 }
68 };
69
70diff --git a/chromium/v8/src/objects-inl.h b/chromium/v8/src/objects-inl.h
71index 58441d3853..e850fd787f 100644
72--- a/chromium/v8/src/objects-inl.h
73+++ b/chromium/v8/src/objects-inl.h
74@@ -38,6 +38,26 @@
75 namespace v8 {
76 namespace internal {
77
78+template <typename Derived, typename Shape, typename Key>
79+uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) {
80+ if (Shape::UsesSeed) {
81+ return Shape::SeededHash(key, GetHeap()->HashSeed());
82+ } else {
83+ return Shape::Hash(key);
84+ }
85+}
86+
87+
88+template <typename Derived, typename Shape, typename Key>
89+uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key,
90+ Object* object) {
91+ if (Shape::UsesSeed) {
92+ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
93+ } else {
94+ return Shape::HashForObject(key, object);
95+ }
96+}
97+
98 PropertyDetails::PropertyDetails(Smi* smi) {
99 value_ = smi->value();
100 }
101diff --git a/chromium/v8/src/objects.h b/chromium/v8/src/objects.h
102index 7d774beb5b..eda1478766 100644
103--- a/chromium/v8/src/objects.h
104+++ b/chromium/v8/src/objects.h
105@@ -3193,22 +3193,10 @@ class HashTable : public HashTableBase {
106 public:
107 typedef Shape ShapeT;
108
109- // Wrapper methods
110- inline uint32_t Hash(Key key) {
111- if (Shape::UsesSeed) {
112- return Shape::SeededHash(key, GetHeap()->HashSeed());
113- } else {
114- return Shape::Hash(key);
115- }
116- }
117-
118- inline uint32_t HashForObject(Key key, Object* object) {
119- if (Shape::UsesSeed) {
120- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
121- } else {
122- return Shape::HashForObject(key, object);
123- }
124- }
125+ // Wrapper methods. Defined in src/objects-inl.h
126+ // to break a cycle with src/heap/heap.h.
127+ inline uint32_t Hash(Key key);
128+ inline uint32_t HashForObject(Key key, Object* object);
129
130 // Returns a new HashTable object.
131 MUST_USE_RESULT static Handle<Derived> New(
diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
new file mode 100644
index 00000000..142595a3
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
@@ -0,0 +1,44 @@
1From e81f0a5139f8f1ea131438def3fe1aabe997aeff Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration
5
6Force gcc/g++ to be used for parts using host toolchain, since
7the option(host_build) does not work in yocto builds.
8
9Upstream-Status: Inappropriate [OE specific]
10Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
11---
12 src/buildtools/configure_host.pro | 12 ++++++------
13 1 file changed, 6 insertions(+), 6 deletions(-)
14
15diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
16index fd27643e..f9acb6ff 100644
17--- a/src/buildtools/configure_host.pro
18+++ b/src/buildtools/configure_host.pro
19@@ -28,9 +28,9 @@ GN_CONTENTS = \
20 "import(\"//build/config/sysroot.gni\")" \
21 "import(\"//build/toolchain/gcc_toolchain.gni\")" \
22 "gcc_toolchain(\"host\") {" \
23-" cc = \"$$which($$QMAKE_CC)\" " \
24-" cxx = \"$$which($$QMAKE_CXX)\" " \
25-" ld = \"$$which($$QMAKE_LINK)\" " \
26+" cc = \"$$which(gcc)\" " \
27+" cxx = \"$$which(g++)\" " \
28+" ld = \"$$which(g++)\" " \
29 " ar = \"$$which(ar)\" " \
30 " nm = \"$$which(nm)\" " \
31 " toolchain_args = { " \
32@@ -41,9 +41,9 @@ GN_CONTENTS = \
33 " } " \
34 "}" \
35 "gcc_toolchain(\"v8_snapshot\") {" \
36-" cc = \"$$which($$QMAKE_CC)\" " \
37-" cxx = \"$$which($$QMAKE_CXX)\" " \
38-" ld = \"$$which($$QMAKE_LINK)\" " \
39+" cc = \"$$which(gcc)\" " \
40+" cxx = \"$$which(g++)\" " \
41+" ld = \"$$which(g++)\" " \
42 " ar = \"$$which(ar)\" " \
43 " nm = \"$$which(nm)\" " \
44 " toolchain_args = { " \
diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch
deleted file mode 100644
index 041d29b2..00000000
--- a/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From f62b851edbcc3ac3da448d7570908ad78ebe77dc Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 11 Jul 2017 10:18:13 +0200
4Subject: [PATCH] chromium: WebKit fix build with gcc7
5
6Based on qtwebengine-opensource-src-5.8.0-wtf-gcc7.patch from
7http://git.net/ml/scm-fedora-commits/2017-03/msg15697.html
8
9* Fixes:
10In file included from ../../git/src/third_party/WebKit/Source/platform/heap/ThreadingTraits.h:14:0,
11 from ../../git/src/third_party/WebKit/Source/platform/heap/ThreadState.h:37,
12 from ../../git/src/third_party/WebKit/Source/platform/heap/GarbageCollected.h:8,
13 from ../../git/src/third_party/WebKit/Source/platform/heap/Visitor.h:35,
14 from ../../git/src/third_party/WebKit/Source/platform/heap/GCInfo.h:8,
15 from ../../git/src/third_party/WebKit/Source/platform/heap/Heap.h:35,
16 from ../../git/src/third_party/WebKit/Source/platform/heap/Handle.h:34,
17 from ../../git/src/third_party/WebKit/public/platform/WebPrivatePtr.h:38,
18 from ../../git/src/third_party/WebKit/public/platform/WebString.h:35,
19 from ../../git/src/third_party/WebKit/Source/platform/exported/FilePathConversion.cpp:8:
20../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h: In member function 'void WTF::LinkedHashSet<Value, HashFunctions, HashTraits, Allocator>::swap(WTF::LinkedHashSet<Value, HashFunctions, HashTraits, Allocator>&)':
21../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h:549:5: error: there are no arguments to 'swapAnchor' that depend on a template parameter, so a declaration of 'swapAnchor' must be available [-fpermissive]
22 swapAnchor(m_anchor, other.m_anchor);
23 ^~~~~~~~~~
24../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h:549:5: note: (if you use '-fpermissive', G++ will accept your code, but allowing the use of an undeclared name is deprecated)
25---
26 chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++
27 1 file changed, 2 insertions(+)
28
29diff --git a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
30index e85c72fd65..6f94cd6734 100644
31--- a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
32+++ b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
33@@ -542,6 +542,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(LinkedHas
34 return *this;
35 }
36
37+inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b);
38+
39 template<typename T, typename U, typename V, typename W>
40 inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other)
41 {
diff --git a/recipes-qt/qt5/qtwebengine/0006-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 43982daa..05b813b2 100644
--- a/recipes-qt/qt5/qtwebengine/0006-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 @@
1From e7e4def6d1422b84a9d6a6f7b285515d96210e87 Mon Sep 17 00:00:00 2001 1From 86f467724070e854c8c6b13269951c97c0832dae Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:09:06 -0700 3Date: Fri, 7 Jul 2017 14:09:06 -0700
4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux 4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 2 files changed, 3 insertions(+), 2 deletions(-) 10 2 files changed, 3 insertions(+), 2 deletions(-)
11 11
12diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc 12diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
13index 3b1a933bce..a554d03739 100644 13index 7d0cb57931..10be59ebad 100644
14--- a/chromium/base/trace_event/malloc_dump_provider.cc 14--- a/chromium/base/trace_event/malloc_dump_provider.cc
15+++ b/chromium/base/trace_event/malloc_dump_provider.cc 15+++ b/chromium/base/trace_event/malloc_dump_provider.cc
16@@ -103,6 +103,7 @@ MallocDumpProvider::~MallocDumpProvider() {} 16@@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {}
17 // the current process. 17 // the current process.
18 bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, 18 bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
19 ProcessMemoryDump* pmd) { 19 ProcessMemoryDump* pmd) {
@@ -21,7 +21,7 @@ index 3b1a933bce..a554d03739 100644
21 size_t total_virtual_size = 0; 21 size_t total_virtual_size = 0;
22 size_t resident_size = 0; 22 size_t resident_size = 0;
23 size_t allocated_objects_size = 0; 23 size_t allocated_objects_size = 0;
24@@ -195,7 +196,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, 24@@ -321,7 +322,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
25 pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); 25 pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc");
26 } 26 }
27 tid_dumping_heap_ = kInvalidThreadId; 27 tid_dumping_heap_ = kInvalidThreadId;
diff --git a/recipes-qt/qt5/qtwebengine/0007-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 95a12b01..2d7bd02b 100644
--- a/recipes-qt/qt5/qtwebengine/0007-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 @@
1From eac1905c90085d3b9de3764078022643dd1b5ce9 Mon Sep 17 00:00:00 2001 1From 0a409a773f2b2936a2f1868d983e7bd1c92110bd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:37:49 -0700 3Date: Fri, 7 Jul 2017 14:37:49 -0700
4Subject: [PATCH] chromium: musl: include fcntl.h for loff_t 4Subject: [PATCH] chromium: musl: include fcntl.h for loff_t
@@ -9,10 +9,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
9 1 file changed, 1 insertion(+) 9 1 file changed, 1 insertion(+)
10 10
11diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 11diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
12index bdbc4b7e3b..b53dd46c57 100644 12index b29ec2d29a..91f77dd88d 100644
13--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 13--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
14+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 14+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
15@@ -151,6 +151,7 @@ extern "C" { 15@@ -150,6 +150,7 @@ extern "C" {
16 #include <stddef.h> 16 #include <stddef.h>
17 #include <stdint.h> 17 #include <stdint.h>
18 #include <string.h> 18 #include <string.h>
diff --git a/recipes-qt/qt5/qtwebengine/0008-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 d15a63fd..f58de8f2 100644
--- a/recipes-qt/qt5/qtwebengine/0008-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 @@
1From 1690ac56cc013c3a18aa3c83e0efae47cc9da4f0 Mon Sep 17 00:00:00 2001 1From 375b70a99760c156b45e60def9bafd04902fb5a4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:38:37 -0700 3Date: Fri, 7 Jul 2017 14:38:37 -0700
4Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t 4Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch
index 434d62cd..c3b1cbb2 100644
--- a/recipes-qt/qt5/qtwebengine/0009-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 @@
1From 71072da07e963ae1b05f9d956ef715de8d249c5d Mon Sep 17 00:00:00 2001 1From 314cfb7b41be8fc4f962956e0acd34f110114c6e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:54:38 -0700 3Date: Fri, 7 Jul 2017 14:54:38 -0700
4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction 4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
diff --git a/recipes-qt/qt5/qtwebengine/0010-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 4393103c..550fd79e 100644
--- a/recipes-qt/qt5/qtwebengine/0010-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 @@
1From 43384ce7ab1d3b14820cb9bc0698130be9291a8e Mon Sep 17 00:00:00 2001 1From bc3745992889e3dc3b42c890b6a458038c6994e0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:09:02 -0700 3Date: Fri, 7 Jul 2017 15:09:02 -0700
4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols 4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc 12diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
13index af08ec039f..15070b9a13 100644 13index 95480ea4b6..1de3d1a532 100644
14--- a/chromium/base/allocator/allocator_shim.cc 14--- a/chromium/base/allocator/allocator_shim.cc
15+++ b/chromium/base/allocator/allocator_shim.cc 15+++ b/chromium/base/allocator/allocator_shim.cc
16@@ -244,7 +244,7 @@ void ShimFree(void* address) { 16@@ -266,7 +266,7 @@ void ShimFree(void* address) {
17 // In the case of tcmalloc we also want to plumb into the glibc hooks 17 // In the case of tcmalloc we also want to plumb into the glibc hooks
18 // to avoid that allocations made in glibc itself (e.g., strdup()) get 18 // to avoid that allocations made in glibc itself (e.g., strdup()) get
19 // accidentally performed on the glibc heap instead of the tcmalloc one. 19 // accidentally performed on the glibc heap instead of the tcmalloc one.
diff --git a/recipes-qt/qt5/qtwebengine/0011-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 04e0012a..82a2ccc5 100644
--- a/recipes-qt/qt5/qtwebengine/0011-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 @@
1From 701bb2640d5e5b03e8e019600a076c93508e1541 Mon Sep 17 00:00:00 2001 1From de4e672044de11c5927aeb42a554f5eced0abf6c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:12:39 -0700 3Date: Fri, 7 Jul 2017 15:12:39 -0700
4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from 4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch
index b5a0f849..235e2cc8 100644
--- a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch
@@ -1,4 +1,4 @@
1From ad184ecc5e5e67d1f3862e9ed3f767dff9bbc414 Mon Sep 17 00:00:00 2001 1From e4d99e001315f1bb34e6ff6531c0a528640b76d8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:24:49 -0700 3Date: Fri, 7 Jul 2017 15:24:49 -0700
4Subject: [PATCH] chromium: musl: Match syscalls to match musl 4Subject: [PATCH] chromium: musl: Match syscalls to match musl
@@ -9,10 +9,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
9 1 file changed, 16 insertions(+) 9 1 file changed, 16 insertions(+)
10 10
11diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h 11diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
12index 8a42c1c868..8e878c70f2 100644 12index 9dbd2391b2..a715de177c 100644
13--- a/chromium/third_party/lss/linux_syscall_support.h 13--- a/chromium/third_party/lss/linux_syscall_support.h
14+++ b/chromium/third_party/lss/linux_syscall_support.h 14+++ b/chromium/third_party/lss/linux_syscall_support.h
15@@ -717,6 +717,14 @@ struct kernel_statfs { 15@@ -793,6 +793,14 @@ struct kernel_statfs {
16 #endif 16 #endif
17 17
18 18
@@ -27,7 +27,7 @@ index 8a42c1c868..8e878c70f2 100644
27 #if defined(__x86_64__) 27 #if defined(__x86_64__)
28 #ifndef ARCH_SET_GS 28 #ifndef ARCH_SET_GS
29 #define ARCH_SET_GS 0x1001 29 #define ARCH_SET_GS 0x1001
30@@ -1134,6 +1142,14 @@ struct kernel_statfs { 30@@ -1210,6 +1218,14 @@ struct kernel_statfs {
31 #ifndef __NR_fallocate 31 #ifndef __NR_fallocate
32 #define __NR_fallocate 285 32 #define __NR_fallocate 285
33 #endif 33 #endif
diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index 68b8f45d..da0858a3 100644
--- a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
1From c892406f07b4e214397c55de62eccac3d558b134 Mon Sep 17 00:00:00 2001 1From 80953719539b60ea6a908710d4bb7cb78acc6920 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:27:50 -0700 3Date: Fri, 7 Jul 2017 15:27:50 -0700
4Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc 4Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index c9801899..16705e52 100644
--- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -1,4 +1,4 @@
1From be624e7cc1bc18e9e198bba16fcb224a7f9746fc Mon Sep 17 00:00:00 2001 1From 0b4922e1ed4b7f4e7ada7a840dec067f05c8e9f7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:39:57 -0700 3Date: Fri, 7 Jul 2017 15:39:57 -0700
4Subject: [PATCH] chromium: musl: Do not define __sbrk on musl 4Subject: [PATCH] chromium: musl: Do not define __sbrk on musl
diff --git a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch
index 997e3124..82e49f6f 100644
--- a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,4 +1,4 @@
1From 295fd835b22203807962a3eea08a12b74ae54c2c Mon Sep 17 00:00:00 2001 1From 54cf1a5476fac8b7d5a18742a63abdec788989a7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 16:41:23 -0700 3Date: Fri, 7 Jul 2017 16:41:23 -0700
4Subject: [PATCH] chromium: musl: Adjust default pthread stack size 4Subject: [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
12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc 12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
13index 95ed32418f..666e85ba33 100644 13index 92fbda5ee1..c41579d4ed 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@@ -96,7 +96,8 @@ void TerminateOnThread() {} 16@@ -175,7 +175,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)
@@ -24,24 +24,24 @@ index 95ed32418f..666e85ba33 100644
24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the 24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the
25 // default stack size isn't enough for some browser tests. 25 // default stack size isn't enough for some browser tests.
26diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 26diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
27index 3c0a0395b1..2af6073e21 100644 27index 1d164f510a..3358deb256 100644
28--- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 28--- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
29+++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 29+++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
30@@ -73,7 +73,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() 30@@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() {
31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size 31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
32 // correctly for the main thread. 32 // correctly for the main thread.
33 33
34-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) 34-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
35+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) 35+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
36 // pthread_getattr_np() can fail if the thread is not invoked by 36 // pthread_getattr_np() can fail if the thread is not invoked by
37 // pthread_create() (e.g., the main thread of webkit_unit_tests). 37 // pthread_create() (e.g., the main thread of webkit_unit_tests).
38 // If so, a conservative size estimate is returned. 38 // If so, a conservative size estimate is returned.
39@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() 39@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() {
40 }
40 41
41 void* StackFrameDepth::getStackStart() 42 void* StackFrameDepth::getStackStart() {
42 {
43-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) 43-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
44+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) 44+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
45 pthread_attr_t attr; 45 pthread_attr_t attr;
46 int error; 46 int error;
47 #if OS(FREEBSD) 47 #if OS(FREEBSD)
diff --git a/recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
index 2e80de8c..ac3afbf7 100644
--- a/recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
+++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
@@ -1,4 +1,4 @@
1From 91d9e3476c6432ae9ea8f8c0a9f6c435be844da0 Mon Sep 17 00:00:00 2001 1From 77bac704279103e74d8d7d35c933517dcfb9b7fc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 17:15:34 -0700 3Date: Fri, 7 Jul 2017 17:15:34 -0700
4Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 4Subject: [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
11diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc 11diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc
12index 158c374a03..c08fb4a8ec 100644 12index a2ca2e2309..e139cdf9e9 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 @@
@@ -18,5 +18,5 @@ index 158c374a03..c08fb4a8ec 100644
18 #include <termios.h> 18 #include <termios.h>
19+#include <asm-generic/ioctls.h> 19+#include <asm-generic/ioctls.h>
20 20
21 #include "base/files/file_util.h"
21 #include "base/posix/eintr_wrapper.h" 22 #include "base/posix/eintr_wrapper.h"
22 #include "build/build_config.h"
diff --git a/recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
index fe141aa8..668697cb 100644
--- a/recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
+++ b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
@@ -1,4 +1,4 @@
1From d05c22bdabe10c0db9b65252e442251efc81a379 Mon Sep 17 00:00:00 2001 1From 27690efdf920cafeab96f70eec0c66803c908cd4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 8 Jul 2017 09:08:23 -0700 3Date: Sat, 8 Jul 2017 09:08:23 -0700
4Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t 4Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t
@@ -9,10 +9,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
9 1 file changed, 1 insertion(+), 1 deletion(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 11diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
12index b53dd46c57..58da4d19d7 100644 12index 91f77dd88d..bb84a0b305 100644
13--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 13--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
14+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 14+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
15@@ -1930,7 +1930,7 @@ typedef unsigned long int ulong; 15@@ -1929,7 +1929,7 @@ typedef unsigned long int ulong;
16 #if defined(__x86_64__) 16 #if defined(__x86_64__)
17 /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */ 17 /* Need to make sure __off64_t isn't truncated to 32-bits under x32. */
18 LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, 18 LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
diff --git a/recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch
deleted file mode 100644
index 5e28adb7..00000000
--- a/recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1From a8163b060b699aa6678c45c970f4fbc806a6c198 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 17:41:43 -0700
4Subject: [PATCH] chromium: musl: link with libexecinfo on musl
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 chromium/base/base.gyp | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/chromium/base/base.gyp b/chromium/base/base.gyp
12index 3c3aded640..347b7e7856 100644
13--- a/chromium/base/base.gyp
14+++ b/chromium/base/base.gyp
15@@ -126,6 +126,7 @@
16 '-lrt',
17 # For 'native_library_linux.cc'
18 '-ldl',
19+ '-lexecinfo',
20 ],
21 },
22 'conditions': [
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index ab293a96..19583f91 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = " \
14 14
15DEPENDS += " \ 15DEPENDS += " \
16 ninja-native \ 16 ninja-native \
17 yasm-native \
17 qtwebchannel \ 18 qtwebchannel \
18 qtbase qtdeclarative qtxmlpatterns qtquickcontrols \ 19 qtbase qtdeclarative qtxmlpatterns qtquickcontrols \
19 qtlocation \ 20 qtlocation \
@@ -31,6 +32,7 @@ EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm \
31 GYP_CONFIG+=use_allocator=none \ 32 GYP_CONFIG+=use_allocator=none \
32 GYP_CONFIG+=use_experimental_allocator_shim=false \ 33 GYP_CONFIG+=use_experimental_allocator_shim=false \
33" 34"
35EXTRA_QMAKEVARS_CONFIGURE += "-feature-system-ninja -no-feature-system-gn"
34 36
35# chromium/third_party/openh264/openh264.gyp adds 37# chromium/third_party/openh264/openh264.gyp adds
36# -Wno-format to openh264_cflags_add 38# -Wno-format to openh264_cflags_add
@@ -42,7 +44,7 @@ SECURITY_STRINGFORMAT = ""
42 44
43# To use system ffmpeg you need to enable also libwebp, opus, vpx 45# To use system ffmpeg you need to enable also libwebp, opus, vpx
44# Only depenedencies available in oe-core are enabled by default 46# Only depenedencies available in oe-core are enabled by default
45PACKAGECONFIG ??= "libwebp flac libevent libxslt speex" 47PACKAGECONFIG ??= "libwebp flac libevent libxslt speex nss"
46PACKAGECONFIG[opus] = "WEBENGINE_CONFIG+=use_system_opus,,libopus" 48PACKAGECONFIG[opus] = "WEBENGINE_CONFIG+=use_system_opus,,libopus"
47PACKAGECONFIG[icu] = "WEBENGINE_CONFIG+=use_system_icu,,icu" 49PACKAGECONFIG[icu] = "WEBENGINE_CONFIG+=use_system_icu,,icu"
48PACKAGECONFIG[ffmpeg] = "WEBENGINE_CONFIG+=use_system_ffmpeg,,libav" 50PACKAGECONFIG[ffmpeg] = "WEBENGINE_CONFIG+=use_system_ffmpeg,,libav"
@@ -53,6 +55,7 @@ PACKAGECONFIG[libxslt] = "WEBENGINE_CONFIG+=use_system_libxslt,,libxslt"
53PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex" 55PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex"
54PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx" 56PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx"
55PACKAGECONFIG[webrtc] = "WEBENGINE_CONFIG+=use_webrtc,,libvpx" 57PACKAGECONFIG[webrtc] = "WEBENGINE_CONFIG+=use_webrtc,,libvpx"
58PACKAGECONFIG[nss] = "WEBENGINE_CONFIG+=use_nss,,nss"
56 59
57EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 60EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
58 61
@@ -76,30 +79,29 @@ def gettext_oeconf(d):
76require qt5.inc 79require qt5.inc
77require qt5-git.inc 80require qt5-git.inc
78 81
79export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja"
80
81do_configure() { 82do_configure() {
82 # replace LD with CXX, to workaround a possible gyp inheritssue?
83 export LD="${CXX}"
84 export CC="${CC}"
85 export CXX="${CXX}"
86 export CC_host="gcc"
87 export CXX_host="g++"
88 export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}"
89 export QMAKE_CACHE_EVAL="${PACKAGECONFIG_CONFARGS}"
90
91 # Disable autodetection from sysroot: 83 # Disable autodetection from sysroot:
92 sed -i 's/packagesExist([^)]*vpx[^)]*):/false:/g; s/config_libvpx:/false:/g; s/config_srtp:/false:/g; s/config_snappy:/false:/g; s/packagesExist(nss):/false:/g; s/packagesExist(minizip, zlib):/false:/g; s/packagesExist(libwebp,libwebpdemux):/false:/g; s/packagesExist(libxml-2.0,libxslt):/false:/g; s/^ *packagesExist($$package):/false:/g' ${S}/tools/qmake/mkspecs/features/configure.prf 84 sed -e 's/packagesExist([^)]*vpx[^)]*):/false:/g'\
85 -e 's/config_libvpx:/false:/g' \
86 -e 's/config_srtp:/false:/g' \
87 -e 's/config_snappy:/false:/g' \
88 -e 's/packagesExist(nss):/false:/g' \
89 -e 's/packagesExist(minizip, zlib):/false:/g' \
90 -e 's/packagesExist(libwebp,libwebpdemux):/false:/g' \
91 -e 's/packagesExist(libxml-2.0,libxslt):/false:/g'\
92 -e 's/^ *packagesExist($$package):/false:/g' \
93 -i ${S}/mkspecs/features/configure.prf
93 94
94 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as 95 # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as
95 # arguments here 96 # arguments here
96 ${OE_QMAKE_QMAKE} -r ${EXTRA_QMAKEVARS_PRE} ${S} \ 97 ${OE_QMAKE_QMAKE} ${EXTRA_QMAKEVARS_PRE} ${S} \
97 QMAKE_CXX="${OE_QMAKE_CXX}" QMAKE_CC="${OE_QMAKE_CC}" \ 98 QMAKE_CXX="${OE_QMAKE_CXX}" \
99 QMAKE_CC="${OE_QMAKE_CC}" \
98 QMAKE_LINK="${OE_QMAKE_LINK}" \ 100 QMAKE_LINK="${OE_QMAKE_LINK}" \
99 QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \ 101 QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \
100 QMAKE_CXXFLAGS="${OE_QMAKE_CXXFLAGS}" \ 102 QMAKE_CXXFLAGS="${OE_QMAKE_CXXFLAGS}" \
101 QMAKE_AR="${OE_QMAKE_AR} cqs" \ 103 -after ${EXTRA_QMAKEVARS_POST} -- \
102 -after ${EXTRA_QMAKEVARS_POST} 104 ${EXTRA_QMAKEVARS_CONFIGURE}
103} 105}
104 106
105do_configure_prepend_libc-musl() { 107do_configure_prepend_libc-musl() {
@@ -112,8 +114,7 @@ do_configure_prepend_libc-musl() {
112do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+" 114do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
113 115
114do_install_append() { 116do_install_append() {
115 rmdir ${D}${OE_QMAKE_PATH_PLUGINS}/${BPN} ${D}${OE_QMAKE_PATH_PLUGINS} || true 117 sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@[^ ]*${B}[^ ]* @@g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc
116 sed -i 's@ -Wl,--start-group.*-Wl,--end-group@@g; s@-L${B}[^ ]* @ @g' ${D}${libdir}/pkgconfig/Qt5WebEngineCore.pc
117} 118}
118PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" 119PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
119 120
@@ -126,39 +127,36 @@ RDEPENDS_${PN}-examples += " \
126 qtdeclarative-qmlplugins \ 127 qtdeclarative-qmlplugins \
127" 128"
128 129
129QT_MODULE_BRANCH_CHROMIUM = "53-based" 130QT_MODULE_BRANCH_CHROMIUM = "56-based"
130 131
131SRC_URI += " \ 132SRC_URI += " \
132 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 133 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
133 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ 134 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
134 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ 135 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
135 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ 136 file://0003-Include-dependency-to-QCoreApplication-translate.patch \
136 file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ 137 file://0004-Force-host-toolchain-configuration.patch \
137 file://0005-Include-dependency-to-QCoreApplication-translate.patch \ 138 file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
138 file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch;patchdir=src/3rdparty \ 139 file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
139 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
140 file://0003-chromium-v8-fix-build-with-gcc7.patch;patchdir=src/3rdparty \
141 file://0004-chromium-WebKit-fix-build-with-gcc7.patch;patchdir=src/3rdparty \
142" 140"
141
143SRC_URI_append_libc-musl = "\ 142SRC_URI_append_libc-musl = "\
144 file://0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ 143 file://0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
145 file://0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ 144 file://0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
146 file://0007-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ 145 file://0005-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
147 file://0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ 146 file://0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
148 file://0009-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ 147 file://0007-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
149 file://0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ 148 file://0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
150 file://0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ 149 file://0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
151 file://0012-chromium-musl-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty \ 150 file://0010-chromium-musl-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty \
152 file://0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ 151 file://0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
153 file://0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ 152 file://0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
154 file://0015-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ 153 file://0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
155 file://0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ 154 file://0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \
156 file://0017-chromium-musl-link-with-libexecinfo-on-musl.patch;patchdir=src/3rdparty \ 155 file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
157 file://0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
158" 156"
159 157
160SRCREV_qtwebengine = "d740d6a7dbfec387752c7bc8a8b06db0e757c9dc" 158SRCREV_qtwebengine = "73f7be5b2a95eab3dce11caede538eeb7beb71f2"
161SRCREV_chromium = "15d257fd921f37b32ef643225f21df0ea24c8302" 159SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05"
162SRCREV = "${SRCREV_qtwebengine}" 160SRCREV = "${SRCREV_qtwebengine}"
163 161
164SRCREV_FORMAT = "qtwebengine_chromium" 162SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 84b4d0ba..286aecae 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
17RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" 17RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
18RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" 18RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
19 19
20SRCREV = "f0898f83abdcacc8bd3bca3479884376b0963398" 20SRCREV = "822426abc77a74752b0ee0da4d0a1c106c4dac22"
diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
deleted file mode 100644
index d7627ec2..00000000
--- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1From f6989fec34f0bafdeda549d71751f236ef1f3b96 Mon Sep 17 00:00:00 2001
2From: Magnus Granberg <zorry@gentoo.org>
3Date: Fri, 27 Feb 2015 11:55:09 +0100
4Subject: [PATCH] Remove TEXTREL tag in x86
5
6Fix textrel QA warnings when building qtwebkit for x86:
7
8 WARNING: QA Issue: ELF binary '/home/andre/rdk/rdk-master/build-vbox32/tmp/work/core2-32-rdk-linux/qtwebkit/5.4.0-r0/packages-split/qtwebkit/usr/lib/libQt5WebKit.so.5.4.0' has relocations in .text [textrel]
9
10Patch from upstream webkit:
11
12 https://bugs.webkit.org/show_bug.cgi?id=70610
13
14Minor refresh required to apply cleanly to the older webkit sources used
15by qtwebkit. Specifically, the patch needed to be modified to account
16for PLATFORM(MAC) -> OS(DARWIN) renaming in recent webkit which is not
17part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ).
18
19Upstream status [webkit] : backport
20Upstream status [qtwebkit] : unclear
21
22Bug: https://bugs.webkit.org/show_bug.cgi?id=70610
23Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
24---
25 Source/JavaScriptCore/jit/ThunkGenerators.cpp | 24 ++++++++++++++++++++++++
26 Source/WTF/wtf/InlineASM.h | 2 ++
27 2 files changed, 26 insertions(+)
28
29diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
30index 9684df2..8af82d8 100644
31--- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp
32+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
33@@ -524,6 +524,30 @@ double jsRound(double d)
34 } \
35 static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
36
37+#elif CPU(X86) && COMPILER(GCC) && OS(LINUX) && defined(__PIC__)
38+#define defineUnaryDoubleOpWrapper(function) \
39+ asm( \
40+ ".text\n" \
41+ ".globl " SYMBOL_STRING(function##Thunk) "\n" \
42+ HIDE_SYMBOL(function##Thunk) "\n" \
43+ SYMBOL_STRING(function##Thunk) ":" "\n" \
44+ "pushl %ebx\n" \
45+ "subl $20, %esp\n" \
46+ "movsd %xmm0, (%esp) \n" \
47+ "call __x86.get_pc_thunk.bx\n" \
48+ "addl $_GLOBAL_OFFSET_TABLE_, %ebx\n" \
49+ "call " GLOBAL_REFERENCE(function) "\n" \
50+ "fstpl (%esp) \n" \
51+ "movsd (%esp), %xmm0 \n" \
52+ "addl $20, %esp\n" \
53+ "popl %ebx\n" \
54+ "ret\n" \
55+ );\
56+ extern "C" { \
57+ MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \
58+ } \
59+ static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
60+
61 #elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX))
62 #define defineUnaryDoubleOpWrapper(function) \
63 asm( \
64diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h
65index 0a2fe78..2dc40ef 100644
66--- a/Source/WTF/wtf/InlineASM.h
67+++ b/Source/WTF/wtf/InlineASM.h
68@@ -46,6 +46,8 @@
69 #define GLOBAL_REFERENCE(name) #name "@plt"
70 #elif CPU(X86) && COMPILER(MINGW)
71 #define GLOBAL_REFERENCE(name) "@" #name "@4"
72+#elif OS(LINUX) && CPU(X86) && defined(__PIC__)
73+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt"
74 #else
75 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
76 #endif
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 3c52ef3c..5c1ecfa8 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -20,7 +20,6 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
20 20
21SRC_URI += "\ 21SRC_URI += "\
22 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ 22 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
23 file://0002-Remove-TEXTREL-tag-in-x86.patch \
24 file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \ 23 file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \
25 file://0004-Fix-compilation-with-ICU-59.patch \ 24 file://0004-Fix-compilation-with-ICU-59.patch \
26" 25"
@@ -87,4 +86,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
87RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 86RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
88export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 87export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
89 88
90SRCREV = "74ac5b0f3489f9a08d083b6c9607c9d5c2d4afd2" 89SRCREV = "f27089657a207ef8c5c9d27d661d3d12c3af8df2"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 043b394e..41ec27f6 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "afb3c58d035db1119666c8556c215187be4f64b8" 14SRCREV = "1421c3e4ae4213ca18f2f51d5ddb38e223450222"
diff --git a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch
new file mode 100644
index 00000000..82087b9a
--- /dev/null
+++ b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch
@@ -0,0 +1,22 @@
1From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 2 Jun 2017 13:12:18 +0300
4Subject: [PATCH] Add missing include for qWarning
5
6Change-Id: I7c7699e7a2b7ce59e4f659d460ec835f59bba439
7---
8 src/webview/qquickwebview.cpp | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp
12index d760564..fbbbfd6 100644
13--- a/src/webview/qquickwebview.cpp
14+++ b/src/webview/qquickwebview.cpp
15@@ -39,6 +39,7 @@
16 #include <QtWebView/private/qwebviewloadrequest_p.h>
17 #include <QtQml/qqmlengine.h>
18 #include <QtCore/qmutex.h>
19+#include <QtCore/QDebug>
20
21 namespace {
22
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
new file mode 100644
index 00000000..d48b6c42
--- /dev/null
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -0,0 +1,24 @@
1LICENSE = "GFDL-1.3 & BSD & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
2LIC_FILES_CHKSUM = " \
3 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
4 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
5 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
6 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
7"
8
9require qt5.inc
10require qt5-git.inc
11
12SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch"
13
14DEPENDS += "qtbase qtwebengine"
15
16COMPATIBLE_MACHINE = "(-)"
17COMPATIBLE_MACHINE_x86 = "(.*)"
18COMPATIBLE_MACHINE_x86-64 = "(.*)"
19COMPATIBLE_MACHINE_armv6 = "(.*)"
20COMPATIBLE_MACHINE_armv7a = "(.*)"
21COMPATIBLE_MACHINE_armv7ve = "(.*)"
22COMPATIBLE_MACHINE_aarch64 = "(.*)"
23
24SRCREV = "6e55abf3b6a5f373cd4b649c2318a45c49b40589"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 81c72ec8..bf03e9bb 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "54cc3158acfc75d12338df3b678e013909e66f60" 16SRCREV = "9e83ff8713c1a3f69ce514bf3e31335194668da7"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 9333be0b..30e52629 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \
17 17
18DEPENDS += "qtbase" 18DEPENDS += "qtbase"
19 19
20SRCREV = "9f7e01b582b1bd83cc6b8a854c510871335e2e74" 20SRCREV = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52"
21 21
22BBCLASSEXTEND =+ "native nativesdk" 22BBCLASSEXTEND =+ "native nativesdk"
23 23