summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-04-21 18:14:40 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-04-21 18:31:19 +0200
commitd6b6838e55aae46699e4dbdc24c13bc405e94f32 (patch)
tree86386fa988844b3acab3f3f01ef2878b8b399728
parent05b3e648ec3508f4f73eeb094bdb82440519c56c (diff)
downloadmeta-qt5-d6b6838e55aae46699e4dbdc24c13bc405e94f32.tar.gz
qt5: upgrade to 5.15 beta4
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_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/qtopcua_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/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch2
-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.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch20
-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-ma.patch6
-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.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch2
-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.patch8
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb12
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
46 files changed, 74 insertions, 74 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index c4231585..651d2443 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -196,4 +196,4 @@ fakeroot do_generate_qt_environment_file() {
196do_generate_qt_environment_file[umask] = "022" 196do_generate_qt_environment_file[umask] = "022"
197addtask generate_qt_environment_file after do_install before do_package 197addtask generate_qt_environment_file after do_install before do_package
198 198
199SRCREV = "12fc3f575102a69fcfba36eeb9ae04bd3d54d820" 199SRCREV = "806bc5fc0559119a2d24d7464a56d5692da91b36"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 4d9cf2d8..25af7dcf 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 = "622c757a93624c660de9a33fc833a10de6a2efe6" 39SRCREV = "e326d8b7d7c96a628667d0a464f3c1e776d7cf1b"
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 a3c16a18..2cd6ce4b 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.14.99+5.15-beta3+git${SRCPV}" 17PV = "5.14.99+5.15-beta4+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index f424f0c0..d5fd2ace 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -143,4 +143,4 @@ do_install() {
143 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 143 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
144} 144}
145 145
146SRCREV = "12fc3f575102a69fcfba36eeb9ae04bd3d54d820" 146SRCREV = "806bc5fc0559119a2d24d7464a56d5692da91b36"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index ea28c27a..a5fb3332 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -294,4 +294,4 @@ sed -i \
294 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 294 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
295} 295}
296 296
297SRCREV = "12fc3f575102a69fcfba36eeb9ae04bd3d54d820" 297SRCREV = "806bc5fc0559119a2d24d7464a56d5692da91b36"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 28a79ce3..ff6a8ced 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -31,6 +31,6 @@ do_install_append_class-nativesdk() {
31 rm -rf ${D}${OE_QMAKE_PATH_QML} 31 rm -rf ${D}${OE_QMAKE_PATH_QML}
32} 32}
33 33
34SRCREV = "d552cd3f50efb9b67c7be88009392d601d3c6682" 34SRCREV = "6555642db7b3b992335f98dc01863db4beea3fd4"
35 35
36BBCLASSEXTEND =+ "native nativesdk" 36BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index 17b7ed7b..31cc7778 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 = "e672503b2f4ba303617e6e1b5e3119b09d7607b0" 12SRCREV = "6e48bcfd40e9a8a2f6c870e5468ad04de2436506"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 93e87994..ad5907cd 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 = "7f0503acb042d047682b432e68ed97b1644c3f59" 41SRCREV = "b7c6c49d8026bebef0c86ee5b686f8519f2e8622"
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/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index 8e50721d..a0b9e1ae 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 = "9ae4d93b0b3155716495dce6336859f9d2c4db6c" 21SRCREV = "0f9692e4dee6ba6471aca405e251a189c9388d1a"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index 28cfd024..e267736b 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 = "ba49d22e9dce12f2a85b91d4876d8e1aee0792df" 24SRCREV_qtquick3d = "5cbcc4f38aa08026d45eff75f2612c6243f0d3f7"
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 7c1966bc..93ed8f6b 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 = "e7b8ac68cf0284b97fe130d4d3676b2c651b5b05" 13SRCREV = "71757283972348971a79c905f9c8b1b42870d876"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 7ebd5f3e..9c40c330 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -49,6 +49,6 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
49 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ 49 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
50" 50"
51 51
52SRCREV = "78e8a23e171569d231c3b8cd14fddef1e9b10a34" 52SRCREV = "d53af222939321fb816d44f86588c3eb8c255e10"
53 53
54BBCLASSEXTEND = "native nativesdk" 54BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index a907ac81..0d166a22 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 = "64adb8c01d477cec0b8fe3e3903778eb0c71a620" 101SRCREV = "b0be8ca652f732439e562f75be372730e2452042"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 9ac04bf8..2500476e 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -41,7 +41,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
41 41
42EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 42EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
43 43
44SRCREV = "e2d2d7e06ae4d054d75738038645126bce9092ad" 44SRCREV = "00b6314f79cf4d8b1ea2ba81dbafe7088c52ae84"
45 45
46BBCLASSEXTEND =+ "native nativesdk" 46BBCLASSEXTEND =+ "native nativesdk"
47 47
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index f71c3b9b..57a3ed67 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 = "1f793c887773f9b7477a73467aa1e2497ffef25c" 15SRCREV = "4af709df207bf7c98ae5ffd699a66d33767d6300"
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index c3597eaf..9b8ddef0 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From e4a6ca9bf08383ec3c271746edc9e970f4cd2412 Mon Sep 17 00:00:00 2001 1From 4575335a6a8b0727363afa03336c1762a340d7cf Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
19 3 files changed, 10 insertions(+), 10 deletions(-) 19 3 files changed, 10 insertions(+), 10 deletions(-)
20 20
21diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri 21diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
22index 2aa345c2..a55dc128 100644 22index c02af390..98af1d68 100644
23--- a/src/buildtools/config/linux.pri 23--- a/src/buildtools/config/linux.pri
24+++ b/src/buildtools/config/linux.pri 24+++ b/src/buildtools/config/linux.pri
25@@ -122,7 +122,7 @@ contains(QT_ARCH, "mips") { 25@@ -122,7 +122,7 @@ contains(QT_ARCH, "mips") {
diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
index 57c0afa2..3470e9c9 100644
--- a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
@@ -1,4 +1,4 @@
1From e4f1790fd91b5d214b5a524575d815530a587ac2 Mon Sep 17 00:00:00 2001 1From ee0700753d1fc3001da7df9e91d7478b60598e96 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 12 Dec 2017 16:06:14 +0200 3Date: Tue, 12 Dec 2017 16:06:14 +0200
4Subject: [PATCH] musl: don't use pvalloc as it's not available on musl 4Subject: [PATCH] musl: don't use pvalloc as it's not available on musl
diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch
index baf62462..058a90fc 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 15a79d185bf9b275ae0eb09041758021a178774f Mon Sep 17 00:00:00 2001 1From 9a99864ceed71eebcbfbbcbc90b877a9ad505b20 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
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 e7377cfc..0f0f534d 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
@@ -1,4 +1,4 @@
1From e6a216265bf68f600682c7d27a2542c4f385e085 Mon Sep 17 00:00:00 2001 1From 947bba762706f6212b6e44e15364af129c49f8c5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 12 Nov 2019 19:53:59 -0800 3Date: Tue, 12 Nov 2019 19:53:59 -0800
4Subject: [PATCH] mkspecs: Allow builds with libc != glibc 4Subject: [PATCH] mkspecs: Allow builds with libc != glibc
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 8e008832..7916d99c 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 af441fca2705c866fe9d6699dd2ddc388a5412e2 Mon Sep 17 00:00:00 2001 1From d6b2b2a9cf25009f13fb2bef5eebfdeef471bbb6 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 3c211ca4..fd9301a8 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 1f4c9aaaa625ed6c4a84eed9bed143de056d3535 Mon Sep 17 00:00:00 2001 1From 18af47b85fb13b6e9f1d88a8beb3c01745c75ebb 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,7 +17,7 @@ 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 9276f5627af..622cc1fbf7e 100644 20index 8e0cc385792..d2bd9df4d40 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@@ -2012,7 +2012,7 @@ struct kernel_statfs {
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 0171a5dd..eeb3f640 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 e590e511b89a08867a801cb20e4e98787cb36e78 Mon Sep 17 00:00:00 2001 1From dd5033e3b9a425b3435629d9e8901b8445119fdb 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 ab47e2b98f8..f5ac335af90 100644 13index fdfcf65f5ab..13d71d04030 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@@ -774,8 +774,6 @@ config("compiler_cpu_abi") { 16@@ -779,8 +779,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 ab47e2b98f8..f5ac335af90 100644
22 } 22 }
23 if (!is_nacl) { 23 if (!is_nacl) {
24 cflags += [ 24 cflags += [
25@@ -788,8 +786,6 @@ config("compiler_cpu_abi") { 25@@ -793,8 +791,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 ab47e2b98f8..f5ac335af90 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@@ -798,9 +794,6 @@ config("compiler_cpu_abi") { 34@@ -803,9 +799,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 ab47e2b98f8..f5ac335af90 100644
41 } 41 }
42 } else { 42 } else {
43 cflags += [ "-EL" ] 43 cflags += [ "-EL" ]
44@@ -879,10 +872,7 @@ config("compiler_cpu_abi") { 44@@ -884,10 +877,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 ab47e2b98f8..f5ac335af90 100644
53 cflags += [ "-EB" ] 53 cflags += [ "-EB" ]
54 ldflags += [ "-EB" ] 54 ldflags += [ "-EB" ]
55 } 55 }
56@@ -929,9 +919,6 @@ config("compiler_cpu_abi") { 56@@ -934,9 +924,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 ab47e2b98f8..f5ac335af90 100644
63 } 63 }
64 } else { 64 } else {
65 cflags += [ 65 cflags += [
66@@ -988,10 +975,7 @@ config("compiler_cpu_abi") { 66@@ -993,10 +980,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 ab47e2b98f8..f5ac335af90 100644
75 cflags += [ 75 cflags += [
76 "-EB", 76 "-EB",
77 "-mabi=64", 77 "-mabi=64",
78@@ -1160,13 +1144,6 @@ config("compiler_deterministic") { 78@@ -1165,13 +1149,6 @@ config("compiler_deterministic") {
79 } 79 }
80 } 80 }
81 } 81 }
@@ -83,7 +83,7 @@ index ab47e2b98f8..f5ac335af90 100644
83- # Tells the compiler not to use absolute paths when passing the default 83- # Tells the compiler not to use absolute paths when passing the default
84- # paths to the tools it invokes. We don't want this because we don't 84- # paths to the tools it invokes. We don't want this because we don't
85- # really need it and it can mess up the goma cache entries. 85- # really need it and it can mess up the goma cache entries.
86- if (is_clang && !is_nacl) { 86- if (is_clang && !is_nacl && !(use_qt && use_libcxx)) {
87- cflags += [ "-no-canonical-prefixes" ] 87- cflags += [ "-no-canonical-prefixes" ]
88- } 88- }
89 } 89 }
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 bed1c564..546fcac6 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 ab04dfceba3db888c5e8d6416668850dc0bb677e Mon Sep 17 00:00:00 2001 1From 66d28dccd67ca1095804ef1293d499fd5a2d1d6a 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 cd9fed01e5a..42070dd80fa 100644 18index 4422fecc0c8..1b398ad981a 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@@ -78,8 +78,11 @@ if (use_arm_neon_optimizations) { 21@@ -80,8 +80,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-ma.patch
index 0e8e3bf4..4d95414e 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
@@ -1,4 +1,4 @@
1From 097b6df14e56a9bd800a277d65e117fec96372a0 Mon Sep 17 00:00:00 2001 1From c820f61ac2e254758e863175423be6387907df81 Mon Sep 17 00:00:00 2001
2From: Johannes Pointner <johannes.pointner@br-automation.com> 2From: Johannes Pointner <johannes.pointner@br-automation.com>
3Date: Fri, 3 May 2019 09:12:38 +0200 3Date: Fri, 3 May 2019 09:12:38 +0200
4Subject: [PATCH] chromium: Do not try to set the guessed values for 4Subject: [PATCH] chromium: Do not try to set the guessed values for
@@ -17,10 +17,10 @@ Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
17 1 file changed, 9 deletions(-) 17 1 file changed, 9 deletions(-)
18 18
19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
20index f5ac335af90..70b352f1ed1 100644 20index 13d71d04030..3ebcf1ddbc3 100644
21--- a/chromium/build/config/compiler/BUILD.gn 21--- a/chromium/build/config/compiler/BUILD.gn
22+++ b/chromium/build/config/compiler/BUILD.gn 22+++ b/chromium/build/config/compiler/BUILD.gn
23@@ -775,15 +775,6 @@ config("compiler_cpu_abi") { 23@@ -780,15 +780,6 @@ config("compiler_cpu_abi") {
24 } else if (current_cpu == "arm") { 24 } else if (current_cpu == "arm") {
25 if (is_clang && !is_android && !is_nacl) { 25 if (is_clang && !is_android && !is_nacl) {
26 } 26 }
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 6884d101..851d73ae 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 dcb8f604a55c9d255102b8939dae1d5464398892 Mon Sep 17 00:00:00 2001 1From 98af1c4ce180f029e6fa1a1dfdf438296eb7dae2 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 7322807095f..0d6f981e895 100644 31index 0d610ccfe33..c1844b61168 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 507f8b8b..3220ae9d 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 da4adf97a2ee92a058f6f04a406d6447d05a657a Mon Sep 17 00:00:00 2001 1From 3ef0d63778bdafca66017a6d1d5599f5c92f21b3 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 c1d6d26acc6..6de81b751dd 100644 18index ead4e57dc15..7ba975e660a 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 81b0f026..504a5dba 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 c24673923fca116df3bf59f19f8c668973f77e4d Mon Sep 17 00:00:00 2001 1From 172ab111e6d2626780bb4fb22e4c4e74106a802e 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
@@ -51,12 +51,12 @@ index 363c3183e05..4fccfd62f84 100644
51 } 51 }
52 file.Write(0, report_content.c_str(), report_content.length()); 52 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 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 ccd3a499a38..5a2da89d09a 100644 54index 0d5b83148f6..1f17608e94d 100644
55--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h 55--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
56+++ b/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 @@ 57@@ -14,6 +14,11 @@
58 58
59 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" 59 #include "base/component_export.h"
60 60
61+#ifndef input_event_sec 61+#ifndef input_event_sec
62+#define input_event_sec time.tv_sec 62+#define input_event_sec time.tv_sec
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 9f8caba7..e494e061 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 9a4797b32a3a3014bb9cd9811a755185a738b59b Mon Sep 17 00:00:00 2001 1From e8f23ce32baf1e0d9c2249e50c949c9cd86095e0 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
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 c2a0338c..b64fd9a3 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 046704d6ac338b548a85dc1f7af5810276175a9f Mon Sep 17 00:00:00 2001 1From 6211643cff8c828be75f6504ec16246f8746add4 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 fa382f9d..d97e9bd7 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 905c5b699f97105029a498096b3b6b3c8736cfeb Mon Sep 17 00:00:00 2001 1From 75d5b91b202dc2f5ff380cc36fdb9ac50f6c80ca 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 225e7157..a5b0ec6c 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 bf8381f35e8f4aeac0cbdb9b4a960bccf259f69c Mon Sep 17 00:00:00 2001 1From 7a7008c0705cdea1acdb77eb51dd98003b15f7c4 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,16 +14,16 @@ 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 426d83b4561..501e78d793c 100644 17index 9107b302476..12d8171d238 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@@ -3405,7 +3405,8 @@ v8_source_set("v8_base_without_compiler") { 20@@ -3324,7 +3324,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" ||
24- v8_current_cpu == "s390" || v8_current_cpu == "s390x") { 24- v8_current_cpu == "s390" || v8_current_cpu == "s390x") {
25+ v8_current_cpu == "s390" || v8_current_cpu == "s390x" || 25+ v8_current_cpu == "s390" || v8_current_cpu == "s390x" ||
26+ v8_current_cpu == "x86") { 26+ v8_current_cpu == "x86") {
27 libs = [ "atomic" ] 27 libs += [ "atomic" ]
28 } 28 }
29 29
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index 0e5b2b22..90700798 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -1,4 +1,4 @@
1From fbd1beb51ff1da1fba180f7f0ca239975d47276b Mon Sep 17 00:00:00 2001 1From 85dc2559eab2d6f02c0e09bf5895af4668239294 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:01:12 -0700 3Date: Fri, 7 Jul 2017 14:01:12 -0700
4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not 4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index ef12eec3..59ea43ab 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
1From b941a200af8547946255c383b29c3f7b68598a75 Mon Sep 17 00:00:00 2001 1From 06ade5afbcb37a77d8488291f812cc9049fdb55e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:09:06 -0700 3Date: Fri, 7 Jul 2017 14:09:06 -0700
4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux 4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch
index 3de13d9a..3fc011e2 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch
@@ -1,4 +1,4 @@
1From 35c208fa2c7f8f189b8125b16fca8356d88920a7 Mon Sep 17 00:00:00 2001 1From a4ce19d536f36de6f2065bb8bed6aa451a466664 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:37:49 -0700 3Date: Fri, 7 Jul 2017 14:37:49 -0700
4Subject: [PATCH] chromium: musl: include fcntl.h for loff_t 4Subject: [PATCH] chromium: musl: include fcntl.h for loff_t
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index 9308ef78..2d433807 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
1From 5134d082447b67b2459ee1e84f4aa2ee3937b19a Mon Sep 17 00:00:00 2001 1From 4ac8cae0c6c23b1d64c405a0c3919465a82c6b47 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:38:37 -0700 3Date: Fri, 7 Jul 2017 14:38:37 -0700
4Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t 4Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch
index c5b4b457..ae5d18ea 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
1From b80a61e044cd4cca307cbe706684e7136fd79601 Mon Sep 17 00:00:00 2001 1From 9819554c2d70a95d9cd418349baa076c10cb5d76 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:54:38 -0700 3Date: Fri, 7 Jul 2017 14:54:38 -0700
4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction 4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
index 3e2c8ddd..2d8839de 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -1,4 +1,4 @@
1From 854c9b6e21e2afaeb427c32ba57eee870f45e817 Mon Sep 17 00:00:00 2001 1From c7dcc21ee04718b6852af0ca161451c0d35f3cbc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:09:02 -0700 3Date: Fri, 7 Jul 2017 15:09:02 -0700
4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols 4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
index 1236555d..c1da92de 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
@@ -1,4 +1,4 @@
1From bdbf26f52d06dbc61ad934f14ac0bbb036a96a39 Mon Sep 17 00:00:00 2001 1From f9bfe2d381e1ee94ec924d521e57e04661df15c7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:12:39 -0700 3Date: Fri, 7 Jul 2017 15:12:39 -0700
4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from 4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index d6671065..ac7c30ef 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
1From 9604eab855a715b2ab30109f227d75269e3f2001 Mon Sep 17 00:00:00 2001 1From 7453ddb3c603814e8649df09dbe4ee273da1ca8f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:27:50 -0700 3Date: Fri, 7 Jul 2017 15:27:50 -0700
4Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc 4Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index a0208998..a49be3ec 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -1,4 +1,4 @@
1From 45b236215d3c082b30c8d68421c65828415d85f2 Mon Sep 17 00:00:00 2001 1From bebaeea8a0025d035190622700421ab45821345c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:39:57 -0700 3Date: Fri, 7 Jul 2017 15:39:57 -0700
4Subject: [PATCH] chromium: musl: Do not define __sbrk on musl 4Subject: [PATCH] chromium: musl: Do not define __sbrk on musl
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
index f9bbc1c2..d5bf4132 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,4 +1,4 @@
1From e9bab0dfd2bd66ad883d5e67e7b2ffca7a12bfff Mon Sep 17 00:00:00 2001 1From 146508f20c7008e7b601470e711d322e9b4bde93 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 16:41:23 -0700 3Date: Fri, 7 Jul 2017 16:41:23 -0700
4Subject: [PATCH] chromium: musl: Adjust default pthread stack size 4Subject: [PATCH] chromium: musl: Adjust default pthread stack size
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
index f7a0ec04..85c9de51 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -1,4 +1,4 @@
1From 871e56119bdf17db727572ab18f31f0671c5a315 Mon Sep 17 00:00:00 2001 1From 42251b50702ea76c12cb57327e34c0cf40cbd510 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Sep 2018 12:35:07 -0700 3Date: Tue, 25 Sep 2018 12:35:07 -0700
4Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on 4Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
index f502b74e..29405638 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
@@ -1,4 +1,4 @@
1From 3014e7511b95d88d5b1bf2ab860e54acf2f0dc09 Mon Sep 17 00:00:00 2001 1From 6469bf2b401f1cce1d4258ba8cae0746b8559300 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Sep 2018 12:59:05 -0700 3Date: Tue, 25 Sep 2018 12:59:05 -0700
4Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get 4Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
index ee5ca7d1..e4cb8794 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
@@ -1,4 +1,4 @@
1From 3a243b9e35dadac30cff5ee2efd2917818eda177 Mon Sep 17 00:00:00 2001 1From feceed2ff7bb63d5d9b1d1fcf3207fc8c91b87ed Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Dec 2018 16:58:04 -0800 3Date: Sun, 23 Dec 2018 16:58:04 -0800
4Subject: [PATCH] chromium: musl: pread pwrite 4Subject: [PATCH] chromium: musl: pread pwrite
@@ -14,7 +14,7 @@ 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 622cc1fbf7e..cd561b80c05 100644 17index d2bd9df4d40..88ea7f508aa 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@@ -1239,6 +1239,11 @@ struct kernel_statfs {
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 3b8bd469..cc56f5d1 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -142,10 +142,10 @@ RDEPENDS_${PN}-examples += " \
142 qtdeclarative-qmlplugins \ 142 qtdeclarative-qmlplugins \
143" 143"
144 144
145QT_MODULE_BRANCH_CHROMIUM = "79-based" 145QT_MODULE_BRANCH_CHROMIUM = "80-based"
146 146
147# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 147# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15
148# 5.15.meta-qt5.4 148# 5.15.meta-qt5.5
149SRC_URI += " \ 149SRC_URI += " \
150 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 150 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
151 file://0001-Force-host-toolchain-configuration.patch \ 151 file://0001-Force-host-toolchain-configuration.patch \
@@ -156,8 +156,8 @@ SRC_URI_append_libc-musl = "\
156 file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \ 156 file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \
157" 157"
158 158
159# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/79-based 159# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based
160# 79-based.meta-qt5.2 160# 80-based.meta-qt5.2
161SRC_URI += " \ 161SRC_URI += " \
162 file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ 162 file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
163 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ 163 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
@@ -189,8 +189,8 @@ SRC_URI_append_libc-musl = "\
189 file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 189 file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
190" 190"
191 191
192SRCREV_qtwebengine = "6b62dfe7242ce0d3067aa98620664a4dc7a656d8" 192SRCREV_qtwebengine = "9e56f570e31a0ef18e544bb21dfddebfe43ec2d0"
193SRCREV_chromium = "9424dc7ceeccf6e6d5edc7757edb39a7ae4983ab" 193SRCREV_chromium = "6564891efb850d344d852c1d941ed4e9c2a732c1"
194SRCREV = "${SRCREV_qtwebengine}" 194SRCREV = "${SRCREV_qtwebengine}"
195 195
196SRCREV_FORMAT = "qtwebengine_chromium" 196SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index cccc0957..4a61e8a9 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 = "c6d4bb78fe59a55ffce526ff951e5c5270dd92cf" 26SRCREV = "d47cad5ca5c3788fedc0a53930e47efb869f9315"