summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb12
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch8
-rw-r--r--recipes-qt/qt5/qt3d_git.bb6
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb12
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch20
-rw-r--r--recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch2
-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.patch10
-rw-r--r--recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch10
-rw-r--r--recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch2
-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-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch12
-rw-r--r--recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch (renamed from recipes-qt/qt5/qtbase/0001-qfloat16-check-for-__ARM_FP-2.patch)9
-rw-r--r--recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch4
-rw-r--r--recipes-qt/qt5/qtbase_git.bb8
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtcoap_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch2
-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/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch5
-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/qtknx_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtlottie_git.bb2
-rw-r--r--recipes-qt/qt5/qtmqtt_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch4
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb6
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtopcua_git.bb2
-rw-r--r--recipes-qt/qt5/qtpurchasing_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch2
-rw-r--r--recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch (renamed from recipes-qt/qt5/qtremoteobjects/0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch)2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb8
-rw-r--r--recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb6
-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.bb6
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch33
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb4
-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.patch2
-rw-r--r--recipes-qt/qt5/qttools_git.bb6
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Fix-use-of-private-dependency.patch36
-rw-r--r--recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch7
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb6
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch17
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-include-fcntl.h-for-loff_t.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-use-off64_t-instead-of-the-internal-__.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-use-off64_t-instead-of-the-internal-__.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-linux-glibc-make-the-distinction.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Use-correct-member-name-__si_fields-fr.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Use-correct-member-name-__si_fields-fr.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Do-not-define-__sbrk-on-musl.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Do-not-define-__sbrk-on-musl.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-pread-pwrite.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb34
-rw-r--r--recipes-qt/qt5/qtwebglplugin_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch2
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch2
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch (renamed from recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch)2
-rw-r--r--recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch (renamed from recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch)11
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb10
-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
102 files changed, 209 insertions, 293 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 3de1ef0f..8a4b471b 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -22,8 +22,8 @@ require qt5-git.inc
22FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" 22FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
23 23
24# common for qtbase-native, qtbase-nativesdk and qtbase 24# common for qtbase-native, qtbase-nativesdk and qtbase
25# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared 25# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-shared
26# 5.12.meta-qt5-shared.8 26# 5.13.meta-qt5-shared.1
27SRC_URI += "\ 27SRC_URI += "\
28 file://0001-Add-linux-oe-g-platform.patch \ 28 file://0001-Add-linux-oe-g-platform.patch \
29 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 29 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -41,12 +41,12 @@ SRC_URI += "\
41 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 41 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
42 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ 42 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
43 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 43 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
44 file://0001-qfloat16-check-for-__ARM_FP-2.patch \ 44 file://0017-qfloat16-check-for-__ARM_FP-2.patch \
45" 45"
46 46
47# common for qtbase-native and nativesdk-qtbase 47# common for qtbase-native and nativesdk-qtbase
48# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native 48# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-native
49# 5.12.meta-qt5-native.8 49# 5.13.meta-qt5-native.1
50SRC_URI += " \ 50SRC_URI += " \
51 file://0018-Always-build-uic-and-qvkgen.patch \ 51 file://0018-Always-build-uic-and-qvkgen.patch \
52 file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ 52 file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \
@@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() {
194do_generate_qt_environment_file[umask] = "022" 194do_generate_qt_environment_file[umask] = "022"
195addtask generate_qt_environment_file after do_install before do_package 195addtask generate_qt_environment_file after do_install before do_package
196 196
197SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" 197SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb"
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 05a86a70..d28b150f 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 1e64f9b509e6794c6f01e62443e93f771ac2a65c Mon Sep 17 00:00:00 2001 1From e77e54151e4ebee6996c13675ca0a68c880f9960 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 17 Aug 2018 13:23:58 +0300 3Date: Fri, 17 Aug 2018 13:23:58 +0300
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, 9 insertions(+), 4 deletions(-) 10 3 files changed, 9 insertions(+), 4 deletions(-)
11 11
12diff --git a/qt3d.pro b/qt3d.pro 12diff --git a/qt3d.pro b/qt3d.pro
13index d5dbda4..6809470 100644 13index d5dbda4b9..6809470b6 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 d5dbda4..6809470 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 3b457ed..9f5376a 100644 43index 3b457ed50..9f5376a0a 100644
44--- a/tools/tools.pro 44--- a/tools/tools.pro
45+++ b/tools/tools.pro 45+++ b/tools/tools.pro
46@@ -1,9 +1,9 @@ 46@@ -1,9 +1,9 @@
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 25681f53..ea8e3266 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \
11DEPENDS += "qtbase" 11DEPENDS += "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.12 14# Patches from https://github.com/meta-qt5/qt3d/commits/b5.13
15# 5.12.meta-qt5.2 15# 5.13.meta-qt5.1
16SRC_URI += " \ 16SRC_URI += " \
17 file://0001-Allow-a-tools-only-build.patch \ 17 file://0001-Allow-a-tools-only-build.patch \
18" 18"
@@ -36,6 +36,6 @@ do_configure_prepend() {
36 ${S}/src/quick3d/imports/input/importsinput.pro 36 ${S}/src/quick3d/imports/input/importsinput.pro
37} 37}
38 38
39SRCREV = "7640c5d526d10e0397e9f2e712139433165d269f" 39SRCREV = "93361f1a59c1edd2e4eb6d2aa7e2da5b73760a18"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 61bd9ea9..09d00f31 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.13.0+git${SRCPV}" 17PV = "5.13.2+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index f38bcffa..4af7f8c0 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -17,8 +17,8 @@ require qt5-native.inc
17require qt5-git.inc 17require qt5-git.inc
18 18
19# common for qtbase-native, qtbase-nativesdk and qtbase 19# common for qtbase-native, qtbase-nativesdk and qtbase
20# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared 20# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-shared
21# 5.12.meta-qt5-shared.8 21# 5.13.meta-qt5-shared.1
22SRC_URI += "\ 22SRC_URI += "\
23 file://0001-Add-linux-oe-g-platform.patch \ 23 file://0001-Add-linux-oe-g-platform.patch \
24 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 24 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -36,12 +36,12 @@ SRC_URI += "\
36 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 36 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
37 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ 37 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
38 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 38 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
39 file://0001-qfloat16-check-for-__ARM_FP-2.patch \ 39 file://0017-qfloat16-check-for-__ARM_FP-2.patch \
40" 40"
41 41
42# common for qtbase-native and nativesdk-qtbase 42# common for qtbase-native and nativesdk-qtbase
43# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native 43# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-native
44# 5.12.meta-qt5-native.8 44# 5.13.meta-qt5-native.1
45SRC_URI += " \ 45SRC_URI += " \
46 file://0018-Always-build-uic-and-qvkgen.patch \ 46 file://0018-Always-build-uic-and-qvkgen.patch \
47 file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ 47 file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \
@@ -143,4 +143,4 @@ do_install() {
143 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 143 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
144} 144}
145 145
146SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" 146SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb"
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 155dd63c..02043ea0 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 0edb35edfc5ef383e705b50422796dbd5ba8ef1a Mon Sep 17 00:00:00 2001 1From 4310d415fd53a1c41b838dafc3913b61087bd799 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,17 +21,17 @@ 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.prf | 6 +++--- 25 mkspecs/features/qt.prf | 6 ++---
26 mkspecs/features/qt_functions.prf | 2 +- 26 mkspecs/features/qt_functions.prf | 2 +-
27 mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++++++++++ 27 mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++
28 mkspecs/linux-oe-g++/qplatformdefs.h | 1 + 28 mkspecs/linux-oe-g++/qplatformdefs.h | 1 +
29 6 files changed, 47 insertions(+), 7 deletions(-) 29 6 files changed, 47 insertions(+), 7 deletions(-)
30 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 30 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
31 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 31 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
32 32
33diff --git a/configure b/configure 33diff --git a/configure b/configure
34index ef7bad1..dcca0f9 100755 34index ef7bad1bfc..dcca0f9135 100755
35--- a/configure 35--- a/configure
36+++ b/configure 36+++ b/configure
37@@ -712,7 +712,7 @@ fi 37@@ -712,7 +712,7 @@ fi
@@ -44,7 +44,7 @@ index ef7bad1..dcca0f9 100755
44 44
45 # build qmake 45 # build qmake
46diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 46diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
47index 934a18a..0f5b1b6 100644 47index 934a18a924..0f5b1b6333 100644
48--- a/mkspecs/features/configure.prf 48--- a/mkspecs/features/configure.prf
49+++ b/mkspecs/features/configure.prf 49+++ b/mkspecs/features/configure.prf
50@@ -46,14 +46,14 @@ defineTest(qtCompileTest) { 50@@ -46,14 +46,14 @@ defineTest(qtCompileTest) {
@@ -65,7 +65,7 @@ index 934a18a..0f5b1b6 100644
65 msg = "test $$1 succeeded" 65 msg = "test $$1 succeeded"
66 write_file($$QMAKE_CONFIG_LOG, msg, append) 66 write_file($$QMAKE_CONFIG_LOG, msg, append)
67diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf 67diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
68index 3a71376..dd6020f 100644 68index 3a71376029..dd6020f1fe 100644
69--- a/mkspecs/features/qt.prf 69--- a/mkspecs/features/qt.prf
70+++ b/mkspecs/features/qt.prf 70+++ b/mkspecs/features/qt.prf
71@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) { 71@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) {
@@ -89,7 +89,7 @@ index 3a71376..dd6020f 100644
89 # run qmlimportscanner 89 # run qmlimportscanner
90 qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) 90 qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
91diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 91diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
92index 1903e50..c093dd4 100644 92index 1903e509c8..c093dd4592 100644
93--- a/mkspecs/features/qt_functions.prf 93--- a/mkspecs/features/qt_functions.prf
94+++ b/mkspecs/features/qt_functions.prf 94+++ b/mkspecs/features/qt_functions.prf
95@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { 95@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@@ -103,7 +103,7 @@ index 1903e50..c093dd4 100644
103 cmd = perl -w $$system_path($${cmd}.pl) 103 cmd = perl -w $$system_path($${cmd}.pl)
104diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 104diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
105new file mode 100644 105new file mode 100644
106index 0000000..c202c47 106index 0000000000..c202c47fa1
107--- /dev/null 107--- /dev/null
108+++ b/mkspecs/linux-oe-g++/qmake.conf 108+++ b/mkspecs/linux-oe-g++/qmake.conf
109@@ -0,0 +1,39 @@ 109@@ -0,0 +1,39 @@
@@ -148,7 +148,7 @@ index 0000000..c202c47
148+load(qt_config) 148+load(qt_config)
149diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h 149diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
150new file mode 100644 150new file mode 100644
151index 0000000..5d22fb4 151index 0000000000..5d22fb4101
152--- /dev/null 152--- /dev/null
153+++ b/mkspecs/linux-oe-g++/qplatformdefs.h 153+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
154@@ -0,0 +1 @@ 154@@ -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 c46d2961..abef9c2e 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 643818dd46f6c0bfabdf09608dd12844c65a06c7 Mon Sep 17 00:00:00 2001 1From c15b17e7289f7f17e30972c814e565e4a3c1c629 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
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 d7db54d3..4428efda 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 df4410ccc0977b089efddd7d0d405e4abee2aab8 Mon Sep 17 00:00:00 2001 1From 4ec7f7cb5b8779e50af4a3fe282e02f225f13ddf 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
@@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20 1 file changed, 4 insertions(+), 1 deletion(-) 20 1 file changed, 4 insertions(+), 1 deletion(-)
21 21
22diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 22diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
23index 4119012d85..6395d10561 100644 23index f2ada4ab30..62c6feae17 100644
24--- a/src/corelib/global/qlibraryinfo.cpp 24--- a/src/corelib/global/qlibraryinfo.cpp
25+++ b/src/corelib/global/qlibraryinfo.cpp 25+++ b/src/corelib/global/qlibraryinfo.cpp
26@@ -174,7 +174,10 @@ void QLibrarySettings::load() 26@@ -174,7 +174,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 420a1e3c..b08ab11f 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 7f912753d733d218eb87fd3b3d1d3d39e336f566 Mon Sep 17 00:00:00 2001 1From b7856b64c4273c25d3f9a0873632595151652c91 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,12 +15,12 @@ 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 131aa868c2..294dfd6fd2 100644 18index 3778ece180..94bdfd2649 100644
19--- a/configure.pri 19--- a/configure.pri
20+++ b/configure.pri 20+++ b/configure.pri
21@@ -843,10 +843,10 @@ defineTest(qtConfOutput_preparePaths) { 21@@ -851,10 +851,10 @@ defineTest(qtConfOutput_preparePaths) {
22 "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ 22
23 "" \ 23 $${currentConfig}.output.qconfigSource = \
24 "/* Installation Info */" \ 24 "/* Installation Info */" \
25- "static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \ 25- "static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \
26+ "static const char qt_configure_prefix_path_str [12+512] = \"qt_prfxpath=$$config.input.prefix\";" \ 26+ "static const char qt_configure_prefix_path_str [12+512] = \"qt_prfxpath=$$config.input.prefix\";" \
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 b54bcf64..79125fc6 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 5556bc54942214e84dc5f81b2dcdc05f7713ff6e Mon Sep 17 00:00:00 2001 1From 50f0c25c0d45928a88a4a2c5a3484e6159f8580a Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 24 Oct 2016 09:45:18 +0300 3Date: Mon, 24 Oct 2016 09:45:18 +0300
4Subject: [PATCH] Disable all unknown features instead of erroring out 4Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
10 1 file changed, 2 insertions(+), 1 deletion(-) 10 1 file changed, 2 insertions(+), 1 deletion(-)
11 11
12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf 12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
13index 62ad972796..04690068bc 100644 13index 81110e9f6d..e6b4eeeb11 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@@ -1576,7 +1576,8 @@ defineReplace(qtConfEvaluateSingleExpression) { 16@@ -1604,7 +1604,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") 17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
18 return($$result) 18 return($$result)
19 } 19 }
diff --git a/recipes-qt/qt5/qtbase/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 849ee0ca..abc1cf31 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 265c509a62cc52d9b3a6c9e9995ac26ca278bc1b Mon Sep 17 00:00:00 2001 1From 11a7d56a5f57a13643bee171f80d9c4d80b2790b 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 3ed6dd5889..52b69b26f6 100644 33index f4a34d6e48..416f1b13bb 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@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) 36@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
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 8719d1e3..29c566fc 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 a7b47f38399ef145160e201052e5d0871fa6750c Mon Sep 17 00:00:00 2001 1From de968b7efc0248052eb96ce430e216a6dfec60d2 Mon Sep 17 00:00:00 2001
2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> 2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
3Date: Wed, 7 Jun 2017 21:00:49 +0900 3Date: Wed, 7 Jun 2017 21:00:49 +0900
4Subject: [PATCH] Delete qlonglong and qulonglong 4Subject: [PATCH] Delete qlonglong and qulonglong
diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
index 84e59e7c..1c33a51f 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 aebff1455c764e9ecc73e6b52a4bac8233c93966 Mon Sep 17 00:00:00 2001 1From a12d09f70178952f5be68110714386a0be00b017 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 e6fac74ccc..28c7e9cfb3 100644 17index e2bb7dab2a..683c7bafcd 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@@ -35,7 +35,7 @@ 20@@ -35,7 +35,7 @@
@@ -26,7 +26,7 @@ index e6fac74ccc..28c7e9cfb3 100644
26 #endif 26 #endif
27 27
28 #include <algorithm> 28 #include <algorithm>
29@@ -366,7 +366,7 @@ protected: 29@@ -368,7 +368,7 @@ protected:
30 const char *nm = name.constData(); 30 const char *nm = name.constData();
31 int tp = qRegisterMetaType<Bar>(nm); 31 int tp = qRegisterMetaType<Bar>(nm);
32 #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) 32 #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
@@ -36,7 +36,7 @@ index e6fac74ccc..28c7e9cfb3 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 c473230246..1db8d6f225 100644 39index 10b09629bc..858fc5fc99 100644
40--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 40--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
41+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 41+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
42@@ -78,6 +78,7 @@ 42@@ -78,6 +78,7 @@
@@ -47,7 +47,7 @@ index c473230246..1db8d6f225 100644
47 #endif 47 #endif
48 48
49 #include "private/qhostinfo_p.h" 49 #include "private/qhostinfo_p.h"
50@@ -2132,8 +2133,8 @@ public slots: 50@@ -2151,8 +2152,8 @@ public slots:
51 51
52 #if defined(Q_OS_MAC) 52 #if defined(Q_OS_MAC)
53 pthread_yield_np(); 53 pthread_yield_np();
diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
index 8498fd6a..a0120a4a 100644
--- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
+++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
@@ -1,4 +1,4 @@
1From d1198f3f6f3293c46db913d63518f625162b3ce5 Mon Sep 17 00:00:00 2001 1From 69999f5af72d090ec5ddd7003e099af5dfb448ac 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
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 e13858f1..fec487a6 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 e6ce6eaa98985b706151c63ca7b705110927d71b Mon Sep 17 00:00:00 2001 1From 82111f824764051266d0b807ab3c61bf13b1056a 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
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 b9cc9d44..00db5344 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 d8eb5531c444bcae2c2067a7f67e5229acc75fac Mon Sep 17 00:00:00 2001 1From 78d1a6005263f3a7d2dd4ce22f13d3d35b3c6c2f 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 5d344834e6..1afc70d255 100644 14index be2e2a2e08..68aa8369a5 100644
15--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 15--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
16+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 16+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
17@@ -46,7 +46,7 @@ 17@@ -46,7 +46,7 @@
diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
index 61a5b80f..e8d35776 100644
--- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
+++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
@@ -1,4 +1,4 @@
1From 6a97088ee9d0d8b2a4fbd5b13ea44501d9e58995 Mon Sep 17 00:00:00 2001 1From f01d43195be86fb5b06ad042551d65c54e34425a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 14 Feb 2018 17:08:43 -0800 3Date: Wed, 14 Feb 2018 17:08:43 -0800
4Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem 4Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem
@@ -22,7 +22,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
22 2 files changed, 2 insertions(+), 2 deletions(-) 22 2 files changed, 2 insertions(+), 2 deletions(-)
23 23
24diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf 24diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
25index 5800aaa5b4..7b4901ce46 100644 25index df210fe42d..79a3ddf2f8 100644
26--- a/mkspecs/common/clang.conf 26--- a/mkspecs/common/clang.conf
27+++ b/mkspecs/common/clang.conf 27+++ b/mkspecs/common/clang.conf
28@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX 28@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX
@@ -35,7 +35,7 @@ index 5800aaa5b4..7b4901ce46 100644
35 QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} 35 QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
36 QMAKE_CFLAGS_LTCG = -flto 36 QMAKE_CFLAGS_LTCG = -flto
37diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf 37diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
38index c2669e4833..3fde8dc85f 100644 38index 44b4267207..9756a02014 100644
39--- a/mkspecs/common/gcc-base.conf 39--- a/mkspecs/common/gcc-base.conf
40+++ b/mkspecs/common/gcc-base.conf 40+++ b/mkspecs/common/gcc-base.conf
41@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g 41@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g
diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
index e275a80e..b56224b9 100644
--- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
+++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
@@ -1,4 +1,4 @@
1From ffd62d10df5607897ef366330e368069fed1a9b9 Mon Sep 17 00:00:00 2001 1From 7804eb38b11b3a03217a6505d4b64c335d5a1d0d Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 23 Oct 2018 09:54:57 +0300 3Date: Tue, 23 Oct 2018 09:54:57 +0300
4Subject: [PATCH] Disable ltcg for host_build 4Subject: [PATCH] Disable ltcg for host_build
@@ -15,12 +15,14 @@ Upstream-Status: Inappropriate [embedded specific]
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf 17diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf
18index ccf0226272..482e5b573d 100644 18index a94f6d0eeb..ccab725843 100644
19--- a/mkspecs/features/ltcg.prf 19--- a/mkspecs/features/ltcg.prf
20+++ b/mkspecs/features/ltcg.prf 20+++ b/mkspecs/features/ltcg.prf
21@@ -1,4 +1,4 @@ 21@@ -1,6 +1,6 @@
22-CONFIG(release, debug|release) { 22 static:no-static-ltcg {
23+CONFIG(release, debug|release):!host_build { 23 # Static library but no-static-ltcg enabled: skip LTCG
24-} else: CONFIG(release, debug|release) {
25+} else: CONFIG(release, debug|release)!host_build {
24 # We need fat object files when creating static libraries on some platforms 26 # We need fat object files when creating static libraries on some platforms
25 # so the linker will know to load a particular object from the library 27 # so the linker will know to load a particular object from the library
26 # in the first place. On others, we have special ar and nm to create the symbol 28 # in the first place. On others, we have special ar and nm to create the symbol
diff --git a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
index 0a641bb2..8f0568ad 100644
--- a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
+++ b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
@@ -1,4 +1,4 @@
1From f5c88622ac10601e48a14f31d9299692a9ac62e2 Mon Sep 17 00:00:00 2001 1From e8d9ebf65245a7ca17bdc3f1ed313c60736e7c9b Mon Sep 17 00:00:00 2001
2From: Max Krummenacher <max.krummenacher@toradex.com> 2From: Max Krummenacher <max.krummenacher@toradex.com>
3Date: Sat, 27 Oct 2018 12:29:31 +0000 3Date: Sat, 27 Oct 2018 12:29:31 +0000
4Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to 4Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to
diff --git a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch
index 749594bd..78b13ddd 100644
--- a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch
+++ b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch
@@ -1,4 +1,4 @@
1From a7755c994aa8031e7f4eaa2df1a442a812d7f5bf Mon Sep 17 00:00:00 2001 1From 1dbee5ad3c0bc44c4c208ac27448535ef412a0ea Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 6 Dec 2018 11:47:52 -0800 3Date: Thu, 6 Dec 2018 11:47:52 -0800
4Subject: [PATCH] corelib: Include sys/types.h for uint32_t 4Subject: [PATCH] corelib: Include sys/types.h for uint32_t
diff --git a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
index e3a92168..d30f335f 100644
--- a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
+++ b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
@@ -1,4 +1,4 @@
1From 59c5c149ad1fa3015f1fee34e87e9f8ab89f5de1 Mon Sep 17 00:00:00 2001 1From 6ba1d79754bea482b2ac5ae2bb3e60681d435d37 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 6 Dec 2018 15:06:20 -0800 3Date: Thu, 6 Dec 2018 15:06:20 -0800
4Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux 4Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 1 file changed, 9 insertions(+) 13 1 file changed, 9 insertions(+)
14 14
15diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf 15diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
16index 9c3a64aa8b..d0758ab778 100644 16index 03612e5689..f227e0772e 100644
17--- a/mkspecs/features/toolchain.prf 17--- a/mkspecs/features/toolchain.prf
18+++ b/mkspecs/features/toolchain.prf 18+++ b/mkspecs/features/toolchain.prf
19@@ -41,6 +41,13 @@ defineReplace(qtVariablesFromGCC) { 19@@ -41,6 +41,13 @@ defineReplace(qtVariablesFromGCC) {
diff --git a/recipes-qt/qt5/qtbase/0001-qfloat16-check-for-__ARM_FP-2.patch b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch
index fdcb0cfa..8411b83d 100644
--- a/recipes-qt/qt5/qtbase/0001-qfloat16-check-for-__ARM_FP-2.patch
+++ b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch
@@ -1,4 +1,4 @@
1From 89ec5b0cdd8663ec2602dec3e151388bab2b4594 Mon Sep 17 00:00:00 2001 1From b938d809624660a2998ea7f844aba715e40acfc6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 5 Oct 2019 16:21:08 -0700 3Date: Sat, 5 Oct 2019 16:21:08 -0700
4Subject: [PATCH] qfloat16: check for __ARM_FP & 2 4Subject: [PATCH] qfloat16: check for __ARM_FP & 2
@@ -20,10 +20,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
20 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
21 21
22diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp 22diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp
23index fd608efe55..604a8a9cd8 100644 23index 87ff796368..37dec371a6 100644
24--- a/src/corelib/global/qfloat16.cpp 24--- a/src/corelib/global/qfloat16.cpp
25+++ b/src/corelib/global/qfloat16.cpp 25+++ b/src/corelib/global/qfloat16.cpp
26@@ -135,7 +135,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype 26@@ -148,7 +148,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype
27 #undef f16cextern 27 #undef f16cextern
28 } 28 }
29 29
@@ -32,6 +32,3 @@ index fd608efe55..604a8a9cd8 100644
32 static inline bool hasFastF16() 32 static inline bool hasFastF16()
33 { 33 {
34 return true; 34 return true;
35--
362.23.0
37
diff --git a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch
index 7ae15d0a..2ebab22b 100644
--- a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch
+++ b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch
@@ -1,4 +1,4 @@
1From 0db28cf06f557a714f8cffafbfcdbe68378c8f8a Mon Sep 17 00:00:00 2001 1From 86effd1f524ebe13d3c288e5ccd1bd477508c0d0 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 and qvkgen 4Subject: [PATCH] Always build uic and qvkgen
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/src/src.pro b/src/src.pro 16diff --git a/src/src.pro b/src/src.pro
17index 1c76a2e46f..fbd4014fb3 100644 17index ce3db6d783..2bd15f57d9 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -232,7 +232,7 @@ qtConfig(gui) { 20@@ -231,7 +231,7 @@ qtConfig(gui) {
21 } 21 }
22 } 22 }
23 } 23 }
diff --git a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
index b3c2c767..6d480105 100644
--- a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
+++ b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
@@ -1,4 +1,4 @@
1From 0c79a6761e75441f433fd397bc3b79e78b6c5ef8 Mon Sep 17 00:00:00 2001 1From 0ee2fc2de566efc5ad579dec693534105199f33d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Sun, 14 Apr 2019 13:27:58 +0200 3Date: Sun, 14 Apr 2019 13:27:58 +0200
4Subject: [PATCH] Avoid renameeat2 for native(sdk) builds 4Subject: [PATCH] Avoid renameeat2 for native(sdk) builds
@@ -24,7 +24,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
24 2 files changed, 2 insertions(+), 12 deletions(-) 24 2 files changed, 2 insertions(+), 12 deletions(-)
25 25
26diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h 26diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
27index dfcc3c9c7f..30166fe41c 100644 27index 10458e41d7..8cfa40e461 100644
28--- a/src/corelib/global/qconfig-bootstrapped.h 28--- a/src/corelib/global/qconfig-bootstrapped.h
29+++ b/src/corelib/global/qconfig-bootstrapped.h 29+++ b/src/corelib/global/qconfig-bootstrapped.h
30@@ -100,14 +100,14 @@ 30@@ -100,14 +100,14 @@
@@ -45,10 +45,10 @@ index dfcc3c9c7f..30166fe41c 100644
45 # define QT_FEATURE_statx -1 45 # define QT_FEATURE_statx -1
46 #endif 46 #endif
47diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp 47diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
48index b2d81066db..d1783ebdf3 100644 48index b78e037865..9574d1a044 100644
49--- a/src/corelib/io/qfilesystemengine_unix.cpp 49--- a/src/corelib/io/qfilesystemengine_unix.cpp
50+++ b/src/corelib/io/qfilesystemengine_unix.cpp 50+++ b/src/corelib/io/qfilesystemengine_unix.cpp
51@@ -1248,16 +1248,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy 51@@ -1232,16 +1232,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
52 if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) 52 if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty()))
53 return emptyFileEntryWarning(), false; 53 return emptyFileEntryWarning(), false;
54 54
diff --git a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch
index e681bfbb..a12ba359 100644
--- a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch
+++ b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch
@@ -1,4 +1,4 @@
1From d52010c7d58f1a25f51a909b3179df656ed9d9c4 Mon Sep 17 00:00:00 2001 1From 9d40b6e665f67f5096eba41bea13492d3eda056c Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 24 Nov 2017 15:16:31 +0200 3Date: Fri, 24 Nov 2017 15:16:31 +0200
4Subject: [PATCH] Bootstrap without linkat feature 4Subject: [PATCH] Bootstrap without linkat feature
@@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [OE specific]
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h 15diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
16index 30166fe41c..e06f75541b 100644 16index 8cfa40e461..f2fba9ebd8 100644
17--- a/src/corelib/global/qconfig-bootstrapped.h 17--- a/src/corelib/global/qconfig-bootstrapped.h
18+++ b/src/corelib/global/qconfig-bootstrapped.h 18+++ b/src/corelib/global/qconfig-bootstrapped.h
19@@ -91,7 +91,7 @@ 19@@ -91,7 +91,7 @@
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index db02325f..05bc716d 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = " \
13" 13"
14 14
15# common for qtbase-native, qtbase-nativesdk and qtbase 15# common for qtbase-native, qtbase-nativesdk and qtbase
16# Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared 16# Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-shared
17# 5.12.meta-qt5-shared.8 17# 5.13.meta-qt5-shared.1
18SRC_URI += "\ 18SRC_URI += "\
19 file://0001-Add-linux-oe-g-platform.patch \ 19 file://0001-Add-linux-oe-g-platform.patch \
20 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 20 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -32,7 +32,7 @@ SRC_URI += "\
32 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 32 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
33 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ 33 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
34 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 34 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
35 file://0001-qfloat16-check-for-__ARM_FP-2.patch \ 35 file://0017-qfloat16-check-for-__ARM_FP-2.patch \
36" 36"
37 37
38# for syncqt 38# for syncqt
@@ -295,4 +295,4 @@ sed -i \
295 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 295 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
296} 296}
297 297
298SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04" 298SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index b289914b..9b837f08 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 = "7c50ad366e8e40996a3b75a31b9834f6f667bde6" 11SRCREV = "f047b1a9bb73d4b6df24729435e4156dfb84e90e"
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/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb
index db0bb8e6..a32bcefb 100644
--- a/recipes-qt/qt5/qtcoap_git.bb
+++ b/recipes-qt/qt5/qtcoap_git.bb
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
11 11
12DEPENDS += "qtbase" 12DEPENDS += "qtbase"
13 13
14SRCREV = "18289e7c1d2778460dccb1135fe283bd234954ad" 14SRCREV = "bc4dca032f385658898db017af110f4d8e29816d"
diff --git a/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch b/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch
index 09c92ccb..4b11b405 100644
--- a/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch
+++ b/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch
@@ -1,4 +1,4 @@
1From 8f79162cdbf6e9df3aea6762124ba1a6b25f5c0a Mon Sep 17 00:00:00 2001 1From 872f3db59b77c09b052733210e49c7770381d93a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 29 Jan 2019 20:29:19 -0800 3Date: Tue, 29 Jan 2019 20:29:19 -0800
4Subject: [PATCH] Add missing header for errno 4Subject: [PATCH] Add missing header for errno
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 5a93d066..70921fc3 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,bluez5"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "8f2d6640f959e35a8fd033a50aa57cb13b673cbb" 22SRCREV = "13b15ab1b1ee2ad56d0d37b07d694fbfc22e97a3"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 78de05b3..d55adc3e 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 = "cc7f4769a02421575c9f5a61d9b3687af79201dd" 11SRCREV = "af4466c7af7345a2a92f2523b29e79ce22205003"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch b/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch
index 0152574a..262ad95e 100644
--- a/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch
+++ b/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch
@@ -1,4 +1,4 @@
1From 793ddd0d9fc0d86425a0aa43709445c5ff12a464 Mon Sep 17 00:00:00 2001 1From 2ca54b2296463f626f8438825907610cb22169fc Mon Sep 17 00:00:00 2001
2From: Piotr Tworek <tworaz@tworaz.net> 2From: Piotr Tworek <tworaz@tworaz.net>
3Date: Wed, 3 Jul 2019 01:13:40 +0200 3Date: Wed, 3 Jul 2019 01:13:40 +0200
4Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to locate qmlcachegen 4Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to locate qmlcachegen
@@ -30,6 +30,3 @@ index 75fbb0fcf3..1e949cd40c 100644
30 if(NOT EXISTS \"${compiler_path}\" ) 30 if(NOT EXISTS \"${compiler_path}\" )
31 message(FATAL_ERROR \"The package \\\"Qt5QuickCompilerConfig\\\" references the file 31 message(FATAL_ERROR \"The package \\\"Qt5QuickCompilerConfig\\\" references the file
32 \\\"${compiler_path}\\\" 32 \\\"${compiler_path}\\\"
33--
342.21.0
35
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index ad7f1967..a66a646b 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -26,6 +26,6 @@ do_install_append_class-nativesdk() {
26 rm -rf ${D}${OE_QMAKE_PATH_QML} 26 rm -rf ${D}${OE_QMAKE_PATH_QML}
27} 27}
28 28
29SRCREV = "ecc092fa5519e77a47ef560f0137b4cd5f417c5e" 29SRCREV = "4080025fed9d43a78b578bcab67397712459d28c"
30 30
31BBCLASSEXTEND =+ "native nativesdk" 31BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index a130c86e..90411c44 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 = "7d610c6b1a437235cba38848c1af9afd5556dc73" 17SRCREV = "2d5c3c24925bf96f48789fbc0e1b78371ba1170e"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 973a2b7a..0c733970 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 = "417dff666bd5a9e5a09b67780b0ffa8a496cbe92" 21SRCREV = "b38eddb4a5aff6dc408b99124ef3c43d80ee88cb"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index d1905873..bdf6340a 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "a743e1427b4ce9b4f1c43d3456679c09cee7b4e0" 28SRCREV = "9fe1f2e918d39031852805f1add23125c061d3c3"
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb
index 5544c62f..c85287d0 100644
--- a/recipes-qt/qt5/qtknx_git.bb
+++ b/recipes-qt/qt5/qtknx_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "4443f12461fc9cab42f4229454a390bd9e1ec4a4" 12SRCREV = "6cdc937d5cbfc4ca6b0520c27d0747a66ccb1879"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index d8caaf2b..d0969b12 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -36,7 +36,7 @@ SRC_URI += " \
36 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 36 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
37" 37"
38 38
39SRCREV_qtlocation = "667af08a388ffc3441adc5b8e73f2f8797b274c5" 39SRCREV_qtlocation = "b8cc5f3ae51cec793f1a962db88e3c251c983298"
40SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" 40SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53"
41 41
42SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 42SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb
index 541ca55f..9f5d51cc 100644
--- a/recipes-qt/qt5/qtlottie_git.bb
+++ b/recipes-qt/qt5/qtlottie_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase qtdeclarative" 10DEPENDS += "qtbase qtdeclarative"
11 11
12SRCREV = "553ec1bc799f344a12e34c91720e13a469d85365" 12SRCREV = "2c681d20c0afd203876bfd733b559eb021aa7cdf"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index af28b74b..4d690964 100644
--- a/recipes-qt/qt5/qtmqtt_git.bb
+++ b/recipes-qt/qt5/qtmqtt_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "72257654cc6f065f64c9218864e1be5f66738e8a" 12SRCREV = "4b3201059dfc2fc5038910c51eb8ca9d75e98765"
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 838044a1..2864cb81 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 dd3b3190fd65ac636afd55c1d2e746c9fe7b6df0 Mon Sep 17 00:00:00 2001 1From c39c68f73c86378897dbc6f59b48c2ced1eaa72f 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
@@ -67,7 +67,7 @@ index 00000000..24236976
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 4b68f47a..dade1382 100644 70index e1468fe3..a77a9d6a 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 @@
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index b24f2a4c..11b53496 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -27,8 +27,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream
27 27
28CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" 28CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}"
29 29
30# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.12 30# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.13
31# 5.12.meta-qt5.3 31# 5.13.meta-qt5.1
32SRC_URI += "\ 32SRC_URI += "\
33 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ 33 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
34" 34"
@@ -37,4 +37,4 @@ SRC_URI += "\
37# http://errors.yoctoproject.org/Errors/Build/44914/ 37# http://errors.yoctoproject.org/Errors/Build/44914/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 39
40SRCREV = "f5c4fdd1f57bfbcb0a286ca10de5f6d5d0e47047" 40SRCREV = "dce51b45e8d50ad37fea3debb51a84d62e944b5d"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index a63a29e8..309e8189 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "8bc01cbfe15843ab0ea6e9b9731c4eab83dec1ab" 12SRCREV = "ee0ce46332d364e76e9ec2b0adf7e5cbda504863"
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index b7bdd4ec..9f72c1bf 100644
--- a/recipes-qt/qt5/qtopcua_git.bb
+++ b/recipes-qt/qt5/qtopcua_git.bb
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
18 18
19DEPENDS += "qtbase" 19DEPENDS += "qtbase"
20 20
21SRCREV = "3a75d0ac951d9ef165d1f33e9812be9346a6c1f4" 21SRCREV = "b4588093a5a32d12700afa9e0f0ff54df57ffd66"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index 846e6eda..4505837e 100644
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtbase qtdeclarative" 11DEPENDS += "qtbase qtdeclarative"
12 12
13SRCREV = "d7b00a49803412caf6a0b415974ff2f4c3adf7f7" 13SRCREV = "cc094b80bffd972a1dc071e745888b213dde44f5"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 73f9c3d7..75ad8b56 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 qtdeclarative-native" 11DEPENDS += "qtdeclarative qtdeclarative-native"
12 12
13SRCREV = "ea80013b2e990c8c28a9dfe7d6afaaa250bf2402" 13SRCREV = "c0fb745acdbed0828e3b66f6a6705203a2754591"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index a5228fbd..16afde6a 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
18" 18"
19 19
20SRCREV = "5f7e823d67e615727c8e36aafc6baadfc105c67f" 20SRCREV = "9a5e84b8f9ca0eeda8170eb93c093f3ab25de988"
diff --git a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch
index c587e2e8..41ac90f1 100644
--- a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch
@@ -1,4 +1,4 @@
1From fcb448d2e366ca30a18e4cb45181b8832b8884d5 Mon Sep 17 00:00:00 2001 1From c4b36e140b1938c19e06e20c55d0861e67763912 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 7 Jun 2017 15:17:12 +0300 3Date: Wed, 7 Jun 2017 15:17:12 +0300
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
diff --git a/recipes-qt/qt5/qtremoteobjects/0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
index caf08de4..35fef269 100644
--- a/recipes-qt/qt5/qtremoteobjects/0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
+++ b/recipes-qt/qt5/qtremoteobjects/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
@@ -1,4 +1,4 @@
1From 30d1467553f75ba94baa4569c0222c5d407f275c Mon Sep 17 00:00:00 2001 1From 11390088fdb719ee6ccb07c5ca98bb8e44cdef23 Mon Sep 17 00:00:00 2001
2From: ibinderwolf <daniel@bluepattern.net> 2From: ibinderwolf <daniel@bluepattern.net>
3Date: Wed, 26 Jun 2019 09:46:48 +0200 3Date: Wed, 26 Jun 2019 09:46:48 +0200
4Subject: [PATCH] cmake Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS 4Subject: [PATCH] cmake Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 904390d4..8f15b1fe 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -11,11 +11,11 @@ require qt5-git.inc
11 11
12DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" 12DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
13 13
14# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.12 14# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.13
15# 5.12.meta-qt5.2 15# 5.13.meta-qt5.1
16SRC_URI += " \ 16SRC_URI += " \
17 file://0001-Allow-a-tools-only-build.patch \ 17 file://0001-Allow-a-tools-only-build.patch \
18 file://0001-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 18 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
19" 19"
20 20
21PACKAGECONFIG ??= "" 21PACKAGECONFIG ??= ""
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "e7b07a60408285128dedb373316801294ca941b0" 28SRCREV = "44d51ea7b45b2dce1b6772217269a4d1dff88a80"
29 29
30BBCLASSEXTEND += "native nativesdk" 30BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch
index e789ff58..980e79be 100644
--- a/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch
+++ b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch
@@ -1,4 +1,4 @@
1From 9f06841c9ff8e50c604fbd0f100e2e3ea4242309 Mon Sep 17 00:00:00 2001 1From c04b2d1f2b465e88d23b12cc70e27b6325f65b03 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 23 Aug 2018 02:58:14 +0000 3Date: Thu, 23 Aug 2018 02:58:14 +0000
4Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems 4Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 4789cade..0101da83 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \
11 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 11 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
12" 12"
13 13
14# Patches from https://github.com/meta-qt5/qtscript/commits/b5.12 14# Patches from https://github.com/meta-qt5/qtscript/commits/b5.13
15# 5.12.meta-qt5.3 15# 5.13.meta-qt5.1
16SRC_URI += " \ 16SRC_URI += " \
17 file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ 17 file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \
18" 18"
@@ -36,4 +36,4 @@ DEPENDS += "qtbase"
36# http://errors.yoctoproject.org/Errors/Build/44915/ 36# http://errors.yoctoproject.org/Errors/Build/44915/
37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
38 38
39SRCREV = "9401306e2db3a1756aab958d0939d12c8d5f46e0" 39SRCREV = "18bade63bdcd1d8fcba013f788e114774efa0e4f"
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 b6745fa3..22ec7e4f 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 490c1ce97d93e9eed6fe5789e526a8b8c22ed230 Mon Sep 17 00:00:00 2001 1From 5f311180f7f74fdb3be8efc45a99411f98a1140b 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 1b0e51e7..cdad9d76 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 = "cb8388ac1de37ff31786cd1bd4723938b76d0f0a" 13SRCREV = "575d92175aec3d6bd84872a9ad00adf924b6993d"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.13
16# 5.12.meta-qt5.2 16# 5.13.meta-qt5.1
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 aad757cc..59cfe0b4 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 = "ce508999540cb125dad40dd250b17e6ad20d542b" 15SRCREV = "e032fe21b6d8d2c92e93ab0ba7a367be23db82b8"
diff --git a/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch b/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch
deleted file mode 100644
index c42af774..00000000
--- a/recipes-qt/qt5/qtserialbus/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From b835affb7851f9b8bc2554f0a38e4b539505a132 Mon Sep 17 00:00:00 2001
2From: Andre Hartmann <aha_1980@gmx.de>
3Date: Mon, 8 Jul 2019 21:35:12 +0200
4Subject: [PATCH] =?UTF-8?q?SocketCAN:=20Fix=20compiler=20error=20"?=
5 =?UTF-8?q?=E2=80=98SIOCGSTAMP=E2=80=99=20was=20not=20declared"?=
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Fixes: QTBUG-76957
11Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b
12Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
13Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
14---
15Upstream-Status: Backport [https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=43d746c2c0c87c8694e835f3b052317c8fa02482]
16 src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
20index 74b0d1d..a2da146 100644
21--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
22+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
23@@ -45,6 +45,7 @@
24
25 #include <linux/can/error.h>
26 #include <linux/can/raw.h>
27+#include <linux/sockios.h>
28 #include <errno.h>
29 #include <unistd.h>
30 #include <net/if.h>
31--
322.23.0
33
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index b0547923..07032cdb 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,6 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRC_URI += "file://0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-decl.patch" 14SRCREV = "9c498a990646f6d51b461a246b7cce477423721a"
15
16SRCREV = "b18c452fdbe09c54caacb4323dea65b3746485e5"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 648460db..886b8a63 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "2f2b747ebc4dd982caede82a0a931ad73e4cd462" 15SRCREV = "2216279ffd43fb84042da2faa5bc432770351ec3"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index e7d8872d..cd59f8f8 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "3a4c634241f7271ddfbb840a42d6bf863b46ccea" 15SRCREV = "582bbf973f608e8a3b9d5e3b8318eb995930e4a0"
diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch
index 2f55a4b7..93a67bf6 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 49be7a63b155004c612c7e9e0c671502ecba2c70 Mon Sep 17 00:00:00 2001 1From a42f74d9572f785489daf2fa3de5f36269e9bfef 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 080aba03..100370a4 100644 19index b63be28c..90d9e114 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 @@
@@ -25,7 +25,7 @@ index 080aba03..100370a4 100644
25 BROWSER = qtwebkit 25 BROWSER = qtwebkit
26 } else { 26 } else {
27 BROWSER = qtextbrowser 27 BROWSER = qtextbrowser
28@@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \ 28@@ -77,7 +77,7 @@ SOURCES += aboutdialog.cpp \
29 openpagesmanager.cpp \ 29 openpagesmanager.cpp \
30 openpagesswitcher.cpp 30 openpagesswitcher.cpp
31 31
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 24fb9b7b..d67a1e7e 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 8bcf6e4204f77ec656310e5ada92c27990107477 Mon Sep 17 00:00:00 2001 1From 17e39873d9655339fa32e3b1b29ef2254c52bc2e Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 18 Feb 2019 10:45:03 +0200 3Date: Mon, 18 Feb 2019 10:45:03 +0200
4Subject: [PATCH] linguist-tools cmake: allow overriding the location for 4Subject: [PATCH] linguist-tools cmake: allow overriding the location for
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index ba0957ac..12cde25f 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = " \
14 14
15DEPENDS += "qtbase qtdeclarative qtxmlpatterns chrpath-replacement-native" 15DEPENDS += "qtbase qtdeclarative qtxmlpatterns chrpath-replacement-native"
16EXTRANATIVEPATH += "chrpath-native" 16EXTRANATIVEPATH += "chrpath-native"
17# Patches from https://github.com/meta-qt5/qttools/commits/b5.12 17# Patches from https://github.com/meta-qt5/qttools/commits/b5.13
18# 5.12.meta-qt5.2 18# 5.13.meta-qt5.1
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 \
@@ -41,7 +41,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
41 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ 41 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
42" 42"
43 43
44SRCREV = "cc9250477eaa71a3f3ffd050591d4a9d835288ca" 44SRCREV = "78f52a4027da110bf14468b575c7262b4d28d65e"
45 45
46BBCLASSEXTEND = "native nativesdk" 46BBCLASSEXTEND = "native nativesdk"
47 47
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index bbaee2ef..f36cacf6 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ 98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
99" 99"
100 100
101SRCREV = "88266670663256f40019e7163092e17401557d5f" 101SRCREV = "36022c8e9263c1940710cd214965979e9bd8a036"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index c36e94c0..a6782f46 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
71 71
72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" 72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
73 73
74SRCREV = "2413bc23c5f9995752fdd03d56e480d661fc6fbc" 74SRCREV = "8fc2c34c670fb9bc9ed2393b2d2e1592a74dbfb0"
diff --git a/recipes-qt/qt5/qtwayland/0001-Fix-use-of-private-dependency.patch b/recipes-qt/qt5/qtwayland/0001-Fix-use-of-private-dependency.patch
deleted file mode 100644
index 3cf195db..00000000
--- a/recipes-qt/qt5/qtwayland/0001-Fix-use-of-private-dependency.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From f4636b934f90b2a07b09f1925a86440cf1944d08 Mon Sep 17 00:00:00 2001
2From: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
3Date: Wed, 24 Jul 2019 23:40:55 +0200
4Subject: [PATCH] Fix use of private dependency
5
6With 0761173a, Linux SPI Accessibility bridge was added to
7the Wayland QPA plugin, but this had a bad side-effect to
8QtWaylandClient.
9
10Linux Accessibility support is a private module, this means we have
11to link to it with QT_PRIVATE not QT, otherwise CMake and pkg-config
12files for Qt5WaylandClient will depend on it.
13
14Change-Id: I6182267f97adc2cd5bd66895df148a6a45614f45
15Fixes: QTBUG-76042
16Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
17---
18 src/client/client.pro | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/src/client/client.pro b/src/client/client.pro
22index db91bd69..4233ac95 100644
23--- a/src/client/client.pro
24+++ b/src/client/client.pro
25@@ -20,7 +20,7 @@ qtConfig(xkbcommon) {
26 }
27
28 qtHaveModule(linuxaccessibility_support_private): \
29- QT += linuxaccessibility_support_private
30+ QT_PRIVATE += linuxaccessibility_support_private
31
32 QMAKE_USE += wayland-client
33
34--
352.21.0
36
diff --git a/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch b/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch
index 1f15ea0d..93f187dc 100644
--- a/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch
+++ b/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch
@@ -1,4 +1,4 @@
1From ccd576151ecf174dbfbb854dbcbfe55a5f723124 Mon Sep 17 00:00:00 2001 1From 4df2574a86c2ce86c97da0795dec29438b0c0024 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 6 Oct 2019 21:44:38 -0700 3Date: Sun, 6 Oct 2019 21:44:38 -0700
4Subject: [PATCH] tst_seatv4: Include <array> 4Subject: [PATCH] tst_seatv4: Include <array>
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp 15diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp
16index 7dc2e727..3ddbb971 100644 16index 1d6fb6b9..4c5732da 100644
17--- a/tests/auto/client/seatv4/tst_seatv4.cpp 17--- a/tests/auto/client/seatv4/tst_seatv4.cpp
18+++ b/tests/auto/client/seatv4/tst_seatv4.cpp 18+++ b/tests/auto/client/seatv4/tst_seatv4.cpp
19@@ -36,7 +36,7 @@ 19@@ -36,7 +36,7 @@
@@ -25,6 +25,3 @@ index 7dc2e727..3ddbb971 100644
25 using namespace MockCompositor; 25 using namespace MockCompositor;
26 26
27 // wl_seat version 5 was introduced in wayland 1.10, and although that's pretty old, 27 // wl_seat version 5 was introduced in wayland 1.10, and although that's pretty old,
28--
292.23.0
30
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 05f8b088..7cfbcaa1 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -13,9 +13,7 @@ LIC_FILES_CHKSUM = " \
13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
14" 14"
15 15
16SRC_URI += "file://0001-Fix-use-of-private-dependency.patch \ 16SRC_URI += "file://0001-tst_seatv4-Include-array.patch"
17 file://0001-tst_seatv4-Include-array.patch \
18"
19 17
20PACKAGECONFIG ?= " \ 18PACKAGECONFIG ?= " \
21 wayland-client \ 19 wayland-client \
@@ -41,7 +39,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
41 39
42EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 40EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
43 41
44SRCREV = "79037e46eeb00e20c5f3bbe7d0de4b702af86884" 42SRCREV = "615aa208d131ab99e967725504fcb16fdda4ea83"
45 43
46BBCLASSEXTEND =+ "native nativesdk" 44BBCLASSEXTEND =+ "native nativesdk"
47 45
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index b468ecb1..34d4250b 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 = "fdba7f6e285d35757190d99f9880e3bd0380e254" 15SRCREV = "3be3e5756f867b34f29f18cbda9b0c2807017a71"
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index 610b703f..169ed078 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From 468ed461a955cc1ab3d890178546b79b9d001de9 Mon Sep 17 00:00:00 2001 1From f3f2b6b42d546280a17169ea340d8bef82496516 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
@@ -73,10 +73,10 @@ index b6bf9cfc..ae419b1a 100644
73 msvc:!clang_cl: gn_gen_args += --use-lto 73 msvc:!clang_cl: gn_gen_args += --use-lto
74 74
75diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri 75diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
76index fcce4c31..e3384e58 100644 76index f45c418f..df8ac00b 100644
77--- a/src/core/config/linux.pri 77--- a/src/core/config/linux.pri
78+++ b/src/core/config/linux.pri 78+++ b/src/core/config/linux.pri
79@@ -117,7 +117,7 @@ contains(QT_ARCH, "mips") { 79@@ -123,7 +123,7 @@ contains(QT_ARCH, "mips") {
80 80
81 host_build { 81 host_build {
82 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" 82 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
index 96c9d101..ffdf0d05 100644
--- a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
@@ -1,4 +1,4 @@
1From cdebd3f7775cfae7ac797774c63478d55d5b60ea Mon Sep 17 00:00:00 2001 1From 0402c28580b96c8c8953ea85144f4874f8768622 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 12 Dec 2017 16:06:14 +0200 3Date: Tue, 12 Dec 2017 16:06:14 +0200
4Subject: [PATCH] musl: don't use pvalloc as it's not available on musl 4Subject: [PATCH] musl: don't use pvalloc as it's not available on musl
diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
index e3d3c9bb..c56c68f1 100644
--- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
@@ -1,4 +1,4 @@
1From 7b2e6cae9afa28571ccdc2a9224fb86caa88cd29 Mon Sep 17 00:00:00 2001 1From 6b5a763cd223ab14bb840738b3871a79d1fb69ea Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 14 Dec 2017 11:28:10 +0200 3Date: Thu, 14 Dec 2017 11:28:10 +0200
4Subject: [PATCH] musl: link against libexecinfo 4Subject: [PATCH] musl: link against libexecinfo
@@ -10,10 +10,10 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/src/core/core_module.pro b/src/core/core_module.pro 12diff --git a/src/core/core_module.pro b/src/core/core_module.pro
13index 2bfbc65b..7134a5d7 100644 13index b220af4a..ff54e5d7 100644
14--- a/src/core/core_module.pro 14--- a/src/core/core_module.pro
15+++ b/src/core/core_module.pro 15+++ b/src/core/core_module.pro
16@@ -52,7 +52,7 @@ linux { 16@@ -58,7 +58,7 @@ linux {
17 POST_TARGETDEPS += $$NINJA_TARGETDEPS 17 POST_TARGETDEPS += $$NINJA_TARGETDEPS
18 18
19 19
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
index 97b09e70..1bcea021 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
@@ -1,4 +1,4 @@
1From f3345ad713ae81e4f914084b089ca7983bb76581 Mon Sep 17 00:00:00 2001 1From 97bbc1219c360f3a27aa9b8bf21dd4b755c979b6 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
index 295b18e0..1c975aed 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
@@ -1,4 +1,4 @@
1From 079403c8f4e9fc5e1ea81dcd7fa126b351c91094 Mon Sep 17 00:00:00 2001 1From 90881e8b608658e766bcf96fc62d97b39e005f01 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Dec 2018 16:58:04 -0800 3Date: Sun, 23 Dec 2018 16:58:04 -0800
4Subject: [PATCH] chromium: stack pointer clobber 4Subject: [PATCH] chromium: stack pointer clobber
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
index cc534fad..4730a6bd 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
@@ -1,4 +1,4 @@
1From f290da1132af09f4cba13d5e551c75621b623247 Mon Sep 17 00:00:00 2001 1From 156dd87c5579c355a8668c6b78c3853f2d288846 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Feb 2019 19:28:59 -0800 3Date: Sat, 2 Feb 2019 19:28:59 -0800
4Subject: [PATCH] chromium: fix build with clang 4Subject: [PATCH] chromium: fix build with clang
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 2 insertions(+), 25 deletions(-) 10 1 file changed, 2 insertions(+), 25 deletions(-)
11 11
12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
13index dbf94c9ab6b..6f2eff6f5ef 100644 13index 17f486447fe..06c93e5b3cf 100644
14--- a/chromium/build/config/compiler/BUILD.gn 14--- a/chromium/build/config/compiler/BUILD.gn
15+++ b/chromium/build/config/compiler/BUILD.gn 15+++ b/chromium/build/config/compiler/BUILD.gn
16@@ -570,13 +570,6 @@ config("compiler") { 16@@ -570,13 +570,6 @@ config("compiler") {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
index e54cdc6b..6ad1febf 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -1,4 +1,4 @@
1From 3cacf1082e11c8047a42eb74dfa0e34f37995d92 Mon Sep 17 00:00:00 2001 1From ed03bdbaaa07414a310414e9fa7624acf6241b19 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 5 Feb 2019 14:32:20 -0800 3Date: Tue, 5 Feb 2019 14:32:20 -0800
4Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm 4Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
index d8eca0c6..4e976b42 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
@@ -1,4 +1,4 @@
1From 27d1c407b98979445e216c6fd105e78014e928b1 Mon Sep 17 00:00:00 2001 1From 85a1cd44983263b59942d83bd7626ed4700b29fe Mon Sep 17 00:00:00 2001
2From: Johannes Pointner <johannes.pointner@br-automation.com> 2From: Johannes Pointner <johannes.pointner@br-automation.com>
3Date: Fri, 3 May 2019 09:12:38 +0200 3Date: Fri, 3 May 2019 09:12:38 +0200
4Subject: [PATCH] chromium: Do not try to set the guessed values for 4Subject: [PATCH] chromium: Do not try to set the guessed values for
@@ -17,7 +17,7 @@ Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
17 1 file changed, 9 deletions(-) 17 1 file changed, 9 deletions(-)
18 18
19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
20index 6f2eff6f5ef..57a950a435a 100644 20index 06c93e5b3cf..8ba0f8a3109 100644
21--- a/chromium/build/config/compiler/BUILD.gn 21--- a/chromium/build/config/compiler/BUILD.gn
22+++ b/chromium/build/config/compiler/BUILD.gn 22+++ b/chromium/build/config/compiler/BUILD.gn
23@@ -809,15 +809,6 @@ config("compiler_cpu_abi") { 23@@ -809,15 +809,6 @@ config("compiler_cpu_abi") {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
index b97b2dca..7f6e4bdf 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
@@ -1,4 +1,4 @@
1From 564eb25c70160f6b3f20a6eb5727427efc78b695 Mon Sep 17 00:00:00 2001 1From 89338139ee40ab93065a915dcde9af79ba52b381 Mon Sep 17 00:00:00 2001
2From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> 2From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
3Date: Thu, 8 Mar 2018 15:39:55 +0100 3Date: Thu, 8 Mar 2018 15:39:55 +0100
4Subject: [PATCH] chromium: aarch64 skia build fix 4Subject: [PATCH] chromium: aarch64 skia build fix
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
index bdab820a..6d9f73e4 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
@@ -1,22 +1,24 @@
1From 5408581e2ac5225ba2c6d6b0d88636751930577d Mon Sep 17 00:00:00 2001
1From: Jiri Slaby <jslaby@suse.cz> 2From: Jiri Slaby <jslaby@suse.cz>
2Date: Thu, 11 Jul 2019 09:35:13 +0200 3Date: Thu, 11 Jul 2019 09:35:13 +0200
3Subject: fix build after y2038 changes in glibc 4Subject: [PATCH] chromium: fix build after y2038 changes in glibc
4Patch-mainline: submitted on 2019/07/11
5References: QTBUG-76963
6 5
7SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that 6SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that
8file wherever needed. 7file wherever needed.
9 8
10Signed-off-by: Jiri Slaby <jslaby@suse.cz> 9Signed-off-by: Jiri Slaby <jslaby@suse.cz>
11--- 10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12Upstream-Status: Pending
13 11
12Upstream-Status: Pending
13---
14 chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 + 14 chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 +
15 1 file changed, 1 insertion(+) 15 1 file changed, 1 insertion(+)
16 16
17diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
18index c38d7fdfac9..575e0001ca1 100644
17--- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc 19--- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
18+++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc 20+++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
19@@ -67,6 +67,7 @@ typedef void* SockOptArg; 21@@ -71,6 +71,7 @@ typedef void* SockOptArg;
20 #endif // WEBRTC_POSIX 22 #endif // WEBRTC_POSIX
21 23
22 #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) 24 #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
@@ -24,6 +26,3 @@ Upstream-Status: Pending
24 26
25 int64_t GetSocketRecvTimestamp(int socket) { 27 int64_t GetSocketRecvTimestamp(int socket) {
26 struct timeval tv_ioctl; 28 struct timeval tv_ioctl;
27--
282.21.0
29
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index c040504a..e03df6f4 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -1,4 +1,4 @@
1From 34ab4deee6cffc8e6876e991ceabe6baf7308b6f Mon Sep 17 00:00:00 2001 1From be5e6f573faedf13d6f327bd168a3d90e840a3ae Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:01:12 -0700 3Date: Fri, 7 Jul 2017 14:01:12 -0700
4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not 4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index 14b469e1..6df3ce0e 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
1From 6eec3f3105b0f6b37fdb52efbb4b3820e1d25846 Mon Sep 17 00:00:00 2001 1From 51795812310685d2a392e3592b238a6fb92b75d3 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch
index f6c23b0e..a4cffc76 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-include-fcntl.h-for-loff_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch
@@ -1,4 +1,4 @@
1From 87a8cb561129701c8ba94dc927c45cbbb9f5c75b Mon Sep 17 00:00:00 2001 1From 67c66a3af0a0268f1ab9a9af47d002cd75b57ca1 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index ca31a456..c09d7ad0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
1From bf780e32b4de82b55368967642bc8f975a93d619 Mon Sep 17 00:00:00 2001 1From 612a1903c096dc497ecf2324a97fdab000dc1ae3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:38:37 -0700 3Date: Fri, 7 Jul 2017 14:38:37 -0700
4Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t 4Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch
index 8ca842eb..e2c738ae 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
1From 0dbb65a8a1633a8fe1704ddc0f299799998cc9b0 Mon Sep 17 00:00:00 2001 1From 4ba6b9ae21289cbaa04b531082e1089c06c845bc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:54:38 -0700 3Date: Fri, 7 Jul 2017 14:54:38 -0700
4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction 4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
index f995676a..ec54908b 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -1,4 +1,4 @@
1From a74e3dd8323dedb012bce6cf5995ae2a78efd5de Mon Sep 17 00:00:00 2001 1From 02c6554c372709fd8573d66e4f128ffe0d74f237 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
index c4e6ce02..c9080a07 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
@@ -1,4 +1,4 @@
1From 1a11d644434ace1eaf72d2cc8bb3dec350655db5 Mon Sep 17 00:00:00 2001 1From 1099551ba6ee52734d14c29232837720a7454669 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:12:39 -0700 3Date: Fri, 7 Jul 2017 15:12:39 -0700
4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from 4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index 9f1f2b10..459f13ba 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
1From 319b50c1cb9ab3beaf52d5119feb9ba2283aaa13 Mon Sep 17 00:00:00 2001 1From 106c8aa7bc2dab7f7b04014d85d93082fae20632 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:27:50 -0700 3Date: Fri, 7 Jul 2017 15:27:50 -0700
4Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc 4Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index 2bb6d115..dbab1ab2 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -1,4 +1,4 @@
1From da261d4402fac21694aeca82247974f4043934bc Mon Sep 17 00:00:00 2001 1From b5e59b5ca71ecab2f5515162fad92524230736ec Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:39:57 -0700 3Date: Fri, 7 Jul 2017 15:39:57 -0700
4Subject: [PATCH] chromium: musl: Do not define __sbrk on musl 4Subject: [PATCH] chromium: musl: Do not define __sbrk on musl
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
index e1754c1a..80ea3ae1 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,4 +1,4 @@
1From 9f526ef03263867d7fb305d5fc91f95e2c9564ea Mon Sep 17 00:00:00 2001 1From 3628242064040d8ac5c20a85dc04ba8166cc4065 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
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
index 16c958c9..58c869fa 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -1,4 +1,4 @@
1From 295afaa918bafc70df23c2c6740e0ef3cc3a7ba5 Mon Sep 17 00:00:00 2001 1From c98e81a6c88d056a6e093f6fbcc985bd2d7b1ed4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Sep 2018 12:35:07 -0700 3Date: Tue, 25 Sep 2018 12:35:07 -0700
4Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on 4Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
index 287ef7e6..bb0d13a7 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
@@ -1,4 +1,4 @@
1From 73406a38f36c4d5a408b575efdf30f52bf38f75e Mon Sep 17 00:00:00 2001 1From 350739f3986367253e476093eaaa653b7320c54d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Sep 2018 12:59:05 -0700 3Date: Tue, 25 Sep 2018 12:59:05 -0700
4Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get 4Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch
index 71d76413..a12e28c4 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch
@@ -1,4 +1,4 @@
1From 43c53d6afde5183bc2da3b5b698314d050b2ff5d Mon Sep 17 00:00:00 2001 1From debbdd4f419ef2d48c3e1fb0128dc4ac6c9f687b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Dec 2018 16:58:04 -0800 3Date: Sun, 23 Dec 2018 16:58:04 -0800
4Subject: [PATCH] chromium: musl: pread pwrite 4Subject: [PATCH] chromium: musl: pread pwrite
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 009d2529..dc41c517 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -138,7 +138,7 @@ RDEPENDS_${PN}-examples += " \
138QT_MODULE_BRANCH_CHROMIUM = "73-based" 138QT_MODULE_BRANCH_CHROMIUM = "73-based"
139 139
140# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13 140# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13
141# 5.13.meta-qt5.1 141# 5.13.meta-qt5.2
142SRC_URI += " \ 142SRC_URI += " \
143 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 143 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
144 file://0001-Force-host-toolchain-configuration.patch \ 144 file://0001-Force-host-toolchain-configuration.patch \
@@ -149,7 +149,7 @@ SRC_URI_append_libc-musl = "\
149" 149"
150 150
151# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/73-based 151# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/73-based
152# 73-based.meta-qt5.2 152# 73-based.meta-qt5.3
153SRC_URI += " \ 153SRC_URI += " \
154 file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ 154 file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
155 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ 155 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
@@ -161,23 +161,23 @@ SRC_URI += " \
161" 161"
162 162
163SRC_URI_append_libc-musl = "\ 163SRC_URI_append_libc-musl = "\
164 file://chromium/0007-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ 164 file://chromium/0008-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
165 file://chromium/0008-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ 165 file://chromium/0009-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
166 file://chromium/0009-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ 166 file://chromium/0010-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
167 file://chromium/0010-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ 167 file://chromium/0011-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
168 file://chromium/0011-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ 168 file://chromium/0012-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
169 file://chromium/0012-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ 169 file://chromium/0013-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
170 file://chromium/0013-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ 170 file://chromium/0014-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
171 file://chromium/0014-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ 171 file://chromium/0015-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
172 file://chromium/0015-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ 172 file://chromium/0016-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
173 file://chromium/0016-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ 173 file://chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
174 file://chromium/0017-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \ 174 file://chromium/0018-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
175 file://chromium/0018-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ 175 file://chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
176 file://chromium/0019-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 176 file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
177" 177"
178 178
179SRCREV_qtwebengine = "5d4bac57a0191287a2fc345f6b398fb1f5d08517" 179SRCREV_qtwebengine = "556576b55f6b4404c71c74a5ef8e21f87ed09854"
180SRCREV_chromium = "8a28c0bb19fc8627812cb7c3154408b71ff2bf5e" 180SRCREV_chromium = "843d70ac87de7482c1c1195aa73899bc05efc8f3"
181SRCREV = "${SRCREV_qtwebengine}" 181SRCREV = "${SRCREV_qtwebengine}"
182 182
183SRCREV_FORMAT = "qtwebengine_chromium" 183SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index b5760229..db56a0cb 100644
--- a/recipes-qt/qt5/qtwebglplugin_git.bb
+++ b/recipes-qt/qt5/qtwebglplugin_git.bb
@@ -18,4 +18,4 @@ do_configure_prepend() {
18 18
19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
20 20
21SRCREV = "15637e6d824bca5d149147207a98cbc016fbbef6" 21SRCREV = "11b83427d9770f50b5d8ec420ec810e393f3af8c"
diff --git a/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch
index 4b2b2759..a237d03d 100644
--- a/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch
+++ b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch
@@ -1,4 +1,4 @@
1From 1a4e33ac630b0e4f285e238479900f0e10c6d15f Mon Sep 17 00:00:00 2001 1From 34018c2a61045c58f88e09a12ecd62533aa2c2f1 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Mon, 4 Jun 2018 10:35:46 +0200 3Date: Mon, 4 Jun 2018 10:35:46 +0200
4Subject: [PATCH] Do not skip build for cross-compile 4Subject: [PATCH] Do not skip build for cross-compile
diff --git a/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch
index dead46d1..bf79b363 100644
--- a/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch
+++ b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch
@@ -1,4 +1,4 @@
1From 9db9a8850602c2446b1a7ee96608fd74cf56a342 Mon Sep 17 00:00:00 2001 1From c4ceb318aa1064bfa677cdd800c52155eb1bed3a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 23 Aug 2018 04:06:17 +0000 3Date: Thu, 23 Aug 2018 04:06:17 +0000
4Subject: [PATCH] Fix build with non-glibc libc on musl 4Subject: [PATCH] Fix build with non-glibc libc on musl
diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch
index 23fed74f..ffd8da0f 100644
--- a/recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch
+++ b/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch
@@ -1,4 +1,4 @@
1From 5aa039af074c20bea1398f7f18712dc494a5f138 Mon Sep 17 00:00:00 2001 1From f6576377f8bf2c854d8079b7f309f570b3d2bde4 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com> 2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Fri, 31 Aug 2018 15:42:48 +0900 3Date: Fri, 31 Aug 2018 15:42:48 +0900
4Subject: [PATCH] Fix build bug for armv32 BE. 4Subject: [PATCH] Fix build bug for armv32 BE.
diff --git a/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
index 8c718b47..14cb8aa4 100644
--- a/recipes-qt/qt5/qtwebkit/0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
+++ b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
@@ -1,4 +1,4 @@
1From c00c61a42f9076aecad195b7f72b7db9b3601181 Mon Sep 17 00:00:00 2001 1From 83aa5b3265d7c9f64e754cb890988cf8a5669ce7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 24 Sep 2018 02:11:10 -0700 3Date: Mon, 24 Sep 2018 02:11:10 -0700
4Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths 4Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 2 insertions(+), 2 deletions(-) 14 1 file changed, 2 insertions(+), 2 deletions(-)
15 15
16diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake 16diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
17index 3792def6f..b6cb36bb1 100644 17index 9aed9906e..48638aef4 100644
18--- a/Source/WebKit/PlatformQt.cmake 18--- a/Source/WebKit/PlatformQt.cmake
19+++ b/Source/WebKit/PlatformQt.cmake 19+++ b/Source/WebKit/PlatformQt.cmake
20@@ -510,7 +510,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) 20@@ -512,7 +512,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
21 install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) 21 install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
22 endif () 22 endif ()
23 23
@@ -26,7 +26,7 @@ index 3792def6f..b6cb36bb1 100644
26 set(WebKit_PRI_ARGUMENTS 26 set(WebKit_PRI_ARGUMENTS
27 BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" 27 BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
28 LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" 28 LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"
29@@ -734,7 +734,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) 29@@ -737,7 +737,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
30 install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) 30 install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
31 endif () 31 endif ()
32 32
@@ -35,6 +35,3 @@ index 3792def6f..b6cb36bb1 100644
35 set(WebKitWidgets_PRI_ARGUMENTS 35 set(WebKitWidgets_PRI_ARGUMENTS
36 BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE" 36 BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
37 LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE" 37 LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"
38--
392.19.0
40
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index c5473440..5138e99f 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -9,13 +9,13 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native bison-native" 10DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native bison-native"
11 11
12# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.11 12# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.13
13# 5.11.meta-qt5.2 13# 5.13.meta-qt5.1
14SRC_URI += "\ 14SRC_URI += "\
15 file://0001-Do-not-skip-build-for-cross-compile.patch \ 15 file://0001-Do-not-skip-build-for-cross-compile.patch \
16 file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \ 16 file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \
17 file://0004-Fix-build-bug-for-armv32-BE.patch \ 17 file://0003-Fix-build-bug-for-armv32-BE.patch \
18 file://0001-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ 18 file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \
19" 19"
20 20
21inherit cmake_qt5 perlnative pythonnative 21inherit cmake_qt5 perlnative pythonnative
@@ -75,4 +75,4 @@ PACKAGES_remove = "${PN}-examples"
75 75
76QT_MODULE_BRANCH = "dev" 76QT_MODULE_BRANCH = "dev"
77 77
78SRCREV = "beaeeb99881184fd368c121fcbb1a31c78b794a3" 78SRCREV = "ab1bd15209abaf7effc51dbc2f272c5681af7223"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 11144537..69fd08fd 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 = "b7d892b97697f90b3669dab56358a48fb3542f68" 14SRCREV = "a8bbc056335719830a6b2746b7a85cfa2fd89164"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index dc2a3e4b..9ac6bfd6 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 = "3265fa961a27894faa5b3413fb39c8682266a72f" 22SRCREV = "2746b310f89e99144fff2a07e945a02e8c51d3da"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 31c5b671..74a46c9e 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "7e86e23ee87f2450b3f7103632c3ad2ab082e5eb" 15SRCREV = "0f6f4d20f76eaf55eebfddfe49d9a6335f443d65"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 73631fcd..87e2e626 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -25,7 +25,7 @@ do_configure_prepend() {
25 25
26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
27 27
28SRCREV = "29891df4ce099542635e33891945ba19f3e9572c" 28SRCREV = "74c5be960cbd4709cd8e4dee897cf53c00838128"
29 29
30BBCLASSEXTEND =+ "native nativesdk" 30BBCLASSEXTEND =+ "native nativesdk"
31 31