summaryrefslogtreecommitdiffstats
path: root/recipes-qt
diff options
context:
space:
mode:
authorJani Suonpera <jani.suonpera@qt.io>2020-12-10 09:03:39 +0200
committerMartin 'JaMa' Jansa <Martin.Jansa@gmail.com>2021-01-30 15:20:56 +0100
commit252ec0f59ebf742fcda8d7b647bd583f8cdb90f0 (patch)
tree921fe264e59fe40394e4b38d76020ccea595a0aa /recipes-qt
parent37b95445756b4adafe39a2d2eebdfa7ad76ea308 (diff)
downloadmeta-qt5-252ec0f59ebf742fcda8d7b647bd583f8cdb90f0.tar.gz
Update to Qt 5.15.2
Signed-off-by: Jani Suonpera <jani.suonpera@qt.io> Change-Id: I5992e74cf524f9378dab64503345111b1cc159f2
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb4
-rw-r--r--recipes-qt/qt5/ogl-runtime_git.bb6
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch1
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb4
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch49
-rw-r--r--recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch70
-rw-r--r--recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch18
-rw-r--r--recipes-qt/qt5/qtbase_git.bb6
-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_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch57
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb3
-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.bb4
-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_git.bb2
-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/qtquick3d_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/qtquicktimeline_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb3
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch44
-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.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch18
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch)9
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch71
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch52
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch18
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch24
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch16
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb14
-rw-r--r--recipes-qt/qt5/qtwebglplugin_git.bb2
-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
72 files changed, 199 insertions, 450 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index ff989c2f..4bf81339 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -36,12 +36,10 @@ SRC_URI += "\
36 file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ 36 file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
37 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 37 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
38 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 38 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
39 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
40 file://0013-Disable-ltcg-for-host_build.patch \ 39 file://0013-Disable-ltcg-for-host_build.patch \
41 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 40 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
42 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ 41 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
43 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 42 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
44 file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
45 file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ 43 file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
46 file://0019-Define-__NR_futex-if-it-does-not-exist.patch \ 44 file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
47" 45"
@@ -197,4 +195,4 @@ fakeroot do_generate_qt_environment_file() {
197do_generate_qt_environment_file[umask] = "022" 195do_generate_qt_environment_file[umask] = "022"
198addtask generate_qt_environment_file after do_install before do_package 196addtask generate_qt_environment_file after do_install before do_package
199 197
200SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9" 198SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb
index daa19905..1669382e 100644
--- a/recipes-qt/qt5/ogl-runtime_git.bb
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase qtdeclarative qtquickcontrols2" 10DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
11 11
12QT_MODULE_BRANCH = "2.7" 12QT_MODULE_BRANCH = "master"
13QT_MODULE_BRANCH_EASTL = "master" 13QT_MODULE_BRANCH_EASTL = "master"
14QT_GIT_PROJECT = "qt3dstudio" 14QT_GIT_PROJECT = "qt3dstudio"
15PV = "2.7.0+git${SRCPV}" 15PV = "2.8.0+git${SRCPV}"
16 16
17COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc64).*-linux" 17COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc64).*-linux"
18 18
@@ -22,7 +22,7 @@ SRC_URI += " \
22 file://0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch \ 22 file://0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch \
23" 23"
24 24
25SRCREV_ogl-runtime = "b9b52349d0df29e2eaa30dd13644b9f42d9e4f3e" 25SRCREV_ogl-runtime = "b53aeb784f950d7b2a5ebe38ea37c5bb6f456c9c"
26SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5" 26SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5"
27SRCREV = "${SRCREV_ogl-runtime}" 27SRCREV = "${SRCREV_ogl-runtime}"
28 28
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 00c41813..310cf0ac 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
@@ -28,6 +28,7 @@ index c5232e116..cf5345352 100644
28+ sub_tools.depends -= sub_src 28+ sub_tools.depends -= sub_src
29+ SUBDIRS = sub_tools 29+ SUBDIRS = sub_tools
30+} 30+}
31\ No newline at end of file
31diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri 32diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
32index 8ba2d9a41..e973d93dd 100644 33index 8ba2d9a41..e973d93dd 100644
33--- a/src/3rdparty/assimp/assimp_dependency.pri 34--- a/src/3rdparty/assimp/assimp_dependency.pri
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 5f010680..294cffb4 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -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 = "d1e6bd43de4883c7e40ca0efc10ff4735ba766c5" 39SRCREV = "34171b1d99f55fde1627df3c57eed50480ab2ae7"
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 be709f5f..f1d724dd 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.15" 5QT_MODULE_BRANCH ?= "5.15.2"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
7 7
8# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.15.0+git${SRCPV}" 17PV = "5.15.2+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 7ed63851..4be4aaa8 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -31,12 +31,10 @@ SRC_URI += "\
31 file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ 31 file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
32 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 32 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
33 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 33 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
34 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
35 file://0013-Disable-ltcg-for-host_build.patch \ 34 file://0013-Disable-ltcg-for-host_build.patch \
36 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 35 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
37 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ 36 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
38 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 37 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
39 file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
40 file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ 38 file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
41 file://0019-Define-__NR_futex-if-it-does-not-exist.patch \ 39 file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
42" 40"
@@ -144,4 +142,4 @@ do_install() {
144 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 142 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
145} 143}
146 144
147SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9" 145SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
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 a8d85346..37e0a6a9 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 8442f94819458c79a88ad6177207c0e922a007bd Mon Sep 17 00:00:00 2001 1From c97da220d95091386724e1eadc360ed16ed52dfe 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
@@ -65,10 +65,10 @@ index 934a18a924..0f5b1b6333 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 99b7fe6562..1ddfddb2bd 100644 68index 69d1954306..37f7c9c4a2 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@@ -151,7 +151,7 @@ import_plugins:qtConfig(static) {
72 plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB 72 plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
73 plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) 73 plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
74 isEmpty(plug_path): \ 74 isEmpty(plug_path): \
@@ -77,7 +77,7 @@ index 99b7fe6562..1ddfddb2bd 100644
77 LIBS += $$plug_path/$$plug_type/$$plug_name 77 LIBS += $$plug_path/$$plug_type/$$plug_name
78 } else { 78 } else {
79 LIBS += -l$${plug}$$qtPlatformTargetSuffix() 79 LIBS += -l$${plug}$$qtPlatformTargetSuffix()
80@@ -271,8 +271,8 @@ for(ever) { 80@@ -274,8 +274,8 @@ for(ever) {
81 # static builds: link qml import plugins into the target. 81 # static builds: link qml import plugins into the target.
82 contains(all_qt_module_deps, qml): \ 82 contains(all_qt_module_deps, qml): \
83 qtConfig(static):import_plugins:!host_build:!no_import_scan { 83 qtConfig(static):import_plugins:!host_build:!no_import_scan {
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 f91792c0..751e59d7 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 56eb22b1063d9bbdcf6ec39828e4c3498b72c99c Mon Sep 17 00:00:00 2001 1From 44e37eab48ff04bd20815fd4ae0b5d79d493aabc 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,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
15 1 file changed, 3 insertions(+), 3 deletions(-) 15 1 file changed, 3 insertions(+), 3 deletions(-)
16 16
17diff --git a/configure.pri b/configure.pri 17diff --git a/configure.pri b/configure.pri
18index e775bf046e..a20eded987 100644 18index 49755f7abf..f84862d1ca 100644
19--- a/configure.pri 19--- a/configure.pri
20+++ b/configure.pri 20+++ b/configure.pri
21@@ -876,10 +876,10 @@ defineTest(qtConfOutput_preparePaths) { 21@@ -883,10 +883,10 @@ defineTest(qtConfOutput_preparePaths) {
22 22
23 $${currentConfig}.output.qconfigSource = \ 23 $${currentConfig}.output.qconfigSource = \
24 "/* Installation Info */" \ 24 "/* Installation Info */" \
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 4353d43e..08a79898 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 c4393e037ebfc6bfa1a58ceab29fdb78389cd47e Mon Sep 17 00:00:00 2001 1From 18904a169397f343e75bee5f29fa9ae1444a295f 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
@@ -36,7 +36,7 @@ index 19b3289390..4d0cdf8b5f 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 6dd390ccbd..43b92606d9 100644 39index e397e80fe0..cdb7893e56 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 @@
@@ -46,8 +46,8 @@ index 6dd390ccbd..43b92606d9 100644
46+#include <sched.h> 46+#include <sched.h>
47 #endif 47 #endif
48 48
49 #include "private/qhostinfo_p.h" 49 #include <memory>
50@@ -2199,8 +2200,8 @@ public slots: 50@@ -2200,8 +2201,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/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
deleted file mode 100644
index 147e304d..00000000
--- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 47d2068fa96173b68bcbc45a80a66d7c9cbf4775 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 14 Feb 2018 17:08:43 -0800
4Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem
5
6-isystem fails to build when code uses include_next on certain files e.g.
7
8qtbase/5.10.0+gitAUTOINC+50117d738a-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory
9 #include_next <stdlib.h>
10 ^~~~~~~~~~
11compilation terminated.
12make[2]: *** [Makefile:11592: .obj/qgenericpluginfactory.o] Error 1
13
14Upstream-Status: Pending
15
16Change-Id: Ia47832a6339a6ee59c0a6301fc5e552cd28b1029
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19---
20 mkspecs/common/clang.conf | 2 +-
21 mkspecs/common/gcc-base.conf | 2 +-
22 2 files changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
25index 2499c8b6d8..2e79e083cd 100644
26--- a/mkspecs/common/clang.conf
27+++ b/mkspecs/common/clang.conf
28@@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch
29
30 QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
31
32-QMAKE_CFLAGS_ISYSTEM = -isystem
33+QMAKE_CFLAGS_ISYSTEM =
34 QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
35 QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
36 QMAKE_CFLAGS_LTCG = -flto=thin
37diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
38index 1f919d270a..adf3fead32 100644
39--- a/mkspecs/common/gcc-base.conf
40+++ b/mkspecs/common/gcc-base.conf
41@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g
42 QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
43 QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
44 QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
45-QMAKE_CFLAGS_ISYSTEM = -isystem
46+QMAKE_CFLAGS_ISYSTEM =
47 QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
48 QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
49 QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
diff --git a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
deleted file mode 100644
index 341be6ad..00000000
--- a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 8e9c933cad3bd044b432b5557cf47a9ffea4e318 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 25 Nov 2019 08:27:39 -0800
4Subject: [PATCH] input: Make use of timeval portable for 64bit time_t
5
6This patch avoids using time field of input_event structure which is not available
7on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new
8and keeps old input.h implementation functional as well.
9
10See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
11Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610]
12Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845
13---
14 .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++-
15 .../input/evdevtouch/qevdevtouchhandler.cpp | 7 ++++++-
16 2 files changed, 15 insertions(+), 2 deletions(-)
17
18diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
19index 3555763b89..e7dc57c027 100644
20--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
21+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
22@@ -58,6 +58,11 @@
23 #include <linux/input.h>
24 #endif
25
26+#ifndef input_event_sec
27+#define input_event_sec time.tv_sec
28+#define input_event_usec time.tv_usec
29+#endif
30+
31 QT_BEGIN_NAMESPACE
32
33 Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input")
34@@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state)
35 qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state));
36
37 struct ::input_event led_ie;
38- ::gettimeofday(&led_ie.time, 0);
39+ struct timeval tval;
40+ ::gettimeofday(&tval, 0);
41+ led_ie.input_event_sec = tval.tv_sec;
42+ led_ie.input_event_usec = tval.tv_usec;
43 led_ie.type = EV_LED;
44 led_ie.code = led;
45 led_ie.value = state;
46diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
47index 78728ef4ce..1d65f9b9f7 100644
48--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
49+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
50@@ -58,6 +58,11 @@
51 #include <linux/input.h>
52 #endif
53
54+#ifndef input_event_sec
55+#define input_event_sec time.tv_sec
56+#define input_event_usec time.tv_usec
57+#endif
58+
59 #include <math.h>
60
61 #if QT_CONFIG(mtdev)
62@@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
63
64 // update timestamps
65 m_lastTimeStamp = m_timeStamp;
66- m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0;
67+ m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0;
68
69 m_lastTouchPoints = m_touchPoints;
70 m_touchPoints.clear();
diff --git a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
index c032ec03..69063457 100644
--- a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
+++ b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
@@ -1,4 +1,4 @@
1From 557aa4d5584525cca4efcf20d6a86ad3ae99e36b Mon Sep 17 00:00:00 2001 1From 6c9e68cffb15cc1e848ca57ea12d4e5905d46507 Mon Sep 17 00:00:00 2001
2From: Nicola Lunghi <nick83ola@gmail.com> 2From: Nicola Lunghi <nick83ola@gmail.com>
3Date: Wed, 5 Feb 2020 15:32:25 +0000 3Date: Wed, 5 Feb 2020 15:32:25 +0000
4Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform 4Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform
@@ -13,10 +13,10 @@ Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/2894
13 1 file changed, 37 insertions(+), 13 deletions(-) 13 1 file changed, 37 insertions(+), 13 deletions(-)
14 14
15diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp 15diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
16index 45798cc527..de3f156cae 100644 16index 42e98ce363..0ca9b87f04 100644
17--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp 17--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
18+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp 18+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
19@@ -2894,19 +2894,43 @@ void tst_QPainter::monoImages() 19@@ -2931,19 +2931,43 @@ void tst_QPainter::monoImages()
20 #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__) 20 #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__)
21 #include <fenv.h> 21 #include <fenv.h>
22 22
@@ -67,7 +67,7 @@ index 45798cc527..de3f156cae 100644
67 return QLatin1String("Invalid operation"); 67 return QLatin1String("Invalid operation");
68 return QLatin1String("No exception"); 68 return QLatin1String("No exception");
69 } 69 }
70@@ -2932,7 +2956,7 @@ private: 70@@ -2969,7 +2993,7 @@ private:
71 71
72 void fpe_rasterizeLine_task232012() 72 void fpe_rasterizeLine_task232012()
73 { 73 {
@@ -76,7 +76,7 @@ index 45798cc527..de3f156cae 100644
76 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); 76 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
77 img.fill(0x0); 77 img.fill(0x0);
78 QPainter p(&img); 78 QPainter p(&img);
79@@ -2944,7 +2968,7 @@ void fpe_rasterizeLine_task232012() 79@@ -2981,7 +3005,7 @@ void fpe_rasterizeLine_task232012()
80 80
81 void fpe_pixmapTransform() 81 void fpe_pixmapTransform()
82 { 82 {
@@ -85,7 +85,7 @@ index 45798cc527..de3f156cae 100644
85 85
86 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); 86 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
87 87
88@@ -2972,7 +2996,7 @@ void fpe_pixmapTransform() 88@@ -3009,7 +3033,7 @@ void fpe_pixmapTransform()
89 89
90 void fpe_zeroLengthLines() 90 void fpe_zeroLengthLines()
91 { 91 {
@@ -94,7 +94,7 @@ index 45798cc527..de3f156cae 100644
94 94
95 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); 95 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
96 96
97@@ -2984,7 +3008,7 @@ void fpe_zeroLengthLines() 97@@ -3021,7 +3045,7 @@ void fpe_zeroLengthLines()
98 98
99 void fpe_divByZero() 99 void fpe_divByZero()
100 { 100 {
@@ -103,7 +103,7 @@ index 45798cc527..de3f156cae 100644
103 103
104 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); 104 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
105 105
106@@ -3007,7 +3031,7 @@ void fpe_divByZero() 106@@ -3044,7 +3068,7 @@ void fpe_divByZero()
107 107
108 void fpe_steepSlopes() 108 void fpe_steepSlopes()
109 { 109 {
@@ -112,7 +112,7 @@ index 45798cc527..de3f156cae 100644
112 112
113 QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied); 113 QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied);
114 114
115@@ -3026,7 +3050,7 @@ void fpe_steepSlopes() 115@@ -3063,7 +3087,7 @@ void fpe_steepSlopes()
116 116
117 void fpe_radialGradients() 117 void fpe_radialGradients()
118 { 118 {
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 2f1a9273..a7811ddf 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -27,12 +27,10 @@ SRC_URI += "\
27 file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ 27 file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
28 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 28 file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
29 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 29 file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
30 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
31 file://0013-Disable-ltcg-for-host_build.patch \ 30 file://0013-Disable-ltcg-for-host_build.patch \
32 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 31 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
33 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ 32 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
34 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 33 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
35 file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
36 file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ 34 file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
37 file://0019-Define-__NR_futex-if-it-does-not-exist.patch \ 35 file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
38" 36"
@@ -60,6 +58,7 @@ PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev widgets tools libs freet
60 ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \ 58 ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
61 ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)} \ 59 ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)} \
62 ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \ 60 ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \
61 ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
63" 62"
64 63
65PACKAGECONFIG ?= " \ 64PACKAGECONFIG ?= " \
@@ -181,7 +180,6 @@ LDFLAGS_append_riscv64 = " -pthread"
181 180
182QT_CONFIG_FLAGS += " \ 181QT_CONFIG_FLAGS += " \
183 ${QT_CONFIG_FLAGS_GOLD} \ 182 ${QT_CONFIG_FLAGS_GOLD} \
184 -shared \
185 -silent \ 183 -silent \
186 -no-pch \ 184 -no-pch \
187 -no-rpath \ 185 -no-rpath \
@@ -304,4 +302,4 @@ sed -i \
304 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 302 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
305} 303}
306 304
307SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9" 305SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index b3d2422f..1a5238f1 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 = "f74ba98f354e222211da5674294567282c088386" 11SRCREV = "a67f812548b008e3eedcd2bb9313828a195fd23b"
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 d8ee7cad..83ee40b7 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 = "432c369082c581c81b60950bf7cfaf1a003c8681" 14SRCREV = "628d3b8abd47ffde45252cf6591ed10ec2fa28ac"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 364bd8f6..948f59a5 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 = "976a92fdd702e4d1afd5fd5cc1181d71978720c2" 22SRCREV = "ca6cc606d9fc0947ea6c27738a1ca8f12f3258ea"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 5c8526a3..70e14f06 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 = "64c75931c1aa7250a28a2f2493b5965ba26cc38e" 11SRCREV = "1168c788a117e4556e6cd0ba1e267a86ef62b0c4"
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch b/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
deleted file mode 100644
index 9ee83b39..00000000
--- a/recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From cfbc554f137ce5ee6497045fc23ebe8576361786 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 26 Nov 2019 21:10:03 -0800
4Subject: [PATCH] Use python3 explicitly
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 qtdeclarative.pro | 2 +-
9 src/3rdparty/masm/masm.pri | 4 ++--
10 tests/auto/qml/ecmascripttests/test262.py | 2 +-
11 3 files changed, 4 insertions(+), 4 deletions(-)
12
13diff --git a/qtdeclarative.pro b/qtdeclarative.pro
14index 5b94da9b69..0e3496ce80 100644
15--- a/qtdeclarative.pro
16+++ b/qtdeclarative.pro
17@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
18 load(qt_parts)
19
20 !python_available {
21- py_out = $$system('python -c "print(1)"')
22+ py_out = $$system('python3 -c "print(1)"')
23 !equals(py_out, 1): error("Building QtQml requires Python.")
24 tmp = python_available
25 CONFIG += $$tmp
26diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
27index 1df4585aae..00038104ec 100644
28--- a/src/3rdparty/masm/masm.pri
29+++ b/src/3rdparty/masm/masm.pri
30@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
31 udis86.output = udis86_itab.h
32 udis86.input = ITAB
33 udis86.CONFIG += no_link
34- udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
35+ udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
36 QMAKE_EXTRA_COMPILERS += udis86
37
38 udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
39@@ -111,7 +111,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
40 retgen.script = $$PWD/yarr/create_regex_tables
41 retgen.input = retgen.script
42 retgen.CONFIG += no_link
43-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
44+retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT}
45 QMAKE_EXTRA_COMPILERS += retgen
46
47 # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
48diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py
49index 19551e3ba2..bf3f79a45f 100755
50--- a/tests/auto/qml/ecmascripttests/test262.py
51+++ b/tests/auto/qml/ecmascripttests/test262.py
52@@ -1,4 +1,4 @@
53-#!/usr/bin/env python
54+#!/usr/bin/env python3
55 #############################################################################
56 ##
57 ## Copyright (C) 2017 The Qt Company Ltd.
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 1a42b81d..3ff69d60 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = " \
16# 5.15.meta-qt5.1 16# 5.15.meta-qt5.1
17SRC_URI += " \ 17SRC_URI += " \
18 file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ 18 file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \
19 file://0002-Use-python3-explicitly.patch \
20" 19"
21 20
22LDFLAGS_append_riscv64 = " -pthread" 21LDFLAGS_append_riscv64 = " -pthread"
@@ -33,6 +32,6 @@ do_install_append_class-nativesdk() {
33 rm -rf ${D}${OE_QMAKE_PATH_QML} 32 rm -rf ${D}${OE_QMAKE_PATH_QML}
34} 33}
35 34
36SRCREV = "0fafffedf4857f6bdd8e54b72ab806594ef5674b" 35SRCREV = "104eae5b17b0ec700391e9539ee3a4f638588194"
37 36
38BBCLASSEXTEND =+ "native nativesdk" 37BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index c514a444..076f25a6 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 = "3c670af801d9ff2273e89e28d5dac8c2666a9d2c" 17SRCREV = "ff933a4e72826a77c81c4153f1adcf765ead35f0"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index d1edb0b6..9657a5ef 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 = "580ab04ff7a623193061f1fbe54bc2ae7744cfe8" 21SRCREV = "66b7fbaca4b323dce337e87e3093c8836577c561"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index acc98254..43db80ff 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 = "bb01d126bc1bfc2193a0bbe1e92587ff2aec65cd" 28SRCREV = "74a5bc4a45195b876454e596e76cb23aeb365410"
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb
index 3d66e78a..9891eefb 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 = "1ab6ae377230693817be63ee2768aaa6d586a00a" 12SRCREV = "0d2ce613010c0cc9c69f6821c06a34b6721482b4"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 450b3dd7..89d42813 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -35,7 +35,7 @@ SRC_URI += " \
35 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 35 ${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" 36"
37 37
38SRCREV_qtlocation = "38eed6e327bb2fa115975a58e9866fc514b6f01c" 38SRCREV_qtlocation = "02a21217a9706402802f38c646797be8eccb86e4"
39SRCREV_qtlocation-mapboxgl = "d7e368c42f2ac7971e81f60b981e566352f1e4fa" 39SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d"
40 40
41SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 41SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb
index 00bd7811..b4a93300 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 = "e40d61929ee0b8dde8b807e1a45e8067939f7db0" 12SRCREV = "b182dcd78a35b4667b2568857b7719d555c7fddb"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index ad5e80b9..b3db343e 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 = "7c30a943b39696f673f72b7131d6395ab8bdbf40" 12SRCREV = "cade213f562049400da81e60762400df68d7c56b"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index d861b69f..fdbebd6d 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -38,7 +38,7 @@ SRC_URI += "\
38# http://errors.yoctoproject.org/Errors/Build/44914/ 38# http://errors.yoctoproject.org/Errors/Build/44914/
39LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 39LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
40 40
41SRCREV = "040378a91fee4aa1e0740e1e5d3438e652b6f2eb" 41SRCREV = "fd30913d4601d12437404e1d20113a1ed6364ccc"
42 42
43# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory 43# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
44do_install_append() { 44do_install_append() {
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index af76e2b9..79d00544 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 = "0bbe1a2a2a345ab85cdef2fae900ae35eb8cc9cb" 12SRCREV = "fb2d6d47a0c961278d63309789a1141c3734818b"
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index 75342799..7b3ae682 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 = "b32fd40e4ce5f530c1d41d9d11916605f1969518" 21SRCREV = "6d45793cae6f9e744c7bba82f905e431978ce3d0"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index 5e19d5ab..554bb8f7 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 = "b80b526f8faf56ce529eeee1de5d62e809d1105c" 13SRCREV = "ddfa4d16243128d2871a51c513e025d518151b17"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index e6e3c53c..a56e26db 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \
21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ 21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
22" 22"
23 23
24SRCREV_qtquick3d = "8e25bfb103fe9e619ab78af4a20eb6838026a6ec" 24SRCREV_qtquick3d = "2e05e6d6546635a8f25882c5140fb17697be0062"
25SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" 25SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
26 26
27SRCREV_FORMAT = "qtquick3d_assimp" 27SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index c03083ff..fed17dad 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 = "7c3b169c73c58280b07f1b1a3d5b779d38f340b1" 13SRCREV = "16f27dfa3588c2bf377568ce00bf534af48c9558"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index b3969683..c2960096 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 = "e8414d5bc37d1391f45af866055a8448acbb2271" 20SRCREV = "7c29283041a50def3ceca7de4471f211c9b30d4e"
diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb
index 3d0c2c54..61920c04 100644
--- a/recipes-qt/qt5/qtquicktimeline_git.bb
+++ b/recipes-qt/qt5/qtquicktimeline_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtbase qtdeclarative" 11DEPENDS = "qtbase qtdeclarative"
12 12
13SRCREV = "7848c053ff7e1ee4a0101c8f979b8accc4cf8308" 13SRCREV = "147ad75c589fc4804429710fdb177cc48a80dbea"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 363ef947..c9519137 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -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 = "121cc9f23b422127f0aa99d436a2e40bfcbd6255" 28SRCREV = "8e889442508e284691c923470eb4552c96afdfe3"
29 29
30BBCLASSEXTEND += "native nativesdk" 30BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index d9b979dc..773bc044 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -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 = "20aefbbae19be42e894f1bc2ecf951c5c32fca70" 39SRCREV = "5da7de1800eee3d604eb7e787b114479b61ffc93"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 467ed853..7a0975bf 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "126e70d6247ef345b4d49de6945111883e1212aa" 13SRCREV = "95aa78be795a862b95371afa75e1417029ec0a16"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15
16# 5.15.meta-qt5.1 16# 5.15.meta-qt5.1
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index b21bc1f9..c4b90f84 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 = "32587e8b2b656710d90a36a8a856db14d9cc819b" 15SRCREV = "5618198e6df5e0224f79f786a44af7527b431545"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 2a4c5493..94e0fbbd 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "1b020b7d4ebf2de0f2d6641b067dfe3a6b9dfbfe" 14SRCREV = "1aa9b03756baead139943712839af5ecedeb2989"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index f69f56cb..b59d921d 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 = "430d7bc8c76bcf3154f87212811729eb484d9309" 15SRCREV = "192e376b01e65e7277772bdc94106613c22cf531"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 8e2f3786..52d82653 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 = "d0a46439a58a6630b4fd927347275ce2698097f9" 15SRCREV = "52d3788c7b0116ea3db232dccca5f1e3f1e229ac"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 117b9143..63566035 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -39,6 +39,7 @@ EXTRA_QMAKEVARS_PRE += " \
39 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ 39 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
40 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ 40 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \
41" 41"
42SRCREV = "6a85b6150554111f7d473d56addfe5a8b5da4400" 42SRCREV = "cc52debd905e0ed061290d6fd00a5f1ab67478a5"
43 43
44BBCLASSEXTEND = "native nativesdk" 44BBCLASSEXTEND = "native nativesdk"
45
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 26a98684..ecc9db2f 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 = "383fe04ff98fb4b07e24e0c1addce380e0d12cfd" 101SRCREV = "cb1857418b36780b0444333f3aa6250ca3780f19"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index a124416f..c3b8a90f 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 = "39a9e7a6f72d14808a983ce1e678e22ee2fd57b5" 74SRCREV = "7b90415c58dd02c682a9ba317f273d7b3398ff88"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 481ed2ef..f3fea401 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -22,6 +22,7 @@ PACKAGECONFIG ?= " \
22 wayland-server \ 22 wayland-server \
23 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'wayland-egl', '', d)} \ 23 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'wayland-egl', '', d)} \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \ 24 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \
25 ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'wayland-vulkan-server-buffer', '', d)} \
25" 26"
26PACKAGECONFIG_class-native ?= "" 27PACKAGECONFIG_class-native ?= ""
27PACKAGECONFIG_class-nativesdk ?= "" 28PACKAGECONFIG_class-nativesdk ?= ""
@@ -38,10 +39,11 @@ PACKAGECONFIG[wayland-egl] = "-feature-wayland-egl,-no-feature-wayland-egl,virtu
38PACKAGECONFIG[wayland-brcm] = "-feature-wayland-brcm,-no-feature-wayland-brcm,virtual/egl" 39PACKAGECONFIG[wayland-brcm] = "-feature-wayland-brcm,-no-feature-wayland-brcm,virtual/egl"
39PACKAGECONFIG[wayland-drm-egl-server-buffer] = "-feature-wayland-drm-egl-server-buffer,-no-feature-wayland-drm-egl-server-buffer,libdrm virtual/egl" 40PACKAGECONFIG[wayland-drm-egl-server-buffer] = "-feature-wayland-drm-egl-server-buffer,-no-feature-wayland-drm-egl-server-buffer,libdrm virtual/egl"
40PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris-egl-server-buffer,-no-feature-wayland-libhybris-egl-server-buffer,libhybris" 41PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris-egl-server-buffer,-no-feature-wayland-libhybris-egl-server-buffer,libhybris"
42PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-buffer,-no-feature-wayland-vulkan-server-buffer,vulkan-headers"
41 43
42EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 44EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
43 45
44SRCREV = "0f847b7688af376c22b1d040d0b140c88444d8bc" 46SRCREV = "3cc17177b1b03053276eb6236fda137c588261a7"
45 47
46BBCLASSEXTEND =+ "native nativesdk" 48BBCLASSEXTEND =+ "native nativesdk"
47 49
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index d5c173db..052bfd80 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 = "7e48e3bb4b4c61a37343e07cae5fd9fb8a5cddd7" 15SRCREV = "90cffd49575b075b0dc28440c693753d860fee87"
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 f1fa3ed3..fa7de449 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 178aefa97fd7b725b1b802af7751df5f86a887af Mon Sep 17 00:00:00 2001 1From cc707f6c2d3dd152fcca23de0545351e99b3edcb 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,13 +10,13 @@ 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 5007012a..56c7ad4a 100644 13index 3b439e81..b1669e19 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@@ -57,7 +57,7 @@ linux { 16@@ -5,7 +5,7 @@ include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri)
17 POST_TARGETDEPS += $$NINJA_TARGETDEPS
18
19 17
18 api_library_name = qtwebenginecoreapi$$qtPlatformTargetSuffix()
19 api_library_path = $$OUT_PWD/api/$$getConfigDir()
20-LIBS_PRIVATE += -L$$api_library_path 20-LIBS_PRIVATE += -L$$api_library_path
21+LIBS_PRIVATE += -L$$api_library_path -lexecinfo 21+LIBS_PRIVATE += -L$$api_library_path -lexecinfo
22 CONFIG *= no_smart_library_merge 22 CONFIG *= no_smart_library_merge
diff --git a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
index 8cb665f1..6bd374d8 100644
--- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
@@ -5,22 +5,44 @@ Subject: [PATCH] mkspecs: Allow builds with libc != glibc
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 src/buildtools/config/support.pri | 5 ----- 8 src/buildtools/config/support.pri | 4 ----
9 1 file changed, 5 deletions(-) 9 src/buildtools/configure.json | 4 +---
10 2 files changed, 1 insertion(+), 7 deletions(-)
10 11
11diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri 12diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
12index 8077b12f..aaf4db47 100644 13index 6768f0a1..1885f1b4 100644
13--- a/src/buildtools/config/support.pri 14--- a/src/buildtools/config/support.pri
14+++ b/src/buildtools/config/support.pri 15+++ b/src/buildtools/config/support.pri
15@@ -97,11 +97,6 @@ defineTest(qtwebengine_checkErrorForLinux) { 16@@ -177,10 +177,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) {
16 return(false)
17 }
18 17
18 defineTest(qtwebengine_checkForGlibc) {
19 module = $$1
19- !qtConfig(webengine-system-glibc) { 20- !qtConfig(webengine-system-glibc) {
20- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.") 21- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.")
21- return(false) 22- return(false)
22- } 23- }
23- 24 return(true)
24 !qtConfig(webengine-system-khr) { 25 }
25 qtwebengine_skipBuild("Khronos development headers required to build QtWebEngine are missing (see mesa/libegl1-mesa-dev)") 26
26 return(false) 27diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
28index 96727a14..fef8fc5e 100644
29--- a/src/buildtools/configure.json
30+++ b/src/buildtools/configure.json
31@@ -371,7 +371,6 @@
32 && (!config.sanitizer || features.webengine-sanitizer)
33 && (!config.linux || features.pkg-config)
34 && (!config.linux || features.webengine-host-pkg-config)
35- && (!config.linux || features.webengine-system-glibc)
36 && (!config.linux || features.webengine-system-khr)
37 && (!config.linux || features.webengine-system-nss)
38 && (!config.linux || features.webengine-system-dbus)
39@@ -732,8 +731,7 @@
40 "webengine-system-fontconfig",
41 "webengine-system-dbus",
42 "webengine-system-nss",
43- "webengine-system-khr",
44- "webengine-system-glibc"
45+ "webengine-system-khr"
46 ]
47 },
48 {
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 3abe38b6..8b5d41ba 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 105421c09f009b77019e60db2de22d5966a73602 Mon Sep 17 00:00:00 2001 1From 5af62581e5116b57efbe4bb7cc467efeb0aab941 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 497dd3b8..c93ba991 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 99453086770508f96eeb95635dda3f9831c485bf Mon Sep 17 00:00:00 2001 1From 8dd7987fc70fd8dab4a9f7ee32334c8d28ed34e4 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
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 3 insertions(+), 3 deletions(-) 17 1 file changed, 3 insertions(+), 3 deletions(-)
18 18
19diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h 19diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
20index 8e0cc385792..d2bd9df4d40 100644 20index d2baee9d243..fd8efdffea6 100644
21--- a/chromium/third_party/lss/linux_syscall_support.h 21--- a/chromium/third_party/lss/linux_syscall_support.h
22+++ b/chromium/third_party/lss/linux_syscall_support.h 22+++ b/chromium/third_party/lss/linux_syscall_support.h
23@@ -2012,7 +2012,7 @@ struct kernel_statfs { 23@@ -2017,7 +2017,7 @@ struct kernel_statfs {
24 : "i" (__NR_##name), "ri" ((long)(arg1)), \ 24 : "i" (__NR_##name), "ri" ((long)(arg1)), \
25 "c" ((long)(arg2)), "d" ((long)(arg3)), \ 25 "c" ((long)(arg2)), "d" ((long)(arg3)), \
26 "S" ((long)(arg4)), "D" ((long)(arg5)) \ 26 "S" ((long)(arg4)), "D" ((long)(arg5)) \
@@ -29,7 +29,7 @@ index 8e0cc385792..d2bd9df4d40 100644
29 LSS_RETURN(type,__res); \ 29 LSS_RETURN(type,__res); \
30 } 30 }
31 #undef _syscall6 31 #undef _syscall6
32@@ -2034,7 +2034,7 @@ struct kernel_statfs { 32@@ -2039,7 +2039,7 @@ struct kernel_statfs {
33 : "i" (__NR_##name), "0" ((long)(&__s)), \ 33 : "i" (__NR_##name), "0" ((long)(&__s)), \
34 "c" ((long)(arg2)), "d" ((long)(arg3)), \ 34 "c" ((long)(arg2)), "d" ((long)(arg3)), \
35 "S" ((long)(arg4)), "D" ((long)(arg5)) \ 35 "S" ((long)(arg4)), "D" ((long)(arg5)) \
@@ -38,7 +38,7 @@ index 8e0cc385792..d2bd9df4d40 100644
38 LSS_RETURN(type,__res); \ 38 LSS_RETURN(type,__res); \
39 } 39 }
40 LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, 40 LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
41@@ -2120,7 +2120,7 @@ struct kernel_statfs { 41@@ -2125,7 +2125,7 @@ struct kernel_statfs {
42 : "0"(-EINVAL), "i"(__NR_clone), 42 : "0"(-EINVAL), "i"(__NR_clone),
43 "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), 43 "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
44 "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) 44 "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
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 253cdaf6..a3f292c3 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 d3889654a28d901d345cae8fc8ec23988a085dab Mon Sep 17 00:00:00 2001 1From be18ba6e0b879fbd542f4e0d1a249f2ab5abb27c 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,10 +10,10 @@ 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 fdfcf65f5ab..13d71d04030 100644 13index ca81bd8ce0f..d3c588b21e3 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@@ -779,8 +779,6 @@ config("compiler_cpu_abi") { 16@@ -776,8 +776,6 @@ config("compiler_cpu_abi") {
17 } 17 }
18 } else if (current_cpu == "arm") { 18 } else if (current_cpu == "arm") {
19 if (is_clang && !is_android && !is_nacl) { 19 if (is_clang && !is_android && !is_nacl) {
@@ -22,7 +22,7 @@ index fdfcf65f5ab..13d71d04030 100644
22 } 22 }
23 if (!is_nacl) { 23 if (!is_nacl) {
24 cflags += [ 24 cflags += [
25@@ -793,8 +791,6 @@ config("compiler_cpu_abi") { 25@@ -790,8 +788,6 @@ config("compiler_cpu_abi") {
26 } 26 }
27 } else if (current_cpu == "arm64") { 27 } else if (current_cpu == "arm64") {
28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) { 28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -31,7 +31,7 @@ index fdfcf65f5ab..13d71d04030 100644
31 } 31 }
32 } else if (current_cpu == "mipsel" && !is_nacl) { 32 } else if (current_cpu == "mipsel" && !is_nacl) {
33 ldflags += [ "-Wl,--hash-style=sysv" ] 33 ldflags += [ "-Wl,--hash-style=sysv" ]
34@@ -803,9 +799,6 @@ config("compiler_cpu_abi") { 34@@ -800,9 +796,6 @@ config("compiler_cpu_abi") {
35 if (is_android) { 35 if (is_android) {
36 cflags += [ "--target=mipsel-linux-android" ] 36 cflags += [ "--target=mipsel-linux-android" ]
37 ldflags += [ "--target=mipsel-linux-android" ] 37 ldflags += [ "--target=mipsel-linux-android" ]
@@ -41,7 +41,7 @@ index fdfcf65f5ab..13d71d04030 100644
41 } 41 }
42 } else { 42 } else {
43 cflags += [ "-EL" ] 43 cflags += [ "-EL" ]
44@@ -884,10 +877,7 @@ config("compiler_cpu_abi") { 44@@ -881,10 +874,7 @@ config("compiler_cpu_abi") {
45 } else if (current_cpu == "mips" && !is_nacl) { 45 } else if (current_cpu == "mips" && !is_nacl) {
46 ldflags += [ "-Wl,--hash-style=sysv" ] 46 ldflags += [ "-Wl,--hash-style=sysv" ]
47 if (custom_toolchain == "") { 47 if (custom_toolchain == "") {
@@ -53,7 +53,7 @@ index fdfcf65f5ab..13d71d04030 100644
53 cflags += [ "-EB" ] 53 cflags += [ "-EB" ]
54 ldflags += [ "-EB" ] 54 ldflags += [ "-EB" ]
55 } 55 }
56@@ -934,9 +924,6 @@ config("compiler_cpu_abi") { 56@@ -931,9 +921,6 @@ config("compiler_cpu_abi") {
57 if (is_android) { 57 if (is_android) {
58 cflags += [ "--target=mips64el-linux-android" ] 58 cflags += [ "--target=mips64el-linux-android" ]
59 ldflags += [ "--target=mips64el-linux-android" ] 59 ldflags += [ "--target=mips64el-linux-android" ]
@@ -63,7 +63,7 @@ index fdfcf65f5ab..13d71d04030 100644
63 } 63 }
64 } else { 64 } else {
65 cflags += [ 65 cflags += [
66@@ -993,10 +980,7 @@ config("compiler_cpu_abi") { 66@@ -990,10 +977,7 @@ config("compiler_cpu_abi") {
67 } else if (current_cpu == "mips64") { 67 } else if (current_cpu == "mips64") {
68 ldflags += [ "-Wl,--hash-style=sysv" ] 68 ldflags += [ "-Wl,--hash-style=sysv" ]
69 if (custom_toolchain == "") { 69 if (custom_toolchain == "") {
@@ -75,7 +75,7 @@ index fdfcf65f5ab..13d71d04030 100644
75 cflags += [ 75 cflags += [
76 "-EB", 76 "-EB",
77 "-mabi=64", 77 "-mabi=64",
78@@ -1165,13 +1149,6 @@ config("compiler_deterministic") { 78@@ -1157,13 +1141,6 @@ config("compiler_deterministic") {
79 } 79 }
80 } 80 }
81 } 81 }
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 5b150b5f..c3de3cc5 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 7a778d56065b041e55c60e500d5e60c71b7e345f Mon Sep 17 00:00:00 2001 1From 7eeed60fceeca490c5252e256baff08100e13259 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
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 4 insertions(+), 1 deletion(-) 15 1 file changed, 4 insertions(+), 1 deletion(-)
16 16
17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn 17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
18index 4422fecc0c8..1b398ad981a 100644 18index 00d1e7c6ca3..f2c36d72dd2 100644
19--- a/chromium/third_party/zlib/BUILD.gn 19--- a/chromium/third_party/zlib/BUILD.gn
20+++ b/chromium/third_party/zlib/BUILD.gn 20+++ b/chromium/third_party/zlib/BUILD.gn
21@@ -80,8 +80,11 @@ if (use_arm_neon_optimizations) { 21@@ -86,8 +86,11 @@ if (use_arm_neon_optimizations) {
22 # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: 22 # Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
23 # "All implementations of the ARMv8.1 architecture are required to 23 # "All implementations of the ARMv8.1 architecture are required to
24 # implement the CRC32* instructions. These are optional in ARMv8.0." 24 # implement the CRC32* instructions. These are optional in ARMv8.0."
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.patch
index 00293e5f..5f3f4528 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.patch
@@ -1,7 +1,8 @@
1From 7cabdbd5f444dc10f4c87ed554792e97a527075b Mon Sep 17 00:00:00 2001 1From 0faac107930255380ea07aa75267153022de2248 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
5
5 march/mtune/float-abi OE config machinary has computed these values already 6 march/mtune/float-abi OE config machinary has computed these values already
6 and fed it via compiler cmdline to chromium build 7 and fed it via compiler cmdline to chromium build
7 8
@@ -12,15 +13,17 @@ Upstream-Status: Inappropriate [OE-Specific]
12 13
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com> 15Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
16
17%% original patch: 0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
15--- 18---
16 chromium/build/config/compiler/BUILD.gn | 9 --------- 19 chromium/build/config/compiler/BUILD.gn | 9 ---------
17 1 file changed, 9 deletions(-) 20 1 file changed, 9 deletions(-)
18 21
19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 22diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
20index 13d71d04030..3ebcf1ddbc3 100644 23index d3c588b21e3..6d49fde33cc 100644
21--- a/chromium/build/config/compiler/BUILD.gn 24--- a/chromium/build/config/compiler/BUILD.gn
22+++ b/chromium/build/config/compiler/BUILD.gn 25+++ b/chromium/build/config/compiler/BUILD.gn
23@@ -780,15 +780,6 @@ config("compiler_cpu_abi") { 26@@ -777,15 +777,6 @@ config("compiler_cpu_abi") {
24 } else if (current_cpu == "arm") { 27 } else if (current_cpu == "arm") {
25 if (is_clang && !is_android && !is_nacl) { 28 if (is_clang && !is_android && !is_nacl) {
26 } 29 }
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 798b5f05..f560e315 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 e7e0646f07d1c0dcf6502cd1c074d50839f3d461 Mon Sep 17 00:00:00 2001 1From 69abe5acb926cef9ac771015ade3873fa9985f3b 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
@@ -28,7 +28,7 @@ Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
28 1 file changed, 2 insertions(+), 15 deletions(-) 28 1 file changed, 2 insertions(+), 15 deletions(-)
29 29
30diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 30diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
31index 0d610ccfe33..c1844b61168 100644 31index 831f5b3bb03..bb9377c3641 100644
32--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 32--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
33+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 33+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
34@@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) { 34@@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) {
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 307ce4d4..1c7a3b1e 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,4 +1,4 @@
1From a5cdae084e84be8c847f4b0613b92e0462bbb038 Mon Sep 17 00:00:00 2001 1From 8a0cc2a6be8fb9f8c3f4976ad4b41b291e672a67 Mon Sep 17 00:00:00 2001
2From: Jiri Slaby <jslaby@suse.cz> 2From: Jiri Slaby <jslaby@suse.cz>
3Date: Thu, 11 Jul 2019 09:35:13 +0200 3Date: Thu, 11 Jul 2019 09:35:13 +0200
4Subject: [PATCH] chromium: fix build after y2038 changes in glibc 4Subject: [PATCH] chromium: fix build after y2038 changes in glibc
@@ -15,7 +15,7 @@ Upstream-Status: Pending
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 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 ead4e57dc15..7ba975e660a 100644 18index 0cbcb8130c6..bc3dd3bddda 100644
19--- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc 19--- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
20+++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc 20+++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
21@@ -71,6 +71,7 @@ typedef void* SockOptArg; 21@@ -71,6 +71,7 @@ typedef void* SockOptArg;
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
index 03bdc05a..63a460cc 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -1,4 +1,4 @@
1From c769d6be7210a2fbc866e36f87ad21bcc91e9c6e Mon Sep 17 00:00:00 2001 1From ddedffaeb9f04ac8530f87f5010e0008dc548b96 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Nov 2019 10:07:43 -0800 3Date: Sat, 30 Nov 2019 10:07:43 -0800
4Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t 4Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
@@ -11,58 +11,37 @@ input.h [1]
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13--- 13---
14 chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 4 ++-- 14 chromium/ui/events/ozone/evdev/event_converter_evdev.h | 5 +++++
15 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++--- 15 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 3 +--
16 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | 5 +++++ 16 2 files changed, 6 insertions(+), 2 deletions(-)
17 3 files changed, 10 insertions(+), 5 deletions(-)
18 17
19diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc 18diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
20index 9f27d39e209..f565dd2ce5c 100644 19index 717410f2ebc..a4cd55ca20e 100644
21--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc 20--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
22+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc 21+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
23@@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback( 22@@ -20,6 +20,11 @@
24 base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent( 23 #include "ui/events/ozone/evdev/event_dispatch_callback.h"
25 const input_event& event) { 24 #include "ui/gfx/geometry/size.h"
26 base::TimeTicks timestamp = 25
27- ui::EventTimeStampFromSeconds(event.time.tv_sec) + 26+#ifndef input_event_sec
28- base::TimeDelta::FromMicroseconds(event.time.tv_usec); 27+#define input_event_sec time.tv_sec
29+ ui::EventTimeStampFromSeconds(event.input_event_sec) + 28+#define input_event_usec time.tv_usec
30+ base::TimeDelta::FromMicroseconds(event.input_event_usec); 29+#endif
31 ValidateEventTimeClock(&timestamp); 30+
32 return timestamp; 31 struct input_event;
33 } 32
33 namespace ui {
34diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc 34diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
35index 363c3183e05..4fccfd62f84 100644 35index 01e49b7bbfd..4fccfd62f84 100644
36--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc 36--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
37+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc 37+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
38@@ -59,11 +59,11 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { 38@@ -63,8 +63,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
39 for (int i = 0; i < kDebugBufferSize; ++i) {
40 struct TouchEvent* te =
41 &logged_events_[(debug_buffer_tail_ + i) % kDebugBufferSize];
42- if (te->ev.time.tv_sec == 0 && te->ev.time.tv_usec == 0)
43+ if (te->ev.input_event_sec == 0 && te->ev.input_event_usec == 0)
44 continue; 39 continue;
45 std::string event_string = base::StringPrintf( 40 std::string event_string = base::StringPrintf(
46- "E: %ld.%06ld %04x %04x %d %d\n", te->ev.time.tv_sec, 41 "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
47- te->ev.time.tv_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); 42- te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value,
48+ "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, 43- te->slot);
49+ te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); 44+ te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
50 report_content += event_string; 45 report_content += event_string;
51 } 46 }
52 file.Write(0, report_content.c_str(), report_content.length()); 47 file.Write(0, report_content.c_str(), report_content.length());
53diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
54index 0d5b83148f6..1f17608e94d 100644
55--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
56+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
57@@ -14,6 +14,11 @@
58
59 #include "base/component_export.h"
60
61+#ifndef input_event_sec
62+#define input_event_sec time.tv_sec
63+#define input_event_usec time.tv_usec
64+#endif
65+
66 namespace ui {
67
68 class EventDeviceInfo;
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
index 3659f586..41a8ce36 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
@@ -1,4 +1,4 @@
1From 58783bf8f46657200643543f765f405a91699440 Mon Sep 17 00:00:00 2001 1From 022100d701dca71ecfe237e133712398bc1c59a7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 25 Dec 2019 15:41:16 -0800 3Date: Wed, 25 Dec 2019 15:41:16 -0800
4Subject: [PATCH] chromium: Include cstddef for size_t definition 4Subject: [PATCH] chromium: Include cstddef for size_t definition
@@ -22,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 1 file changed, 1 insertion(+) 22 1 file changed, 1 insertion(+)
23 23
24diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 24diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
25index b87fb2d0345..b3faffcfc79 100644 25index ec972949d89..2a76775cfb6 100644
26--- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 26--- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
27+++ b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 27+++ b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
28@@ -14,6 +14,7 @@ 28@@ -15,6 +15,7 @@
29 #include <map> 29 #include <map>
30 #include <set> 30 #include <set>
31 #include <vector> 31 #include <vector>
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
index 965ecd72..abe1e16d 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
@@ -1,4 +1,4 @@
1From faff740bb831e1a25c7acb1754df9bbd028330b9 Mon Sep 17 00:00:00 2001 1From 9d9db26e626e1c8d4d10eab1522daf0efc8cb11c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 2 Jan 2020 17:13:55 -0800 3Date: Thu, 2 Jan 2020 17:13:55 -0800
4Subject: [PATCH] chromium: Move CharAllocator definition to a header file 4Subject: [PATCH] chromium: Move CharAllocator definition to a header file
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
index a6abd037..464f952b 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
@@ -1,4 +1,4 @@
1From 33005dfa49d65170fb006cd4ca4dbb8c6cf901e5 Mon Sep 17 00:00:00 2001 1From 1b8d57ba6595bbd743f6570d834f6a08600fb117 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 Jan 2020 16:53:46 -0800 3Date: Wed, 15 Jan 2020 16:53:46 -0800
4Subject: [PATCH] chromium: Include <cstddef> and <cstdint> 4Subject: [PATCH] chromium: Include <cstddef> and <cstdint>
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
index 169b4c9b..eaff07e0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
@@ -1,4 +1,4 @@
1From 910fe61d3ee439b26a6a33cc9f65e1f7a52f332d Mon Sep 17 00:00:00 2001 1From e60314a1257964bbebc0e7633d9799fd7c7ec35b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 1 Feb 2020 12:17:23 -0800 3Date: Sat, 1 Feb 2020 12:17:23 -0800
4Subject: [PATCH] chromium: Link v8 with libatomic on x86 4Subject: [PATCH] chromium: Link v8 with libatomic on x86
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 2 insertions(+), 1 deletion(-) 14 1 file changed, 2 insertions(+), 1 deletion(-)
15 15
16diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn 16diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn
17index 9107b302476..12d8171d238 100644 17index ab20142de9a..4ef4aa80cc0 100644
18--- a/chromium/v8/BUILD.gn 18--- a/chromium/v8/BUILD.gn
19+++ b/chromium/v8/BUILD.gn 19+++ b/chromium/v8/BUILD.gn
20@@ -3324,7 +3324,8 @@ v8_source_set("v8_base_without_compiler") { 20@@ -3543,7 +3543,8 @@ v8_source_set("v8_base_without_compiler") {
21 if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || 21 if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" ||
22 v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || 22 v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" ||
23 v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || 23 v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch
deleted file mode 100644
index 3272b727..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 3ccc10f378ca26c35104e39e08771c053ae5b19e Mon Sep 17 00:00:00 2001
2From: Allan Sandfeld Jensen <allan.jensen@qt.io>
3Date: Fri, 14 Aug 2020 16:38:48 +0200
4Subject: [PATCH] chromium: Fix bison 3.7
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Do a replace run inspired by newer versions of the script.
10
11Fixes: QTBUG-86018
12Change-Id: Ib1dc771e22a662aff0fae842d135ad58fad08bc1
13Reviewed-by: Michael Brüning <michael.bruning@qt.io>
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 .../renderer/build/scripts/rule_bison.py | 19 +++++++++++++++++++
17 1 file changed, 19 insertions(+)
18
19diff --git a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
20index f75e25fd23f..7e0767e951a 100755
21--- a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
22+++ b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
23@@ -45,6 +45,19 @@ from utilities import abs
24
25 from blinkbuild.name_style_converter import NameStyleConverter
26
27+def modify_file(path, prefix_lines, suffix_lines, replace_list=[]):
28+ prefix_lines = map(lambda s: s + '\n', prefix_lines)
29+ suffix_lines = map(lambda s: s + '\n', suffix_lines)
30+ with open(path, 'r') as f:
31+ old_lines = f.readlines()
32+ for i in range(len(old_lines)):
33+ for src, dest in replace_list:
34+ old_lines[i] = old_lines[i].replace(src, dest)
35+ new_lines = prefix_lines + old_lines + suffix_lines
36+ with open(path, 'w') as f:
37+ f.writelines(new_lines)
38+
39+
40 assert len(sys.argv) == 4 or len(sys.argv) == 5
41
42 inputFile = abs(sys.argv[1])
43@@ -115,3 +128,9 @@ print >>outputHFile, '#define %s' % headerGuard
44 print >>outputHFile, outputHContents
45 print >>outputHFile, '#endif // %s' % headerGuard
46 outputHFile.close()
47+
48+common_replace_list = [(inputRoot + '.hh',
49+ inputRoot + '.h')]
50+modify_file(
51+ outputCpp, [], [],
52+ replace_list=common_replace_list)
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
index 52607983..8a6660ff 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
@@ -1,4 +1,4 @@
1From 8c9a4027426b0a2c56cc834da0dbad5b8378c2c6 Mon Sep 17 00:00:00 2001 1From 344e8a3945a29239dd2f27ea4969e3d64d5d8911 Mon Sep 17 00:00:00 2001
2From: Andrej Valek <andrej.valek@siemens.com> 2From: Andrej Valek <andrej.valek@siemens.com>
3Date: Fri, 17 Apr 2020 09:43:32 +0200 3Date: Fri, 17 Apr 2020 09:43:32 +0200
4Subject: [PATCH] chromium: icu: use system library only targets 4Subject: [PATCH] chromium: icu: use system library only targets
@@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20 1 file changed, 14 insertions(+), 4 deletions(-) 20 1 file changed, 14 insertions(+), 4 deletions(-)
21 21
22diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn 22diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
23index 023d6e13a2c..312f34d6186 100644 23index 73673fa20ac..a656692c7bf 100644
24--- a/chromium/third_party/icu/BUILD.gn 24--- a/chromium/third_party/icu/BUILD.gn
25+++ b/chromium/third_party/icu/BUILD.gn 25+++ b/chromium/third_party/icu/BUILD.gn
26@@ -7,9 +7,13 @@ import("//build/config/host_byteorder.gni") 26@@ -7,9 +7,13 @@ import("//build/config/host_byteorder.gni")
@@ -37,9 +37,9 @@ index 023d6e13a2c..312f34d6186 100644
37 } 37 }
38 38
39 if (is_android) { 39 if (is_android) {
40@@ -20,6 +24,12 @@ if (is_mac) { 40@@ -23,6 +27,12 @@ if (is_mac) {
41 import("//build/config/sanitizers/sanitizers.gni") 41 assert(!icu_disable_thin_archive || !is_component_build,
42 } 42 "icu_disable_thin_archive only works in static library builds")
43 43
44+if (use_system_icu) { 44+if (use_system_icu) {
45+ # Use system library only for target, otherwise use bundled 45+ # Use system library only for target, otherwise use bundled
@@ -50,7 +50,7 @@ index 023d6e13a2c..312f34d6186 100644
50 # Meta target that includes both icuuc and icui18n. Most targets want both. 50 # Meta target that includes both icuuc and icui18n. Most targets want both.
51 # You can depend on the individually if you need to. 51 # You can depend on the individually if you need to.
52 group("icu") { 52 group("icu") {
53@@ -1207,7 +1217,7 @@ config("system_icu_config") { 53@@ -1222,7 +1232,7 @@ config("system_icu_config") {
54 } 54 }
55 } 55 }
56 56
@@ -59,7 +59,7 @@ index 023d6e13a2c..312f34d6186 100644
59 pkg_config("system_icui18n") { 59 pkg_config("system_icui18n") {
60 packages = [ "icu-i18n" ] 60 packages = [ "icu-i18n" ]
61 } 61 }
62@@ -1420,7 +1430,7 @@ shim_headers("icuuc_shim") { 62@@ -1435,7 +1445,7 @@ shim_headers("icuuc_shim") {
63 } 63 }
64 64
65 config("icu_config") { 65 config("icu_config") {
@@ -68,7 +68,7 @@ index 023d6e13a2c..312f34d6186 100644
68 configs = [ ":system_icu_config"] 68 configs = [ ":system_icu_config"]
69 } else { 69 } else {
70 configs = [ ":bundled_icu_config"] 70 configs = [ ":bundled_icu_config"]
71@@ -1428,7 +1438,7 @@ config("icu_config") { 71@@ -1443,7 +1453,7 @@ config("icu_config") {
72 } 72 }
73 73
74 group("icuuc") { 74 group("icuuc") {
@@ -77,7 +77,7 @@ index 023d6e13a2c..312f34d6186 100644
77 deps = [ ":icuuc_shim" ] 77 deps = [ ":icuuc_shim" ]
78 public_configs = [ 78 public_configs = [
79 ":system_icu_config", 79 ":system_icu_config",
80@@ -1440,7 +1450,7 @@ group("icuuc") { 80@@ -1455,7 +1465,7 @@ group("icuuc") {
81 } 81 }
82 82
83 group("icui18n") { 83 group("icui18n") {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
deleted file mode 100644
index 2da3e09d..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 1902fc967d6f900a4e918e56f21bc856a0462e4c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:12:39 -0700
4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
5 LinuxSigInfo
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc
13index 003708d2c89..0fef3148f9d 100644
14--- a/chromium/sandbox/linux/seccomp-bpf/trap.cc
15+++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc
16@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
17 // most versions of glibc don't include this information in siginfo_t. So,
18 // we need to explicitly copy it into a arch_sigsys structure.
19 struct arch_sigsys sigsys;
20- memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
21+ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
22
23 #if defined(__mips__)
24 // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
index 04bf89e4..50d17413 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] chromium: musl: Adjust default pthread stack size
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 chromium/base/threading/platform_thread_linux.cc | 3 ++- 8 chromium/base/threading/platform_thread_linux.cc | 3 ++-
9 .../third_party/blink/renderer/platform/wtf/stack_util.cc | 4 ++-- 9 chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 2 +-
10 2 files changed, 4 insertions(+), 3 deletions(-) 10 2 files changed, 3 insertions(+), 2 deletions(-)
11 11
12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc 12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
13index 095c49b8dc0..d1479b54d48 100644 13index 74a01ad5af5..dab5773d73b 100644
14--- a/chromium/base/threading/platform_thread_linux.cc 14--- a/chromium/base/threading/platform_thread_linux.cc
15+++ b/chromium/base/threading/platform_thread_linux.cc 15+++ b/chromium/base/threading/platform_thread_linux.cc
16@@ -186,7 +186,8 @@ void TerminateOnThread() {} 16@@ -377,7 +377,8 @@ void TerminateOnThread() {}
17 17
18 size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { 18 size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
19 #if !defined(THREAD_SANITIZER) 19 #if !defined(THREAD_SANITIZER)
@@ -24,15 +24,15 @@ index 095c49b8dc0..d1479b54d48 100644
24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the 24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the
25 // default stack size isn't enough for some browser tests. 25 // default stack size isn't enough for some browser tests.
26diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 26diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
27index b2421649ff3..a31b96e90e6 100644 27index ab1dff4167e..b0763b0bd9a 100644
28--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 28--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
29+++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 29+++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
30@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() { 30@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size 31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
32 // correctly for the main thread. 32 // correctly for the main thread.
33 33
34-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ 34-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
35+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ 35+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
36 defined(OS_FUCHSIA) 36 defined(OS_FUCHSIA)
37 // pthread_getattr_np() can fail if the thread is not invoked by 37 // pthread_getattr_np() can fail if the thread is not invoked by
38 // pthread_create() (e.g., the main thread of blink_unittests). 38 // pthread_create() (e.g., the main thread of blink_unittests).
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
index e6fa0887..edeb3272 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 5 insertions(+) 14 1 file changed, 5 insertions(+)
15 15
16diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h 16diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
17index d2bd9df4d40..88ea7f508aa 100644 17index fd8efdffea6..22a8863031c 100644
18--- a/chromium/third_party/lss/linux_syscall_support.h 18--- a/chromium/third_party/lss/linux_syscall_support.h
19+++ b/chromium/third_party/lss/linux_syscall_support.h 19+++ b/chromium/third_party/lss/linux_syscall_support.h
20@@ -1239,6 +1239,11 @@ struct kernel_statfs { 20@@ -1244,6 +1244,11 @@ struct kernel_statfs {
21 #ifndef __NR_fallocate 21 #ifndef __NR_fallocate
22 #define __NR_fallocate 285 22 #define __NR_fallocate 285
23 #endif 23 #endif
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
index 8db39395..72adf1cb 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
25 1 file changed, 6 insertions(+), 2 deletions(-) 25 1 file changed, 6 insertions(+), 2 deletions(-)
26 26
27diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc 27diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc
28index 572472a6993..504fdb5d5c6 100644 28index 7df6892d67e..030ff8896e4 100644
29--- a/chromium/net/socket/udp_socket_posix.cc 29--- a/chromium/net/socket/udp_socket_posix.cc
30+++ b/chromium/net/socket/udp_socket_posix.cc 30+++ b/chromium/net/socket/udp_socket_posix.cc
31@@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( 31@@ -1199,8 +1199,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
32 for (auto& buffer : buffers) 32 for (auto& buffer : buffers)
33 msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); 33 msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
34 msgvec->reserve(buffers.size()); 34 msgvec->reserve(buffers.size());
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index f87d96e8..6ba8ba4a 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -23,6 +23,8 @@ DEPENDS += " \
23 qtlocation \ 23 qtlocation \
24 libdrm fontconfig pixman openssl pango cairo pciutils nss \ 24 libdrm fontconfig pixman openssl pango cairo pciutils nss \
25 libcap \ 25 libcap \
26 jpeg-native \
27 freetype-native \
26 gperf-native \ 28 gperf-native \
27 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ 29 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \ 30 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \
@@ -43,7 +45,7 @@ SECURITY_STRINGFORMAT = ""
43 45
44# To use system ffmpeg you need to enable also libwebp, opus, vpx 46# To use system ffmpeg you need to enable also libwebp, opus, vpx
45# Only depenedencies available in oe-core are enabled by default 47# Only depenedencies available in oe-core are enabled by default
46PACKAGECONFIG ??= "libwebp libevent libpng \ 48PACKAGECONFIG ??= "libevent libpng \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 49 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
48 50
49PACKAGECONFIG[icu] = "-feature-webengine-system-icu,-no-feature-webengine-system-icu,icu" 51PACKAGECONFIG[icu] = "-feature-webengine-system-icu,-no-feature-webengine-system-icu,icu"
@@ -142,7 +144,7 @@ RDEPENDS_${PN}-examples += " \
142 qtdeclarative-qmlplugins \ 144 qtdeclarative-qmlplugins \
143" 145"
144 146
145QT_MODULE_BRANCH_CHROMIUM = "80-based" 147QT_MODULE_BRANCH_CHROMIUM = "83-based"
146 148
147# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc 149# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc
148# 5.15-glibc.meta-qt5.8 150# 5.15-glibc.meta-qt5.8
@@ -165,7 +167,7 @@ SRC_URI += " \
165 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ 167 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
166 file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ 168 file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
167 file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ 169 file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
168 file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ 170 file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch;patchdir=src/3rdparty \
169 file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \ 171 file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \
170 file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \ 172 file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \
171 file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \ 173 file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \
@@ -173,7 +175,6 @@ SRC_URI += " \
173 file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ 175 file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \
174 file://chromium/0011-chromium-Include-cstddef-and-cstdint.patch;patchdir=src/3rdparty \ 176 file://chromium/0011-chromium-Include-cstddef-and-cstdint.patch;patchdir=src/3rdparty \
175 file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ 177 file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \
176 file://chromium/0013-chromium-Fix-bison-3.7.patch;patchdir=src/3rdparty \
177 file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ 178 file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \
178 file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \ 179 file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \
179 file://chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch;patchdir=src/3rdparty \ 180 file://chromium/0016-chromium-Fix-compiler-error-emitted-with-clang11.patch;patchdir=src/3rdparty \
@@ -188,7 +189,6 @@ SRC_URI_append_libc-musl = "\
188 file://chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ 189 file://chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
189 file://chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ 190 file://chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
190 file://chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ 191 file://chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
191 file://chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
192 file://chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ 192 file://chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
193 file://chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ 193 file://chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
194 file://chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ 194 file://chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
@@ -198,8 +198,8 @@ SRC_URI_append_libc-musl = "\
198 file://chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ 198 file://chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
199" 199"
200 200
201SRCREV_qtwebengine = "f5268555099a1a96f8730035a40f04a473dd396e" 201SRCREV_qtwebengine = "5537ff4437ea7a5f9ea140071343f88bf48deddc"
202SRCREV_chromium = "7b2f027ea83c372c33d5b50deb65a2d98244aa04" 202SRCREV_chromium = "fb6ab5e483876298235be1c6a6013b426c82b759"
203SRCREV = "${SRCREV_qtwebengine}" 203SRCREV = "${SRCREV_qtwebengine}"
204 204
205SRCREV_FORMAT = "qtwebengine_chromium" 205SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index 97535926..fd14851a 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 = "a76d0002b75ecf0ed9ef6ddb1b96056aa324eed7" 21SRCREV = "5e41e564aaf96b7e49403af5099995efbe4cac8e"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 2fa3b39d..c84f7828 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 = "652818acf91b6447270d667cb9792ffcf066878f" 14SRCREV = "f73735911b2124ef16aa39228bf8f89ee900ba5d"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 66e434c1..fcabec7a 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -23,4 +23,4 @@ python() {
23 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): 23 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
24 raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') 24 raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
25} 25}
26SRCREV = "3db7be97488c19e34360bc48cb46605d51876e15" 26SRCREV = "800926cc4e0ecfdb37a3b34486403354b66a37a4"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 3234aeb1..8a24f2f7 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 = "c8623a37ace095375139500c929d268139ec317a" 15SRCREV = "9bb0adeac84da6723cf57a2bb0d0c3b405691a15"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index cae45f9c..f5db658d 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -25,6 +25,6 @@ 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 = "27b65209cb65164fbd889bf3a29d2968e0c78f45" 28SRCREV = "50421402f05b3ee3c76c6cff455a69efaf576b6d"
29 29
30BBCLASSEXTEND =+ "native nativesdk" 30BBCLASSEXTEND =+ "native nativesdk"