summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-06-14 07:49:03 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-16 09:45:29 +0000
commit682ad61c071a9710e9f9d8a32ab1b5f3c14953d1 (patch)
tree3a0188611c3938ef559efa2b353ceae5e51eb70a
parentfe6dbe144acbcbcbe37f5e9a07a08e414dbce036 (diff)
downloadmeta-qt5-682ad61c071a9710e9f9d8a32ab1b5f3c14953d1.tar.gz
qt: upgrade to 5.9.6
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb6
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch8
-rw-r--r--recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch4
-rw-r--r--recipes-qt/qt5/qt3d_git.bb4
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb6
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch16
-rw-r--r--recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0012-Always-build-uic.patch4
-rw-r--r--recipes-qt/qt5/qtbase_git.bb4
-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.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch14
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb4
-rw-r--r--recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch6
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb4
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb4
-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/0001-add-noqtwebkit-configuration.patch6
-rw-r--r--recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch4
-rw-r--r--recipes-qt/qt5/qttools_git.bb4
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb4
-rw-r--r--recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch8
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb4
-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.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch14
-rw-r--r--recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb8
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
74 files changed, 165 insertions, 165 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 2b8a4d33..0b6b7ce4 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -26,7 +26,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
26 26
27# common for qtbase-native, qtbase-nativesdk and qtbase 27# common for qtbase-native, qtbase-nativesdk and qtbase
28# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared 28# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
29# 5.9.meta-qt5-shared.5 29# 5.9.meta-qt5-shared.6
30SRC_URI += "\ 30SRC_URI += "\
31 file://0001-Add-linux-oe-g-platform.patch \ 31 file://0001-Add-linux-oe-g-platform.patch \
32 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 32 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -43,7 +43,7 @@ SRC_URI += "\
43 43
44# common for qtbase-native and nativesdk-qtbase 44# common for qtbase-native and nativesdk-qtbase
45# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native 45# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
46# 5.9.meta-qt5-native.5 46# 5.9.meta-qt5-native.6
47SRC_URI += " \ 47SRC_URI += " \
48 file://0012-Always-build-uic.patch \ 48 file://0012-Always-build-uic.patch \
49" 49"
@@ -200,4 +200,4 @@ fakeroot do_generate_qt_environment_file() {
200 200
201addtask generate_qt_environment_file after do_install before do_package 201addtask generate_qt_environment_file after do_install before do_package
202 202
203SRCREV = "f2095f2c66d0dae8525879f6c14165ace650e7f1" 203SRCREV = "9c50112304033c631e52f062496f3111f24835a2"
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 31598de9..cbcf0142 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 f61a6e50fbff57b17c113a70d8c50e460831fe70 Mon Sep 17 00:00:00 2001 1From 14826486fbde132cdea45837b645b3cfe26630ee 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Allow a tools-only build
10 3 files changed, 8 insertions(+), 3 deletions(-) 10 3 files changed, 8 insertions(+), 3 deletions(-)
11 11
12diff --git a/qt3d.pro b/qt3d.pro 12diff --git a/qt3d.pro b/qt3d.pro
13index 2cc347a..81cdeef 100644 13index 2cc347a1c..81cdeefb0 100644
14--- a/qt3d.pro 14--- a/qt3d.pro
15+++ b/qt3d.pro 15+++ b/qt3d.pro
16@@ -1,4 +1,4 @@ 16@@ -1,4 +1,4 @@
@@ -29,7 +29,7 @@ index 2cc347a..81cdeef 100644
29+ SUBDIRS = sub_tools 29+ SUBDIRS = sub_tools
30+} 30+}
31diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri 31diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
32index 8ba2d9a..e973d93 100644 32index 8ba2d9a41..e973d93dd 100644
33--- a/src/3rdparty/assimp/assimp_dependency.pri 33--- a/src/3rdparty/assimp/assimp_dependency.pri
34+++ b/src/3rdparty/assimp/assimp_dependency.pri 34+++ b/src/3rdparty/assimp/assimp_dependency.pri
35@@ -1,5 +1,5 @@ 35@@ -1,5 +1,5 @@
@@ -40,7 +40,7 @@ index 8ba2d9a..e973d93 100644
40 } else { 40 } else {
41 include(assimp.pri) 41 include(assimp.pri)
42diff --git a/tools/tools.pro b/tools/tools.pro 42diff --git a/tools/tools.pro b/tools/tools.pro
43index 8e973ae..ad51db5 100644 43index 8e973aecb..ad51db585 100644
44--- a/tools/tools.pro 44--- a/tools/tools.pro
45+++ b/tools/tools.pro 45+++ b/tools/tools.pro
46@@ -1,4 +1,4 @@ 46@@ -1,4 +1,4 @@
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 d6875f31..ef218a12 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 535d2ecd0ccaae5a36d40e9b64ffa2ef32f09cdb Mon Sep 17 00:00:00 2001 1From 6e528d8c4d82f6e4a1948086ac41230b5f3a773b 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,7 +9,7 @@ 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 18ec9f2..5b0b209 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@@ -55,10 +55,10 @@ using namespace Assimp::Formatter; 15@@ -55,10 +55,10 @@ using namespace Assimp::Formatter;
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 19925b32..3eadbb9f 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -12,7 +12,7 @@ DEPENDS += "qtbase"
12DEPENDS_class-target += "qtdeclarative qt3d-native" 12DEPENDS_class-target += "qtdeclarative qt3d-native"
13 13
14# Patches from https://github.com/meta-qt5/qt3d/commits/b5.9 14# Patches from https://github.com/meta-qt5/qt3d/commits/b5.9
15# 5.9.meta-qt5.5 15# 5.9.meta-qt5.6
16SRC_URI += " \ 16SRC_URI += " \
17 file://0001-Allow-a-tools-only-build.patch \ 17 file://0001-Allow-a-tools-only-build.patch \
18 file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ 18 file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \
@@ -37,6 +37,6 @@ do_configure_prepend() {
37 ${S}/src/quick3d/imports/input/importsinput.pro 37 ${S}/src/quick3d/imports/input/importsinput.pro
38} 38}
39 39
40SRCREV = "2970ef3dacda02fdf52ac25f3b93694eb06e6f7f" 40SRCREV = "ea18da8361e8406cf1cb567a407429afcd65552a"
41 41
42BBCLASSEXTEND += "native nativesdk" 42BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index d7e3f348..f55a2c07 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.9.5+git${SRCPV}" 17PV = "5.9.6+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 0115a97f..698418d5 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -21,7 +21,7 @@ require qt5-git.inc
21 21
22# common for qtbase-native, qtbase-nativesdk and qtbase 22# common for qtbase-native, qtbase-nativesdk and qtbase
23# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared 23# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
24# 5.9.meta-qt5-shared.5 24# 5.9.meta-qt5-shared.6
25SRC_URI += "\ 25SRC_URI += "\
26 file://0001-Add-linux-oe-g-platform.patch \ 26 file://0001-Add-linux-oe-g-platform.patch \
27 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 27 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -38,7 +38,7 @@ SRC_URI += "\
38 38
39# common for qtbase-native and nativesdk-qtbase 39# common for qtbase-native and nativesdk-qtbase
40# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native 40# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
41# 5.9.meta-qt5-native.5 41# 5.9.meta-qt5-native.6
42SRC_URI += " \ 42SRC_URI += " \
43 file://0012-Always-build-uic.patch \ 43 file://0012-Always-build-uic.patch \
44" 44"
@@ -125,4 +125,4 @@ do_install() {
125 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 125 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
126} 126}
127 127
128SRCREV = "f2095f2c66d0dae8525879f6c14165ace650e7f1" 128SRCREV = "9c50112304033c631e52f062496f3111f24835a2"
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 e99a0c2b..9e815a91 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 f289763d524fb4012c95191f1ed9c5c680c33b28 Mon Sep 17 00:00:00 2001 1From 61220bdf923797b8d13b27c1601894a3743eeb7a 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
@@ -21,16 +21,16 @@ Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c
21Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 21Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
22--- 22---
23 configure | 2 +- 23 configure | 2 +-
24 mkspecs/features/configure.prf | 4 ++-- 24 mkspecs/features/configure.prf | 4 +--
25 mkspecs/features/qt_functions.prf | 2 +- 25 mkspecs/features/qt_functions.prf | 2 +-
26 mkspecs/linux-oe-g++/qmake.conf | 43 ++++++++++++++++++++++++++++++++++++ 26 mkspecs/linux-oe-g++/qmake.conf | 43 ++++++++++++++++++++++++++++
27 mkspecs/linux-oe-g++/qplatformdefs.h | 1 + 27 mkspecs/linux-oe-g++/qplatformdefs.h | 1 +
28 5 files changed, 48 insertions(+), 4 deletions(-) 28 5 files changed, 48 insertions(+), 4 deletions(-)
29 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 29 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
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 08b49a8..5876721 100755 33index 08b49a8d12..5876721743 100755
34--- a/configure 34--- a/configure
35+++ b/configure 35+++ b/configure
36@@ -712,7 +712,7 @@ fi 36@@ -712,7 +712,7 @@ fi
@@ -43,7 +43,7 @@ index 08b49a8..5876721 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 934a18a..0f5b1b6 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@@ -46,14 +46,14 @@ defineTest(qtCompileTest) { 49@@ -46,14 +46,14 @@ defineTest(qtCompileTest) {
@@ -64,7 +64,7 @@ index 934a18a..0f5b1b6 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 1903e50..c093dd4 100644 67index 1903e509c8..c093dd4592 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@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { 70@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@@ -78,7 +78,7 @@ index 1903e50..c093dd4 100644
78 cmd = perl -w $$system_path($${cmd}.pl) 78 cmd = perl -w $$system_path($${cmd}.pl)
79diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 79diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
80new file mode 100644 80new file mode 100644
81index 0000000..c1837e6 81index 0000000000..c1837e6d55
82--- /dev/null 82--- /dev/null
83+++ b/mkspecs/linux-oe-g++/qmake.conf 83+++ b/mkspecs/linux-oe-g++/qmake.conf
84@@ -0,0 +1,43 @@ 84@@ -0,0 +1,43 @@
@@ -127,7 +127,7 @@ index 0000000..c1837e6
127+load(qt_config) 127+load(qt_config)
128diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h 128diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
129new file mode 100644 129new file mode 100644
130index 0000000..5d22fb4 130index 0000000000..5d22fb4101
131--- /dev/null 131--- /dev/null
132+++ b/mkspecs/linux-oe-g++/qplatformdefs.h 132+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
133@@ -0,0 +1 @@ 133@@ -0,0 +1 @@
diff --git a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
index 5d247d19..f544e10a 100644
--- a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
+++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
@@ -1,4 +1,4 @@
1From 3ffab93bd68226b63350a38fdb64b64ab66a808b Mon Sep 17 00:00:00 2001 1From 709a7e5e70927e07e66e57414c6b4ed67560217e 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] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS 4Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -19,7 +19,7 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2
19 3 files changed, 6 insertions(+), 6 deletions(-) 19 3 files changed, 6 insertions(+), 6 deletions(-)
20 20
21diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 21diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
22index 545b9a3..c991a9b 100644 22index 545b9a3d1e..c991a9ba41 100644
23--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 23--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
24+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 24+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
25@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 25@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -50,7 +50,7 @@ index 545b9a3..c991a9b 100644
50 _qt5_Core_check_file_exists(${imported_location}) 50 _qt5_Core_check_file_exists(${imported_location})
51 51
52diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in 52diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
53index 1d94715..301af8f 100644 53index 1d947159e2..301af8f1b2 100644
54--- a/src/dbus/Qt5DBusConfigExtras.cmake.in 54--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
55+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in 55+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
56@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) 56@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
@@ -72,7 +72,7 @@ index 1d94715..301af8f 100644
72 _qt5_DBus_check_file_exists(${imported_location}) 72 _qt5_DBus_check_file_exists(${imported_location})
73 73
74diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 74diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
75index 99d87e2..5621dc0 100644 75index 99d87e2e46..5621dc0fae 100644
76--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 76--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
77+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 77+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
78@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) 78@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index e137b089..7ab90df4 100644
--- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,4 +1,4 @@
1From b3c893e8af76e64d59051401fd86acd24f4d5369 Mon Sep 17 00:00:00 2001 1From a1cb244c77c988b45b5597b4ffc4398ccb668fd4 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,7 +19,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 4 insertions(+), 1 deletion(-) 19 1 file changed, 4 insertions(+), 1 deletion(-)
20 20
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 b4ba0b5..11d4c00 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@@ -172,7 +172,10 @@ void QLibrarySettings::load() 25@@ -172,7 +172,10 @@ void QLibrarySettings::load()
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
index 9d1f2963..44a20d4e 100644
--- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,4 +1,4 @@
1From 4c827328e3d654b4e179864149cb9edee1a58f53 Mon Sep 17 00:00:00 2001 1From 0a1329319dcc60f041090abb4625054ed94d6097 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 25 Aug 2015 10:05:15 -0400 3Date: Tue, 25 Aug 2015 10:05:15 -0400
4Subject: [PATCH] configure: bump path length from 256 to 512 characters 4Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,7 +15,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
15 1 file changed, 3 insertions(+), 3 deletions(-) 15 1 file changed, 3 insertions(+), 3 deletions(-)
16 16
17diff --git a/configure.pri b/configure.pri 17diff --git a/configure.pri b/configure.pri
18index dc703ec..961b41e 100644 18index dc703ecb14..961b41e3f8 100644
19--- a/configure.pri 19--- a/configure.pri
20+++ b/configure.pri 20+++ b/configure.pri
21@@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) { 21@@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) {
diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
index 8dade548..746b1367 100644
--- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
+++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
@@ -1,4 +1,4 @@
1From 6ca3f881b0d0f6feb824aad35ce85ddb3be2146b Mon Sep 17 00:00:00 2001 1From 7e7249e3355264733f1dbfbc7dc7d3f85d890951 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,7 +10,7 @@ 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 d5dcda2..501151d 100644 13index d5dcda22ac..501151d27f 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@@ -1251,7 +1251,8 @@ defineReplace(qtConfEvaluateSingleExpression) { 16@@ -1251,7 +1251,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
diff --git a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
index 9aefbf9f..bfeedbeb 100644
--- a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
+++ b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
@@ -1,4 +1,4 @@
1From 9c6fc0f0e5f2da02b6b2a21c113f6b29588fc52c Mon Sep 17 00:00:00 2001 1From d1303277bc34d8ab38082ead9733c25a3ab2a236 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 55c74aa..f9ec328 100644 33index 55c74aad66..f9ec328c83 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)
@@ -46,7 +46,7 @@ index 55c74aa..f9ec328 100644
46 !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 46 !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
47 set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") 47 set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
48diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in 48diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in
49index 75b5348..ed31888 100644 49index 75b53485b7..ed31888c93 100644
50--- a/src/corelib/Qt5Config.cmake.in 50--- a/src/corelib/Qt5Config.cmake.in
51+++ b/src/corelib/Qt5Config.cmake.in 51+++ b/src/corelib/Qt5Config.cmake.in
52@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9) 52@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9)
diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
index 3d687c71..8f1bd59d 100644
--- a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
+++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
@@ -1,4 +1,4 @@
1From 70eb95bcde17f4e67b4660caa8183e24ec876102 Mon Sep 17 00:00:00 2001 1From 98c2a414a359ad8ceba511292ac6962deba78356 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
@@ -9,7 +9,7 @@ Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
9 1 file changed, 2 deletions(-) 9 1 file changed, 2 deletions(-)
10 10
11diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro 11diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
12index 09458bd..59a120e 100644 12index 09458bd9c3..59a120eb26 100644
13--- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro 13--- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
14+++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro 14+++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
15@@ -5,10 +5,8 @@ SUBDIRS=\ 15@@ -5,10 +5,8 @@ SUBDIRS=\
diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
index 71ab6ff6..f2e9d680 100644
--- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
+++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
@@ -1,4 +1,4 @@
1From 08d705e3a5e16ba75b0ca281400bba0d85f64f77 Mon Sep 17 00:00:00 2001 1From 83d9a275c09352558e69445cb453020861ae3f6e 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 f9ddd59..2f92db9 100644 17index f9ddd59aaa..2f92db983d 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,7 +36,7 @@ index f9ddd59..2f92db9 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 f64a88c..997218b 100644 39index f64a88cc05..997218b2b4 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@@ -77,6 +77,7 @@ 42@@ -77,6 +77,7 @@
diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
index d393352e..c3124b42 100644
--- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
+++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
@@ -1,11 +1,11 @@
1From 1b576218b875cd10fcbcbd227d0011fc0bb917da Mon Sep 17 00:00:00 2001 1From eeb0e3cafc02ae185a75f932176339002f6338ba Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Sep 2017 09:11:44 -0700 3Date: Sun, 3 Sep 2017 09:11:44 -0700
4Subject: [PATCH] Add OE specific specs for clang compiler 4Subject: [PATCH] Add OE specific specs for clang compiler
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 mkspecs/linux-oe-clang/qmake.conf | 43 ++++++++++++++++++++++++++++++++++ 8 mkspecs/linux-oe-clang/qmake.conf | 43 ++++++++++++++++++++++++++
9 mkspecs/linux-oe-clang/qplatformdefs.h | 1 + 9 mkspecs/linux-oe-clang/qplatformdefs.h | 1 +
10 2 files changed, 44 insertions(+) 10 2 files changed, 44 insertions(+)
11 create mode 100644 mkspecs/linux-oe-clang/qmake.conf 11 create mode 100644 mkspecs/linux-oe-clang/qmake.conf
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 13
14diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf 14diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf
15new file mode 100644 15new file mode 100644
16index 0000000..ffc9f05 16index 0000000000..ffc9f051db
17--- /dev/null 17--- /dev/null
18+++ b/mkspecs/linux-oe-clang/qmake.conf 18+++ b/mkspecs/linux-oe-clang/qmake.conf
19@@ -0,0 +1,43 @@ 19@@ -0,0 +1,43 @@
@@ -62,7 +62,7 @@ index 0000000..ffc9f05
62+load(qt_config) 62+load(qt_config)
63diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h 63diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h
64new file mode 100644 64new file mode 100644
65index 0000000..880c927 65index 0000000000..880c927b21
66--- /dev/null 66--- /dev/null
67+++ b/mkspecs/linux-oe-clang/qplatformdefs.h 67+++ b/mkspecs/linux-oe-clang/qplatformdefs.h
68@@ -0,0 +1 @@ 68@@ -0,0 +1 @@
diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
index 6e8aa738..9bcb7936 100644
--- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
+++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
@@ -1,4 +1,4 @@
1From c295b6fad2183ff47c8f5c061484713f2fe44583 Mon Sep 17 00:00:00 2001 1From 1bd6f92d57ff09665241343870ebf6c4882c62e4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Sep 2017 09:44:48 -0700 3Date: Sun, 3 Sep 2017 09:44:48 -0700
4Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T 4Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 1 file changed, 3 insertions(+), 3 deletions(-) 13 1 file changed, 3 insertions(+), 3 deletions(-)
14 14
15diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h 15diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h
16index d29225f..a0cdb57 100644 16index d29225f12f..a0cdb57343 100644
17--- a/mkspecs/linux-clang/qplatformdefs.h 17--- a/mkspecs/linux-clang/qplatformdefs.h
18+++ b/mkspecs/linux-clang/qplatformdefs.h 18+++ b/mkspecs/linux-clang/qplatformdefs.h
19@@ -84,10 +84,10 @@ 19@@ -84,10 +84,10 @@
diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
index ab124fe3..ab52eefc 100644
--- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
+++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
@@ -1,4 +1,4 @@
1From 5d00d9490866ee2b3eb88463f45b7d5ea0a8654a Mon Sep 17 00:00:00 2001 1From e9aabbb5549dd76cbc3a6dc5723bbe56559a9fa7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Sep 2017 10:11:50 -0700 3Date: Sun, 3 Sep 2017 10:11:50 -0700
4Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc 4Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 13diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
14index 10d78b1..a59f358 100644 14index 10d78b1f2f..a59f358f80 100644
15--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 15--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
16+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 16+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
17@@ -46,7 +46,7 @@ 17@@ -46,7 +46,7 @@
diff --git a/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch
index 0cb36e18..ab65ce1e 100644
--- a/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch
@@ -1,4 +1,4 @@
1From 7ad9a6e116879730543ae947abef0fe74a5b0dbb Mon Sep 17 00:00:00 2001 1From a3ec19c34cc14e21a66ee723827219f8c04965da 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,7 +14,7 @@ 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 3e32f7e..18b268b 100644 17index 3e32f7edb0..18b268bf5e 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -205,7 +205,7 @@ qtConfig(gui) { 20@@ -205,7 +205,7 @@ qtConfig(gui) {
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index e03679ed..307e4073 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \
17 17
18# common for qtbase-native, qtbase-nativesdk and qtbase 18# common for qtbase-native, qtbase-nativesdk and qtbase
19# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared 19# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
20# 5.9.meta-qt5-shared.5 20# 5.9.meta-qt5-shared.6
21SRC_URI += "\ 21SRC_URI += "\
22 file://0001-Add-linux-oe-g-platform.patch \ 22 file://0001-Add-linux-oe-g-platform.patch \
23 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 23 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -215,4 +215,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
215 215
216RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 216RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
217 217
218SRCREV = "f2095f2c66d0dae8525879f6c14165ace650e7f1" 218SRCREV = "9c50112304033c631e52f062496f3111f24835a2"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index bdb46f8a..6fa59267 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 = "5b920d86dbc00f05f5679bcf8fe9ee1ba19b06f7" 13SRCREV = "569495de338821ad89153b69a59a5364fc96a49a"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 7a6f7a0c..3035d5af 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "47e3a4b81832932f1500c61762fb6d47e0fa8cc2" 11SRCREV = "6acb93f08af0133d3230cd7f9db5f9e0146d7fbf"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index d6f9c068..6995b970 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "b88b57c56b14c88dce83d7c267b5d52d18fd784a" 22SRCREV = "513e69bd6aca390d7e6ef28d3527c24dee99ee2b"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index aa1daeb7..f1dfaa8d 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 = "c3c6e604ee1193deb1bbff8e6f26ea2aeefdbe91" 11SRCREV = "4d2efb91ebbdc08ca70ee63a479367d75d5a6357"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 42fc6c63..8f49d97e 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() {
30 30
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
32 32
33SRCREV = "f23d1d54a06b0f3473e17300c3a1c495bcc25fdc" 33SRCREV = "283a900c4e8518fef33a2c89cb597fbf1e6ad78c"
34 34
35BBCLASSEXTEND =+ "native nativesdk" 35BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index e07cc99c..01d97de8 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 = "d1054b8e44d17ecbfae3cd455e07d6c379ef099a" 17SRCREV = "91b692255f5cb7012000694ff46ea0346293baf5"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 6df632fc..27488ced 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "c9a0a0f661d5ce789e5ab6743782afa463dd289a" 21SRCREV = "f61dcaa5e5ef8f5da1b37b25e4bd17469e72ce55"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index bef03e07..c219098f 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 = "bcc376e41f1e99a16bcf9c86b0d8112dd2010b52" 29SRCREV = "e9daef6d8f60015906c1e62e2875b2b6c1494465"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 0af39464..cd241676 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,7 +29,7 @@ SRC_URI += " \
29 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 29 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
30" 30"
31 31
32SRCREV_qtlocation = "4f8604bf7a94e64f40f5bb769d2105ca4e2f8e9b" 32SRCREV_qtlocation = "b0dd210c2dccd7c1c295cc8cba9872fae6dffe54"
33SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" 33SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7"
34 34
35SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 35SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch
index 0bcac424..f3d19def 100644
--- a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch
+++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch
@@ -1,4 +1,4 @@
1From bf2fa82b9ee1a9ab38ddbcdd68327bb5aed06c12 Mon Sep 17 00:00:00 2001 1From ee219bf33cf52c7a7eab7c02823b2e4960392ce0 Mon Sep 17 00:00:00 2001
2From: Wenlin Kang <wenlin.kang@windriver.com> 2From: Wenlin Kang <wenlin.kang@windriver.com>
3Date: Thu, 8 Sep 2016 12:18:13 +0800 3Date: Thu, 8 Sep 2016 12:18:13 +0800
4Subject: [PATCH] qtmultimedia: fix a conflicting declaration 4Subject: [PATCH] qtmultimedia: fix a conflicting declaration
@@ -8,15 +8,15 @@ fix a "conflicting declaration" error.
8 8
9Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> 9Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
10--- 10---
11 src/plugins/videonode/imx6/lgl2.h | 46 ++++++++++++++++++++++ 11 src/plugins/videonode/imx6/lgl2.h | 46 +++++++++++++++++++
12 .../videonode/imx6/qsgvivantevideomaterial.cpp | 5 ++- 12 .../imx6/qsgvivantevideomaterial.cpp | 5 +-
13 src/plugins/videonode/imx6/qsgvivantevideonode.cpp | 5 ++- 13 .../videonode/imx6/qsgvivantevideonode.cpp | 5 +-
14 3 files changed, 52 insertions(+), 4 deletions(-) 14 3 files changed, 52 insertions(+), 4 deletions(-)
15 create mode 100644 src/plugins/videonode/imx6/lgl2.h 15 create mode 100644 src/plugins/videonode/imx6/lgl2.h
16 16
17diff --git a/src/plugins/videonode/imx6/lgl2.h b/src/plugins/videonode/imx6/lgl2.h 17diff --git a/src/plugins/videonode/imx6/lgl2.h b/src/plugins/videonode/imx6/lgl2.h
18new file mode 100644 18new file mode 100644
19index 0000000..2423697 19index 00000000..24236976
20--- /dev/null 20--- /dev/null
21+++ b/src/plugins/videonode/imx6/lgl2.h 21+++ b/src/plugins/videonode/imx6/lgl2.h
22@@ -0,0 +1,46 @@ 22@@ -0,0 +1,46 @@
@@ -67,7 +67,7 @@ index 0000000..2423697
67+ 67+
68+#endif 68+#endif
69diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp 69diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
70index 465ccfa..40e7592 100644 70index 465ccfa7..40e7592b 100644
71--- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp 71--- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
72+++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp 72+++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
73@@ -37,8 +37,9 @@ 73@@ -37,8 +37,9 @@
@@ -83,7 +83,7 @@ index 465ccfa..40e7592 100644
83 #include "qsgvivantevideomaterial.h" 83 #include "qsgvivantevideomaterial.h"
84 #include "qsgvivantevideomaterialshader.h" 84 #include "qsgvivantevideomaterialshader.h"
85diff --git a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp 85diff --git a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp
86index c8d83b4..5b1b8f2 100644 86index c8d83b4b..5b1b8f24 100644
87--- a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp 87--- a/src/plugins/videonode/imx6/qsgvivantevideonode.cpp
88+++ b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp 88+++ b/src/plugins/videonode/imx6/qsgvivantevideonode.cpp
89@@ -37,8 +37,9 @@ 89@@ -37,8 +37,9 @@
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 0268c87a..b68ec9f4 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -26,7 +26,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
26EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" 26EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
27 27
28# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9 28# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9
29# 5.9.meta-qt5.5 29# 5.9.meta-qt5.6
30SRC_URI += "\ 30SRC_URI += "\
31 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ 31 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
32" 32"
@@ -35,4 +35,4 @@ SRC_URI += "\
35# http://errors.yoctoproject.org/Errors/Build/44914/ 35# http://errors.yoctoproject.org/Errors/Build/44914/
36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
37 37
38SRCREV = "01fd723848fd6007b03c27edd85d8e9c6b6ce881" 38SRCREV = "52f5785cfa8193f85859a27caebeb2a10f894f67"
diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
index 42156dcc..930bb6d8 100644
--- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
+++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
@@ -1,4 +1,4 @@
1From 6af3818fd0008327839d27ab58cf2af5fa3bcce6 Mon Sep 17 00:00:00 2001 1From ad1e13ce8ff07ca8813e6129fb0525b086a6e3a6 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Thu, 31 Mar 2016 19:57:01 -0400 3Date: Thu, 31 Mar 2016 19:57:01 -0400
4Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' 4Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug'
@@ -7,11 +7,11 @@ Upstream-Status: Pending
7 7
8Signed-off-by: Denys Dmytriyenko <denys@ti.com> 8Signed-off-by: Denys Dmytriyenko <denys@ti.com>
9--- 9---
10 examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | 1 + 10 .../quickcontrols/controls/texteditor/src/documenthandler.cpp | 1 +
11 1 file changed, 1 insertion(+) 11 1 file changed, 1 insertion(+)
12 12
13diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp 13diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
14index 69da88f..9039191 100644 14index 69da88f0..9039191e 100644
15--- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp 15--- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
16+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp 16+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
17@@ -54,6 +54,7 @@ 17@@ -54,6 +54,7 @@
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 8c8402ef..0d4606d1 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "9a2950600087b0784b06b0521b409fce69960a2d" 13SRCREV = "c48b314edef0595fbfa16dc62ce38b8d615326c8"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index c7c491da..47708759 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -20,9 +20,9 @@ FILES_${PN}-qmlplugins += " \
20" 20"
21 21
22# Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9 22# Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9
23# 5.9.meta-qt5.5 23# 5.9.meta-qt5.6
24SRC_URI += " \ 24SRC_URI += " \
25 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 25 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
26" 26"
27 27
28SRCREV = "75e9561d4fdf8e94c6d556b9a37bdccdaaf80c10" 28SRCREV = "ca6bba7163850222ea8b71dd7db9c70de56a0d4e"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 86739015..de5eca81 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -12,7 +12,7 @@ require qt5-git.inc
12DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" 12DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
13 13
14# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9 14# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9
15# 5.9.meta-qt5.5 15# 5.9.meta-qt5.6
16SRC_URI += " \ 16SRC_URI += " \
17 file://0001-Allow-a-tools-only-build.patch \ 17 file://0001-Allow-a-tools-only-build.patch \
18" 18"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index e2d52255..8b8a6cab 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -30,4 +30,4 @@ DEPENDS += "qtbase"
30# http://errors.yoctoproject.org/Errors/Build/44915/ 30# http://errors.yoctoproject.org/Errors/Build/44915/
31LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 31LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
32 32
33SRCREV = "945a4b0ad718a3462660a9782d0a78974a0d8cb9" 33SRCREV = "bc1c3fb95cee0ee525642bd308abbff21572505e"
diff --git a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch
index 36a6d031..1d421c52 100644
--- a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch
+++ b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch
@@ -1,4 +1,4 @@
1From c9886590333dce8a1dd1e198f5449bb841033bc8 Mon Sep 17 00:00:00 2001 1From be7c238b97f6cb104332d6bb956bf0dbe84c22a5 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 10 Jan 2017 15:28:26 +0200 3Date: Tue, 10 Jan 2017 15:28:26 +0200
4Subject: [PATCH] Use external host bin path for cmake file 4Subject: [PATCH] Use external host bin path for cmake file
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 78f44596..7d539057 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,10 +10,10 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "e5bfed810cdceedb8b7597d03c9649cddf9a5f3f" 13SRCREV = "320735f9a43bd07e4c2b8e9019b5706b00475956"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
16# 5.9.meta-qt5.5 16# 5.9.meta-qt5.6
17SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" 17SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
18 18
19do_install_append_class-nativesdk() { 19do_install_append_class-nativesdk() {
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 2017e00f..8d8597a6 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "b50891d2d5c8677622eba5f2bb86af7be093c434" 15SRCREV = "30044c5a4a1be9553c3db7a3669acd07431b2512"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 7b86b4ef..cee89df4 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 = "5165c67091da4438f2d37290f6c5855250d87eb0" 14SRCREV = "6654d88750cf5431086fe1d3187ec87f52533b18"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 7f3b959c..57fa1030 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 = "e40bf5347cb9298cafdb1004366ab436c1493cfe" 18SRCREV = "0a242c49401571d6a5a294935af02c431cc32143"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 54268bfb..fbe928e6 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "24273f154a4e4930d233e6711cbf718887576002" 16SRCREV = "7a28db8f5bc0149eee67479c1e58d20a7a02be73"
diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch
index f7ada984..84693d7b 100644
--- a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch
+++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch
@@ -1,4 +1,4 @@
1From fcbe797b61e624e5859dabfbe932ace2e8022649 Mon Sep 17 00:00:00 2001 1From 1b9514a70d0947ff025762afd42b8f1c84b5d067 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 4 Jun 2014 11:28:16 +0200 3Date: Wed, 4 Jun 2014 11:28:16 +0200
4Subject: [PATCH] add noqtwebkit configuration 4Subject: [PATCH] add noqtwebkit configuration
@@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16 2 files changed, 3 insertions(+), 3 deletions(-) 16 2 files changed, 3 insertions(+), 3 deletions(-)
17 17
18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro 18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
19index 82f5509..ef07ee0 100644 19index 82f55092..ef07ee03 100644
20--- a/src/assistant/assistant/assistant.pro 20--- a/src/assistant/assistant/assistant.pro
21+++ b/src/assistant/assistant/assistant.pro 21+++ b/src/assistant/assistant/assistant.pro
22@@ -1,4 +1,4 @@ 22@@ -1,4 +1,4 @@
@@ -35,7 +35,7 @@ index 82f5509..ef07ee0 100644
35 QT += webkitwidgets 35 QT += webkitwidgets
36 SOURCES += helpviewer_qwv.cpp 36 SOURCES += helpviewer_qwv.cpp
37diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro 37diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
38index 500a153..b60fa2d 100644 38index 500a1534..b60fa2d9 100644
39--- a/src/designer/src/plugins/plugins.pro 39--- a/src/designer/src/plugins/plugins.pro
40+++ b/src/designer/src/plugins/plugins.pro 40+++ b/src/designer/src/plugins/plugins.pro
41@@ -1,6 +1,6 @@ 41@@ -1,6 +1,6 @@
diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch
index 7abc9ea8..44963637 100644
--- a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch
+++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch
@@ -1,4 +1,4 @@
1From f7102d4e5c5c1d9e285b6821e18fff7c2dcea9c0 Mon Sep 17 00:00:00 2001 1From 20d2656c69da63c33e0d15add3726f2c802bca5a Mon Sep 17 00:00:00 2001
2From: Cody P Schafer <dev@codyps.com> 2From: Cody P Schafer <dev@codyps.com>
3Date: Thu, 9 Jul 2015 11:28:19 -0400 3Date: Thu, 9 Jul 2015 11:28:19 -0400
4Subject: [PATCH] linguist-tools cmake: allow overriding the location for 4Subject: [PATCH] linguist-tools cmake: allow overriding the location for
@@ -9,7 +9,7 @@ Subject: [PATCH] linguist-tools cmake: allow overriding the location for
9 1 file changed, 3 insertions(+), 12 deletions(-) 9 1 file changed, 3 insertions(+), 12 deletions(-)
10 10
11diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in 11diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in
12index 4318b16..2e3b70f 100644 12index 4318b16f..2e3b70fa 100644
13--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in 13--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in
14+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in 14+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in
15@@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_ 15@@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 3ac5d486..660c085f 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \
15DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 15DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
16 16
17# Patches from https://github.com/meta-qt5/qttools/commits/b5.9 17# Patches from https://github.com/meta-qt5/qttools/commits/b5.9
18# 5.9.meta-qt5.5 18# 5.9.meta-qt5.6
19SRC_URI += " \ 19SRC_URI += " \
20 file://0001-add-noqtwebkit-configuration.patch \ 20 file://0001-add-noqtwebkit-configuration.patch \
21 file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ 21 file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
@@ -29,7 +29,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
29 29
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
31 31
32SRCREV = "0c112f5980a39d370a90c34f8dfb778a6bd6a780" 32SRCREV = "c9eeabc7a7f83eb5603cedf7336f50e089d025af"
33 33
34BBCLASSEXTEND = "native nativesdk" 34BBCLASSEXTEND = "native nativesdk"
35 35
diff --git a/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch b/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch
index 185bf506..cd1e4b84 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch
+++ b/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch
@@ -1,4 +1,4 @@
1From c41773c12767dc6735cda8f8ad3d09454366283b Mon Sep 17 00:00:00 2001 1From 3ed215600a5c43d0e5312389a1acdef1a99d8b2f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 12 Jul 2017 23:59:52 -0700 3Date: Wed, 12 Jul 2017 23:59:52 -0700
4Subject: [PATCH] include sys/time.h for timeval 4Subject: [PATCH] include sys/time.h for timeval
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index e5906d66..c769793d 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
7" 7"
8 8
9# Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9 9# Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9
10# 5.9.meta-qt5.5 10# 5.9.meta-qt5.6
11SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" 11SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch"
12 12
13# To enabled Nuance T9 Write support, you need to provide the licensed components 13# To enabled Nuance T9 Write support, you need to provide the licensed components
@@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
53 53
54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
55 55
56SRCREV = "5c9ce0adf6ef8b28bc6196326f711a9d039738ea" 56SRCREV = "3fd388fe385ba7941a77e6a27c9b1e0e57f07198"
diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
index b2ff754c..13f0ce86 100644
--- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
+++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
@@ -1,4 +1,4 @@
1From c9c02d1a7d48f97bcbf85dca884e65b6ed3ec7c1 Mon Sep 17 00:00:00 2001 1From 237d370278dd68fbb16308e2fad044cbcba9797a Mon Sep 17 00:00:00 2001
2From: Raphael Freudiger <laser_b@gmx.ch> 2From: Raphael Freudiger <laser_b@gmx.ch>
3Date: Tue, 10 Jan 2017 15:49:55 +0100 3Date: Tue, 10 Jan 2017 15:49:55 +0100
4Subject: [PATCH] fix build without xkbcommon-evdev 4Subject: [PATCH] fix build without xkbcommon-evdev
@@ -16,7 +16,7 @@ Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
16 3 files changed, 11 insertions(+), 6 deletions(-) 16 3 files changed, 11 insertions(+), 6 deletions(-)
17 17
18diff --git a/src/client/client.pro b/src/client/client.pro 18diff --git a/src/client/client.pro b/src/client/client.pro
19index eae7ad5..0bb7b18 100644 19index eae7ad52..0bb7b188 100644
20--- a/src/client/client.pro 20--- a/src/client/client.pro
21+++ b/src/client/client.pro 21+++ b/src/client/client.pro
22@@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \ 22@@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \
@@ -26,7 +26,7 @@ index eae7ad5..0bb7b18 100644
26+ 26+
27+LIBS += -lxkbcommon 27+LIBS += -lxkbcommon
28diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro 28diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro
29index dc9000d..4eebfd6 100644 29index dc9000d9..4eebfd64 100644
30--- a/src/compositor/compositor.pro 30--- a/src/compositor/compositor.pro
31+++ b/src/compositor/compositor.pro 31+++ b/src/compositor/compositor.pro
32@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) 32@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri)
@@ -36,7 +36,7 @@ index dc9000d..4eebfd6 100644
36+ 36+
37+LIBS += -lxkbcommon 37+LIBS += -lxkbcommon
38diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp 38diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
39index c30f7b1..e6f1a0b 100644 39index c30f7b18..e6f1a0b3 100644
40--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp 40--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
41+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp 41+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
42@@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) 42@@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap)
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index e29bc94d..eef7d726 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,10 +37,10 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
37 37
38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "51b84d998b03cb95b6496e85d804e2788fc122d7" 40SRCREV = "8c5999644c8a98dca74f7339c2c750dd063ae346"
41 41
42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
43# 5.9.meta-qt5.5 43# 5.9.meta-qt5.6
44# From https://bugreports.qt.io/browse/QTBUG-57767 44# From https://bugreports.qt.io/browse/QTBUG-57767
45SRC_URI += " \ 45SRC_URI += " \
46 file://0001-fix-build-without-xkbcommon-evdev.patch \ 46 file://0001-fix-build-without-xkbcommon-evdev.patch \
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index a3d061a9..5af90422 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
14 14
15SRCREV = "a9f8d06fe1a7e98f1fa38d8df1627dc66dc92c21" 15SRCREV = "56a155e68de96a80301ef8b9ad183fcb67e86142"
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
index 90a557fc..51eec18f 100644
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
@@ -1,4 +1,4 @@
1From 78a0bfb1026cd1a66e25663266896db6920636b9 Mon Sep 17 00:00:00 2001 1From b3ef942f47b12546c558d94683719da8d23282f0 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
@@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11 1 file changed, 6 insertions(+), 6 deletions(-) 11 1 file changed, 6 insertions(+), 6 deletions(-)
12 12
13diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc 13diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc
14index 6d92637..738d3fd 100644 14index 6d926378be..738d3fdedf 100644
15--- a/chromium/ui/gfx/codec/jpeg_codec.cc 15--- a/chromium/ui/gfx/codec/jpeg_codec.cc
16+++ b/chromium/ui/gfx/codec/jpeg_codec.cc 16+++ b/chromium/ui/gfx/codec/jpeg_codec.cc
17@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) { 17@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
index aa223e1b..27ad3465 100644
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
1From 7efbed6af08caf6ce2bedbb8fb653b60c3aaa920 Mon Sep 17 00:00:00 2001 1From 87b283dd966ef68df24fd4c988b348f53c59e11b 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
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12 1 file changed, 6 insertions(+) 12 1 file changed, 6 insertions(+)
13 13
14diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf 14diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
15index b78d2a1..14dd07e 100644 15index b78d2a11..14dd07e5 100644
16--- a/mkspecs/features/functions.prf 16--- a/mkspecs/features/functions.prf
17+++ b/mkspecs/features/functions.prf 17+++ b/mkspecs/features/functions.prf
18@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) { 18@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) {
diff --git a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
index 94fa5a6f..0a045b07 100644
--- a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
@@ -1,4 +1,4 @@
1From fe4d996a8a6fe8e0c6b720ff30fa7bff95df2acb Mon Sep 17 00:00:00 2001 1From 68b44d6cd3b3653dd70da39e39eb40900207daff 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 19ecf5e..f6f638e 100644 12index 19ecf5e1..f6f638ee 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
index a2eeee1f..eeba5dce 100644
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From 7233c121fedcf73d10499afedd19c5e45ae0e4ec Mon Sep 17 00:00:00 2001 1From aba02f51bcaef2117aa8b413638af8134b563778 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] chromium: Force host toolchain configuration 4Subject: [PATCH] chromium: Force host toolchain configuration
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 6 insertions(+), 6 deletions(-) 14 1 file changed, 6 insertions(+), 6 deletions(-)
15 15
16diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py 16diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py
17index 43d252b..e583478 100755 17index 43d252b43e..e58347848e 100755
18--- a/chromium/tools/gn/bootstrap/bootstrap.py 18--- a/chromium/tools/gn/bootstrap/bootstrap.py
19+++ b/chromium/tools/gn/bootstrap/bootstrap.py 19+++ b/chromium/tools/gn/bootstrap/bootstrap.py
20@@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options): 20@@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options):
diff --git a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
index a61161de..c1aa58f9 100644
--- a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
@@ -1,4 +1,4 @@
1From 4e95d44468ed954d68402c585c6df3c6cd6c5638 Mon Sep 17 00:00:00 2001 1From c665697cce340faab080f45bf8a1e086a5bc7129 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,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/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 c378c32..1d33d95 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@@ -45,6 +45,8 @@ 15@@ -45,6 +45,8 @@
diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch
index 5d444899..d864a32c 100644
--- a/recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-chromium-workaround-for-too-long-.rps-file-name.patch
@@ -1,4 +1,4 @@
1From b220fb26cdcc7b3b9d2762c46b8e7604f3120cc3 Mon Sep 17 00:00:00 2001 1From e026637ca017f185697de536cf232c0f970286cf Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 30 Mar 2017 11:37:24 +0300 3Date: Thu, 30 Mar 2017 11:37:24 +0300
4Subject: [PATCH] chromium: workaround for too long .rps file name 4Subject: [PATCH] chromium: workaround for too long .rps file name
@@ -18,7 +18,7 @@ Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
18 1 file changed, 9 insertions(+) 18 1 file changed, 9 insertions(+)
19 19
20diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc 20diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc
21index a5bc6cd..5cefbfe 100644 21index a5bc6cd526..5cefbfe77c 100644
22--- a/chromium/tools/gn/ninja_action_target_writer.cc 22--- a/chromium/tools/gn/ninja_action_target_writer.cc
23+++ b/chromium/tools/gn/ninja_action_target_writer.cc 23+++ b/chromium/tools/gn/ninja_action_target_writer.cc
24@@ -115,9 +115,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { 24@@ -115,9 +115,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
index d85f46f6..1ca57455 100644
--- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From dbcfd868d551beb55a9411c26912050ea278ec48 Mon Sep 17 00:00:00 2001 1From f1f470227778b0f7068ec25e4d5db2aaa0ef4f3e Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -18,7 +18,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
18 2 files changed, 8 insertions(+), 8 deletions(-) 18 2 files changed, 8 insertions(+), 8 deletions(-)
19 19
20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
21index f1b3d47..1212372 100644 21index f1b3d47b..12123729 100644
22--- a/src/buildtools/configure_host.pro 22--- a/src/buildtools/configure_host.pro
23+++ b/src/buildtools/configure_host.pro 23+++ b/src/buildtools/configure_host.pro
24@@ -4,7 +4,7 @@ TEMPLATE = aux 24@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -57,7 +57,7 @@ index f1b3d47..1212372 100644
57 " nm = \"$$which(nm)\" " \ 57 " nm = \"$$which(nm)\" " \
58 " toolchain_args = { " \ 58 " toolchain_args = { " \
59diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri 59diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
60index 831e195..8a28de5 100644 60index 831e1952..8a28de5d 100644
61--- a/src/core/config/linux.pri 61--- a/src/core/config/linux.pri
62+++ b/src/core/config/linux.pri 62+++ b/src/core/config/linux.pri
63@@ -98,7 +98,7 @@ contains(QT_ARCH, "mips") { 63@@ -98,7 +98,7 @@ contains(QT_ARCH, "mips") {
diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index 52d5143e..e682b7f3 100644
--- a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -1,4 +1,4 @@
1From 6d7823f7bd60aa63aa11b4c6ac9d8814122e8396 Mon Sep 17 00:00:00 2001 1From 48f6dbfb20364f5184d43959cb1a6b65e1a6cba6 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
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 1 file changed, 9 insertions(+) 12 1 file changed, 9 insertions(+)
13 13
14diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c 14diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c
15index b655d1c..3de34e3 100644 15index b655d1c79c..3de34e36f2 100644
16--- a/chromium/sandbox/linux/suid/sandbox.c 16--- a/chromium/sandbox/linux/suid/sandbox.c
17+++ b/chromium/sandbox/linux/suid/sandbox.c 17+++ b/chromium/sandbox/linux/suid/sandbox.c
18@@ -44,6 +44,15 @@ static bool DropRoot(); 18@@ -44,6 +44,15 @@ static bool DropRoot();
diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index f1e633c9..fed2bca5 100644
--- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
1From 5e4ef7189876b1e2578f12824ad7b0405768f517 Mon Sep 17 00:00:00 2001 1From 4fce1a91096c8a2180f2126e176904b2a1e3275e 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,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 2 files changed, 3 insertions(+), 2 deletions(-) 10 2 files changed, 3 insertions(+), 2 deletions(-)
11 11
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 7d0cb57..10be59e 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@@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {} 16@@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {}
@@ -31,7 +31,7 @@ index 7d0cb57..10be59e 100644
31 } 31 }
32 32
33diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc 33diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc
34index 7ddeb4d..b8c73b0 100644 34index 7ddeb4d16a..b8c73b09c5 100644
35--- a/chromium/content/child/content_child_helpers.cc 35--- a/chromium/content/child/content_child_helpers.cc
36+++ b/chromium/content/child/content_child_helpers.cc 36+++ b/chromium/content/child/content_child_helpers.cc
37@@ -25,7 +25,7 @@ namespace content { 37@@ -25,7 +25,7 @@ namespace content {
diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch
index 6f582993..30a213a0 100644
--- a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch
+++ b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-include-fcntl.h-for-loff_t.patch
@@ -1,15 +1,15 @@
1From d36b3a2fdc5aa94b4dd03bcb509f64e8722fae9d Mon Sep 17 00:00:00 2001 1From f9d402bd9e966ec05717ea3ef62dcbd2943c72b9 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
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + 8 .../tcmalloc/chromium/src/base/linux_syscall_support.h | 1 +
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 b29ec2d..91f77dd 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@@ -150,6 +150,7 @@ extern "C" { 15@@ -150,6 +150,7 @@ extern "C" {
diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index 3b96e066..f72c3a6c 100644
--- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
1From 536f4a41ea30faabac84ff5bd62b51238ba1cdc7 Mon Sep 17 00:00:00 2001 1From 2a143412893405591f67ec0a74356219e088dbcb 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
@@ -8,11 +8,11 @@ Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
8 8
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 10---
11 .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- 11 .../tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++-----
12 1 file changed, 5 insertions(+), 5 deletions(-) 12 1 file changed, 5 insertions(+), 5 deletions(-)
13 13
14diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 14diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
15index 715c045..edc8cf2 100644 15index 715c045f66..edc8cf2db7 100644
16--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 16--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
17+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 17+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
18@@ -77,7 +77,7 @@ typedef off64_t __off64_t; 18@@ -77,7 +77,7 @@ typedef off64_t __off64_t;
diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch
index 77e896d5..ed61cc12 100644
--- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
1From 7336279ff0cca9216a095dcabf8872418372ee42 Mon Sep 17 00:00:00 2001 1From 00456ee9fa12e815066af7a159e321f274b81e36 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
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
9 1 file changed, 1 insertion(+), 1 deletion(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc 11diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc
12index 5a0564d..8c2dc64 100644 12index 5a0564d2f3..8c2dc6491d 100644
13--- a/chromium/base/allocator/allocator_check.cc 13--- a/chromium/base/allocator/allocator_check.cc
14+++ b/chromium/base/allocator/allocator_check.cc 14+++ b/chromium/base/allocator/allocator_check.cc
15@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() { 15@@ -21,7 +21,7 @@ bool IsAllocatorInitialized() {
diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
index 498b04d4..cab250a7 100644
--- a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -1,4 +1,4 @@
1From 51c5ff669beda6efec97f28bf6c94329e193eafd Mon Sep 17 00:00:00 2001 1From b5ca1e638adfc1241435cf27279b8e7ec05c18af 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,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
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 95480ea..1de3d1a 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@@ -266,7 +266,7 @@ void ShimFree(void* address) { 16@@ -266,7 +266,7 @@ void ShimFree(void* address) {
diff --git a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
index 37da85ee..7d1d43b7 100644
--- a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ b/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
@@ -1,4 +1,4 @@
1From 79ba4e54de16b6ef69ed4561edc694c0f4b77e5c Mon Sep 17 00:00:00 2001 1From 1b1ebf58dccdc53145a2778193e95987fcf464c9 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
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc 12diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc
13index 003708d..0fef314 100644 13index 003708d2c8..0fef3148f9 100644
14--- a/chromium/sandbox/linux/seccomp-bpf/trap.cc 14--- a/chromium/sandbox/linux/seccomp-bpf/trap.cc
15+++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc 15+++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc
16@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { 16@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
diff --git a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch
index d713d3ad..d80790d7 100644
--- a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Match-syscalls-to-match-musl.patch
@@ -1,4 +1,4 @@
1From a8af55b0070d9cd9e80ccc8535437435d7f3960c Mon Sep 17 00:00:00 2001 1From 23892285ca39c626aa77bca3dbccffe7f7784b91 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,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
9 1 file changed, 16 insertions(+) 9 1 file changed, 16 insertions(+)
10 10
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 9dbd239..a715de1 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@@ -793,6 +793,14 @@ struct kernel_statfs { 15@@ -793,6 +793,14 @@ struct kernel_statfs {
diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index 2258a505..0728aaf9 100644
--- a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
1From 2268eab4b28c1817a2ecd69c27730f9a46807e93 Mon Sep 17 00:00:00 2001 1From 9c441f0780c663b3029eedd2a3589418e7c33604 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
@@ -6,14 +6,14 @@ Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
6 6
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8--- 8---
9 chromium/net/dns/dns_config_service_posix.cc | 4 ++++ 9 chromium/net/dns/dns_config_service_posix.cc | 4 +++
10 chromium/net/dns/dns_reloader.cc | 4 ++++ 10 chromium/net/dns/dns_reloader.cc | 4 +++
11 chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++++++++++ 11 chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++
12 3 files changed, 37 insertions(+) 12 3 files changed, 37 insertions(+)
13 create mode 100644 chromium/net/dns/resolv_compat.h 13 create mode 100644 chromium/net/dns/resolv_compat.h
14 14
15diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc 15diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc
16index ba8a369..e9b40d0 100644 16index ba8a369133..e9b40d07fc 100644
17--- a/chromium/net/dns/dns_config_service_posix.cc 17--- a/chromium/net/dns/dns_config_service_posix.cc
18+++ b/chromium/net/dns/dns_config_service_posix.cc 18+++ b/chromium/net/dns/dns_config_service_posix.cc
19@@ -25,6 +25,10 @@ 19@@ -25,6 +25,10 @@
@@ -28,7 +28,7 @@ index ba8a369..e9b40d0 100644
28 #include "net/dns/dns_config_watcher_mac.h" 28 #include "net/dns/dns_config_watcher_mac.h"
29 #endif 29 #endif
30diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc 30diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc
31index 74534e6..2780a77 100644 31index 74534e6b1b..2780a776e4 100644
32--- a/chromium/net/dns/dns_reloader.cc 32--- a/chromium/net/dns/dns_reloader.cc
33+++ b/chromium/net/dns/dns_reloader.cc 33+++ b/chromium/net/dns/dns_reloader.cc
34@@ -9,6 +9,10 @@ 34@@ -9,6 +9,10 @@
@@ -44,7 +44,7 @@ index 74534e6..2780a77 100644
44 #include "base/macros.h" 44 #include "base/macros.h"
45diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h 45diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h
46new file mode 100644 46new file mode 100644
47index 0000000..4f0e852 47index 0000000000..4f0e852a19
48--- /dev/null 48--- /dev/null
49+++ b/chromium/net/dns/resolv_compat.h 49+++ b/chromium/net/dns/resolv_compat.h
50@@ -0,0 +1,29 @@ 50@@ -0,0 +1,29 @@
diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index e4df9f67..e175b74b 100644
--- a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -1,4 +1,4 @@
1From 8d4ab971e015059b3509dff4e7b7ff0382c2c6fa Mon Sep 17 00:00:00 2001 1From a6fc99a6328212972836d914d333f3670e3c4726 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
@@ -8,11 +8,11 @@ argument, so we just let it out for now
8 8
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 10---
11 chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- 11 .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 13
14diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 14diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
15index edc8cf2..a868b50 100644 15index edc8cf2db7..a868b50d30 100644
16--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 16--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
17+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 17+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
18@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, 18@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size,
diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
index bec98b0d..55739c83 100644
--- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,16 +1,16 @@
1From 5a83638e13e6d5b1d8aa401af12dbe29bcea8cda Mon Sep 17 00:00:00 2001 1From c190fb457fbe9f1c3adedcdadbda581ac5ed2286 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
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 chromium/base/threading/platform_thread_linux.cc | 3 ++- 8 chromium/base/threading/platform_thread_linux.cc | 3 ++-
9 chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- 9 .../WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++--
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 92fbda5..c41579d 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@@ -175,7 +175,8 @@ void TerminateOnThread() {} 16@@ -175,7 +175,8 @@ void TerminateOnThread() {}
@@ -24,7 +24,7 @@ index 92fbda5..c41579d 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 1d164f5..3358deb 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@@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { 30@@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() {
diff --git a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
index 13ecb95a..be406a70 100644
--- a/recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
+++ b/recipes-qt/qt5/qtwebengine/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
@@ -1,4 +1,4 @@
1From 4394020a7bfbac6fb78cf498f7bdaa9adf153707 Mon Sep 17 00:00:00 2001 1From c4f2176d88f331d8fc150c4bf598d2f2a5f3a1e1 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 a2ca2e2..e139cdf 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 @@
diff --git a/recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
index d4bdc8b4..feaaca3f 100644
--- a/recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
+++ b/recipes-qt/qt5/qtwebengine/0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
@@ -1,15 +1,15 @@
1From 5e2fae4322189dc359c469fed55c7fadbf46418e Mon Sep 17 00:00:00 2001 1From 69ab8dd347721db368d2dad63987a69c9c4f128e 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
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- 8 .../tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +-
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 91f77dd..bb84a0b 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@@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; 15@@ -1929,7 +1929,7 @@ typedef unsigned long int ulong;
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index e8f44c5d..656ee30f 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -131,7 +131,7 @@ RDEPENDS_${PN}-examples += " \
131QT_MODULE_BRANCH_CHROMIUM = "56-based" 131QT_MODULE_BRANCH_CHROMIUM = "56-based"
132 132
133# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 133# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
134# 5.9.meta-qt5.5 134# 5.9.meta-qt5.6
135SRC_URI += " \ 135SRC_URI += " \
136 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 136 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
137 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ 137 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
@@ -141,7 +141,7 @@ SRC_URI += " \
141" 141"
142 142
143# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 143# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based
144# 56-based.meta-qt5.5 144# 56-based.meta-qt5.6
145SRC_URI += " \ 145SRC_URI += " \
146 file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ 146 file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
147 file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ 147 file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
@@ -164,8 +164,8 @@ SRC_URI_append_libc-musl = "\
164 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 164 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
165" 165"
166 166
167SRCREV_qtwebengine = "7af0066e50aa4c73cadafe2d47bc368a5b0187f6" 167SRCREV_qtwebengine = "cc526afe9c2cdd4502c90b8f9b505812c984ea08"
168SRCREV_chromium = "4f2e755be232c9083108e55a30876a19b67e25d4" 168SRCREV_chromium = "e5175271484644d6101ff3901aaabf2bceb06f28"
169SRCREV = "${SRCREV_qtwebengine}" 169SRCREV = "${SRCREV_qtwebengine}"
170 170
171SRCREV_FORMAT = "qtwebengine_chromium" 171SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index ebf8a537..ccbe4806 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 = "74ea21a46daa8c8e3c1814ec517e360cb9503a9e" 14SRCREV = "3dc383a8078d7478a230ca7acac922b373bb9930"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index e60cc209..f17b94ec 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "4acd68bc1c8b97c3764442d95515c10d226e564b" 22SRCREV = "acc015e1cad69aa1a5224f6a3dcafa79df3a9286"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 57f8d850..2057ca8b 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 = "4644f175b9abbe770818a77e058f08b888f6e8b7" 16SRCREV = "b51ac2d46ca54769e242702f87bc6762f9f68ea9"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 7f306f8e..1e9c9106 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -15,6 +15,6 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "3444bfc8039c5090b02fd7f98abe8064a73019d7" 18SRCREV = "4dcae15a5a7f848addfb1b6bc2a98a63dc7218b4"
19 19
20BBCLASSEXTEND =+ "native nativesdk" 20BBCLASSEXTEND =+ "native nativesdk"