summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Suonpera <jani.suonpera@qt.io>2021-01-27 09:21:29 +0200
committerJani Suonpera <jani.suonpera@qt.io>2021-02-05 14:56:55 +0200
commita73de388e628a67490cdd7734779d405740b7fa3 (patch)
treec6410cd0062df9dde1fd02b56232027b7f865815
parent7dfe6ec495c3e56e4fbfb1dba23291589c28f7a7 (diff)
downloadmeta-qt5-a73de388e628a67490cdd7734779d405740b7fa3.tar.gz
qt5: update submodules for LTS 5.15
- Webengine-chromium branch changed from 83-based to 87-based. - PACKAGECONFIGs protobuf and jsoncpp are removed because these configurations has been removed from src/buildtools/configure.json - DEPENDS nodejs-native added. This mandatory for chromium build. Task-number: QTBUG-90623 Change-Id: Ic933c88399422941114915afe5baa202850928f4 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-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/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-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_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtknx_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtlottie_git.bb2
-rw-r--r--recipes-qt/qt5/qtmqtt_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_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/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.bb2
-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.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-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-fix-build-with-clang.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch)18
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch49
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0004-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.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch)41
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0006-chromium-fix-build-after-y2038-changes-in-glibc.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch)8
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Include-cstddef-for-size_t-definition.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Move-CharAllocator-definition-to-a-header-f.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch)8
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Link-v8-with-libatomic-on-x86.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch24
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-icu-use-system-library-only-targets.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch)18
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch)14
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Add-missing-include-for-C-strncpy.patch22
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch)4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch)14
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-include-fcntl.h-for-loff_t.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-include-fcntl.h-for-loff_t.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-use-off64_t-instead-of-the-internal-__.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch)10
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch)12
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch)2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Adjust-default-pthread-stack-size.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch)12
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch24
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch)46
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch)41
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-pread-pwrite.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch)10
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb59
-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
69 files changed, 233 insertions, 321 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index af09a20d..9033b546 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() {
195do_generate_qt_environment_file[umask] = "022" 195do_generate_qt_environment_file[umask] = "022"
196addtask generate_qt_environment_file after do_install before do_package 196addtask generate_qt_environment_file after do_install before do_package
197 197
198SRCREV = "ffa0ecdc5d507754ddd962e2edbc859c198b2700" 198SRCREV = "270729e48d5f644c0e1dc8c24efa228cfd83a68f"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index ab8ee711..dcf6ddab 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 = "3b8ef584594048514645bc818ab5dd43cf882fe1" 39SRCREV = "b72eca26017ee5b30c1dbfec558e11274b372e01"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index cabe8acc..b10c88b4 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -142,4 +142,4 @@ do_install() {
142 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
143} 143}
144 144
145SRCREV = "ffa0ecdc5d507754ddd962e2edbc859c198b2700" 145SRCREV = "270729e48d5f644c0e1dc8c24efa228cfd83a68f"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index e8a7ad65..d9db4aa6 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -302,4 +302,4 @@ sed -i \
302 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 302 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
303} 303}
304 304
305SRCREV = "ffa0ecdc5d507754ddd962e2edbc859c198b2700" 305SRCREV = "270729e48d5f644c0e1dc8c24efa228cfd83a68f"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 00d69d03..c0696146 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 = "130463160b4923069eb98da49edaf7d93180f4f8" 11SRCREV = "9ac57c36d42d083d1767353c7eb817d96817d22e"
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 bc74eea1..22ab7517 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 = "939716873ed57613db879856cf71bde95de6e7bf" 14SRCREV = "455d7c6f2ea03e44a2d08a9ba40e163f5d0bedd0"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 04826b90..51dc2c7f 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 = "69a87a9b831e36a578594a0a13130c384ad03121" 22SRCREV = "0db3b38521e11147cb802798a2cb7811a96029a9"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 0c80d9ea..b0bc7937 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 = "c085311c02dd216e5a041b90c164d55b3cf3ce92" 11SRCREV = "d480e17ae84e1fb053db3de7b39da1bbbb455632"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index c94965fa..159bd0ef 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -32,6 +32,6 @@ do_install_append_class-nativesdk() {
32 rm -rf ${D}${OE_QMAKE_PATH_QML} 32 rm -rf ${D}${OE_QMAKE_PATH_QML}
33} 33}
34 34
35SRCREV = "e203a185cfab199a89a33b903096d6d0023a8a88" 35SRCREV = "e655719687f339bef0bb2def577f73932367eb02"
36 36
37BBCLASSEXTEND =+ "native nativesdk" 37BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 3746a392..4e9d2574 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 = "64afa18a0a1e9588060e2e6d917bb01ccdd48a81" 17SRCREV = "558c50409d2205a7e02c64164561b55dda7d707e"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 0b4ef2bb..183376b3 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 = "c36998dc1581167b12cc3de8e4ac68c2a5d9f76e" 21SRCREV = "6cee6cddce42b3b46ffba6e4445aab2d1ed48de2"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index dec19f98..e99b0051 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 = "cb82c74310837fe4e832c8ab72176a5d63e4355f" 28SRCREV = "e78696656bfb28b42691ed0445f1a4f370b2d496"
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb
index 0d24c3e4..0e2654f4 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 = "dae081dc404f62619a9945c76898519cb7b524d6" 12SRCREV = "4afdbb3235c461e405d7163d4ad93de473dd8630"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 4ee9ce5b..fdea001f 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 = "861e372b6ad81570d4f496e42fb25a6699b72f2f" 38SRCREV_qtlocation = "a924cd38a71af86023e0a9ea19d3379136b68c7f"
39SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d" 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 a886ce41..0625ac61 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 = "fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4" 12SRCREV = "55ab856e0f5ac84f4a24e6b599eb1952790c4bdd"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index 6d1cc295..b7c96c5c 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 = "0b4955ce8b692409c3deded57892eb61e75be428" 12SRCREV = "45a54d7ef3682c85c3ec05192e326213e246c5a5"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 77c03eef..0b09fea0 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 = "bd29c87027637a013f2c5e3b549fcda84e4d7545" 41SRCREV = "80d46e3a5f64ff2456c40bdba63b6d5c69a32cdd"
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 f3312128..541bb2da 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-lts.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a" 12SRCREV = "7c58247c2526df0c1687f320842fd03f31ec7e90"
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index cabfca75..8d8b5fdd 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 = "c400d4ecf9778e7359da5b1ce9b3e61cc0f49f2e" 21SRCREV = "50d92642ddfbc709df7a4eedc05e46c74df80926"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index 95a810a9..5def15b3 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 = "cbf444fb570ca4f4ca21d963d2ae4010f10d473e" 13SRCREV = "1a36ca30f42a391f2fd4aeb6b7139fddda9d3625"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index 61461056..ac613cf9 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 = "68b30bb23e34426e7d6a4c243a42ae57dfe45c6b" 24SRCREV_qtquick3d = "c7ca1a4fe3fb4b1f6a689ed6b7d8c7dbbdebedd8"
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 3eb68116..11b3b9ca 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 = "a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3" 13SRCREV = "7e819a5777a0632175347688312da9cee0702177"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 2cd9ce19..677263f5 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 = "cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420" 20SRCREV = "345343b7830cd9ccf03ccbe435cdaee13ba8d0fc"
diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb
index 2ea80856..94621fed 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 = "67503cdadea43b95ddad0de1a04951aff0ce1a07" 13SRCREV = "6f7482fbe565a8e51eb336d09e559817e380986f"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index bdf067db..23101df2 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 = "4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735" 28SRCREV = "baccb040a4843d657c68dd7c0399aadcc6160ddc"
29 29
30BBCLASSEXTEND += "native nativesdk" 30BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 0959af9e..0de0fb96 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-lts.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "7a15000f42c7a3171719727cd056f82a78244ed7" 13SRCREV = "2951c124d3ff58abe1f84175e512ba26977f13d8"
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 85f45949..c2b0128c 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 = "921a31375f29e429e95352b08b2b9dbfea663cb1" 15SRCREV = "b85e041d265730bed57fa13984c074ccf0c5ebe6"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 13bdc0fb..043d7135 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -17,4 +17,4 @@ PACKAGECONFIG[socketcan] = "-feature-socketcan,-no-feature-socketcan,,libsocketc
17 17
18EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 18EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
19 19
20SRCREV = "8884c5e43df846deac5a0c7c290eeb633d6bfe32" 20SRCREV = "c4236b865d6027f0873ec71ecc9ee2b003025f8e"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 4995900d..50daaf1d 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 = "941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4" 15SRCREV = "79cc3f07a089e9f58b0b2487b274cca36261bd30"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index cec31869..87f7e986 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 = "aceea78cc05ac8ff947cee9de8149b48771781a8" 15SRCREV = "6d3ab4cde81b2d8be680e5757a30d5e46f772e36"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 6b17e78d..21e5b55d 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -39,7 +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 = "33693a928986006d79c1ee743733cde5966ac402" 42SRCREV = "63bacb8f099b35a68d86a20a80e8ff5e33f86d5f"
43 43
44BBCLASSEXTEND = "native nativesdk" 44BBCLASSEXTEND = "native nativesdk"
45 45
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 35efea20..f7902430 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 = "68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f" 101SRCREV = "1bd8194ea9ea5f3085a0cb689fc5408782d14a2f"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 8036bfe8..cebe8a20 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 = "2f0e9f98c6c6fdac09f762d41fddcc114f64b28a" 74SRCREV = "3ff31b4093611174e89fcd18895ed471b6c753db"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index f0007ee6..83015580 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -43,7 +43,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu
43 43
44EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 44EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
45 45
46SRCREV = "a8d35b3c18bdb05a0da3ed50a554a7b7bd4ebed3" 46SRCREV = "6bb05fed8fdb564f3ff0136bbdaf4efd6088797d"
47 47
48BBCLASSEXTEND =+ "native nativesdk" 48BBCLASSEXTEND =+ "native nativesdk"
49 49
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 078294e4..f58417cc 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 = "47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38" 15SRCREV = "5c35d1cd85ebd015b3fcc758af798ca2af90a7f9"
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 8b5d41ba..43fc31fc 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 5af62581e5116b57efbe4bb7cc467efeb0aab941 Mon Sep 17 00:00:00 2001 1From 0229d48e46497568217b426123a576a2eaaff4e9 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/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch
index a3f292c3..fa64d4a0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch
@@ -1,4 +1,4 @@
1From be18ba6e0b879fbd542f4e0d1a249f2ab5abb27c Mon Sep 17 00:00:00 2001 1From a7012306f328056d5c08ec1320da4037ee8fc5ee 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 ca81bd8ce0f..d3c588b21e3 100644 13index 6a58d21cf07..c007eab8ec9 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@@ -776,8 +776,6 @@ config("compiler_cpu_abi") { 16@@ -782,8 +782,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 ca81bd8ce0f..d3c588b21e3 100644
22 } 22 }
23 if (!is_nacl) { 23 if (!is_nacl) {
24 cflags += [ 24 cflags += [
25@@ -790,8 +788,6 @@ config("compiler_cpu_abi") { 25@@ -796,8 +794,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 ca81bd8ce0f..d3c588b21e3 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@@ -800,9 +796,6 @@ config("compiler_cpu_abi") { 34@@ -806,9 +802,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 ca81bd8ce0f..d3c588b21e3 100644
41 } 41 }
42 } else { 42 } else {
43 cflags += [ "-EL" ] 43 cflags += [ "-EL" ]
44@@ -881,10 +874,7 @@ config("compiler_cpu_abi") { 44@@ -887,10 +880,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 ca81bd8ce0f..d3c588b21e3 100644
53 cflags += [ "-EB" ] 53 cflags += [ "-EB" ]
54 ldflags += [ "-EB" ] 54 ldflags += [ "-EB" ]
55 } 55 }
56@@ -931,9 +921,6 @@ config("compiler_cpu_abi") { 56@@ -937,9 +927,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 ca81bd8ce0f..d3c588b21e3 100644
63 } 63 }
64 } else { 64 } else {
65 cflags += [ 65 cflags += [
66@@ -990,10 +977,7 @@ config("compiler_cpu_abi") { 66@@ -996,10 +983,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 ca81bd8ce0f..d3c588b21e3 100644
75 cflags += [ 75 cflags += [
76 "-EB", 76 "-EB",
77 "-mabi=64", 77 "-mabi=64",
78@@ -1157,13 +1141,6 @@ config("compiler_deterministic") { 78@@ -1166,13 +1150,6 @@ config("compiler_deterministic") {
79 } 79 }
80 } 80 }
81 } 81 }
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
deleted file mode 100644
index c93ba991..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 8dd7987fc70fd8dab4a9f7ee32334c8d28ed34e4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Dec 2018 16:58:04 -0800
4Subject: [PATCH] chromium: stack pointer clobber
5
6Do not add stack pointer to clobber list
7
8it was being ignored until gcc 9.0 became capable
9of flagging this silent ignoring via [1]
10
11[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813<Paste>
12
13Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 chromium/third_party/lss/linux_syscall_support.h | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18
19diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
20index d2baee9d243..fd8efdffea6 100644
21--- a/chromium/third_party/lss/linux_syscall_support.h
22+++ b/chromium/third_party/lss/linux_syscall_support.h
23@@ -2017,7 +2017,7 @@ struct kernel_statfs {
24 : "i" (__NR_##name), "ri" ((long)(arg1)), \
25 "c" ((long)(arg2)), "d" ((long)(arg3)), \
26 "S" ((long)(arg4)), "D" ((long)(arg5)) \
27- : "esp", "memory"); \
28+ : "memory"); \
29 LSS_RETURN(type,__res); \
30 }
31 #undef _syscall6
32@@ -2039,7 +2039,7 @@ struct kernel_statfs {
33 : "i" (__NR_##name), "0" ((long)(&__s)), \
34 "c" ((long)(arg2)), "d" ((long)(arg3)), \
35 "S" ((long)(arg4)), "D" ((long)(arg5)) \
36- : "esp", "memory"); \
37+ : "memory"); \
38 LSS_RETURN(type,__res); \
39 }
40 LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
41@@ -2125,7 +2125,7 @@ struct kernel_statfs {
42 : "0"(-EINVAL), "i"(__NR_clone),
43 "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
44 "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
45- : "esp", "memory", "ecx", "edx", "esi", "edi");
46+ : "memory", "ecx", "edx", "esi", "edi");
47 LSS_RETURN(int, __res);
48 }
49
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch
index c3de3cc5..92f8a30e 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -1,4 +1,4 @@
1From 7eeed60fceeca490c5252e256baff08100e13259 Mon Sep 17 00:00:00 2001 1From 475f0b52895b89b64936c37a338f0d0cf5552297 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 00d1e7c6ca3..f2c36d72dd2 100644 18index 891c2c34bfb..5ab519bd133 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@@ -86,8 +86,11 @@ if (use_arm_neon_optimizations) { 21@@ -115,8 +115,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.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch
index 5f3f4528..1c3a2154 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch
@@ -1,4 +1,4 @@
1From 0faac107930255380ea07aa75267153022de2248 Mon Sep 17 00:00:00 2001 1From b1571a939a3456b576de3a2d4897ea2b1b2b4b89 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
@@ -20,10 +20,10 @@ Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
20 1 file changed, 9 deletions(-) 20 1 file changed, 9 deletions(-)
21 21
22diff --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
23index d3c588b21e3..6d49fde33cc 100644 23index c007eab8ec9..feb4340f522 100644
24--- a/chromium/build/config/compiler/BUILD.gn 24--- a/chromium/build/config/compiler/BUILD.gn
25+++ b/chromium/build/config/compiler/BUILD.gn 25+++ b/chromium/build/config/compiler/BUILD.gn
26@@ -777,15 +777,6 @@ config("compiler_cpu_abi") { 26@@ -783,15 +783,6 @@ config("compiler_cpu_abi") {
27 } else if (current_cpu == "arm") { 27 } else if (current_cpu == "arm") {
28 if (is_clang && !is_android && !is_nacl) { 28 if (is_clang && !is_android && !is_nacl) {
29 } 29 }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch
index f560e315..c3b3c830 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-aarch64-skia-build-fix.patch
@@ -1,4 +1,4 @@
1From 69abe5acb926cef9ac771015ade3873fa9985f3b Mon Sep 17 00:00:00 2001 1From abe0a1c661241943b40192cf3fe73227123d7369 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
@@ -24,41 +24,28 @@ moment.
24 24
25Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> 25Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
26--- 26---
27 .../skia/src/opts/SkRasterPipeline_opts.h | 17 ++--------------- 27 chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 4 ++--
28 1 file changed, 2 insertions(+), 15 deletions(-) 28 1 file changed, 2 insertions(+), 2 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 831f5b3bb03..bb9377c3641 100644 31index 659794d1b50..d5b609ba93d 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@@ -984,7 +984,7 @@ SI F from_half(U16 h) {
35 } 35 memcpy(&fp16, &h, sizeof(U16));
36 return float(fp16);
36 37
37 SI F from_half(U16 h) { 38-#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX)
38-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ 39+#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) || defined(JUMPER_IS_AVX512)
39- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
40- __fp16 fp16;
41- memcpy(&fp16, &h, sizeof(U16));
42- return float(fp16);
43-
44-#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
45+#if defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
46 return _mm256_cvtph_ps(h); 40 return _mm256_cvtph_ps(h);
47 41
48 #else 42 #else
49@@ -1009,14 +1003,7 @@ SI F from_half(U16 h) { 43@@ -1008,7 +1008,7 @@ SI U16 to_half(F f) {
50 } 44 memcpy(&u16, &fp16, sizeof(U16));
45 return u16;
51 46
52 SI U16 to_half(F f) { 47-#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX)
53-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ 48+#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX) || defined(JUMPER_IS_AVX512)
54- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
55- __fp16 fp16 = __fp16(f);
56- U16 u16;
57- memcpy(&u16, &fp16, sizeof(U16));
58- return u16;
59-
60-#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
61+#if defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
62 return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION); 49 return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
63 50
64 #else 51 #else
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-fix-build-after-y2038-changes-in-glibc.patch
index 1c7a3b1e..ed7e2774 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-fix-build-after-y2038-changes-in-glibc.patch
@@ -1,4 +1,4 @@
1From 8a0cc2a6be8fb9f8c3f4976ad4b41b291e672a67 Mon Sep 17 00:00:00 2001 1From 5af48e4ca5d2515606a07c9896e927d65e77ca72 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,10 +15,10 @@ 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 0cbcb8130c6..bc3dd3bddda 100644 18index cf6e7927951..e5df6f9d92c 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@@ -70,6 +70,7 @@ typedef void* SockOptArg;
22 #endif // WEBRTC_POSIX 22 #endif // WEBRTC_POSIX
23 23
24 #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) 24 #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
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/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
index 63a460cc..ba734781 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/0007-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -1,4 +1,4 @@
1From ddedffaeb9f04ac8530f87f5010e0008dc548b96 Mon Sep 17 00:00:00 2001 1From 80c09862860702ce559c150784de50aa56282802 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
@@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16 2 files changed, 6 insertions(+), 2 deletions(-) 16 2 files changed, 6 insertions(+), 2 deletions(-)
17 17
18diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h 18diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
19index 717410f2ebc..a4cd55ca20e 100644 19index 2d184811a00..fb2ba0069f1 100644
20--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h 20--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
21+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h 21+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
22@@ -20,6 +20,11 @@ 22@@ -20,6 +20,11 @@
@@ -32,10 +32,10 @@ index 717410f2ebc..a4cd55ca20e 100644
32 32
33 namespace ui { 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 01e49b7bbfd..4fccfd62f84 100644 35index b8d089f7381..5d2d08b1ec6 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@@ -63,8 +63,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { 38@@ -62,8 +62,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
39 continue; 39 continue;
40 std::string event_string = base::StringPrintf( 40 std::string event_string = base::StringPrintf(
41 "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, 41 "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Include-cstddef-for-size_t-definition.patch
index 41a8ce36..25ea5639 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Include-cstddef-for-size_t-definition.patch
@@ -1,4 +1,4 @@
1From 022100d701dca71ecfe237e133712398bc1c59a7 Mon Sep 17 00:00:00 2001 1From 8c4ba9f35e835159502239e184646615e71db00c 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/0009-chromium-Move-CharAllocator-definition-to-a-header-f.patch
index abe1e16d..cd65c8b6 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Move-CharAllocator-definition-to-a-header-f.patch
@@ -1,4 +1,4 @@
1From 9d9db26e626e1c8d4d10eab1522daf0efc8cb11c Mon Sep 17 00:00:00 2001 1From 6c1bd0d6abecc1f3c198e4b3e41975edef2ebcff 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
@@ -13,11 +13,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 2 files changed, 255 insertions(+), 251 deletions(-) 13 2 files changed, 255 insertions(+), 251 deletions(-)
14 14
15diff --git a/chromium/cc/base/list_container_helper.cc b/chromium/cc/base/list_container_helper.cc 15diff --git a/chromium/cc/base/list_container_helper.cc b/chromium/cc/base/list_container_helper.cc
16index 3a4c0b6a2f9..89df57a7b8e 100644 16index 7b594b4a458..9dae1c360c4 100644
17--- a/chromium/cc/base/list_container_helper.cc 17--- a/chromium/cc/base/list_container_helper.cc
18+++ b/chromium/cc/base/list_container_helper.cc 18+++ b/chromium/cc/base/list_container_helper.cc
19@@ -12,259 +12,8 @@ 19@@ -13,259 +13,8 @@
20 #include "base/logging.h" 20 #include "base/check_op.h"
21 #include "base/memory/aligned_memory.h" 21 #include "base/memory/aligned_memory.h"
22 22
23-namespace { 23-namespace {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Link-v8-with-libatomic-on-x86.patch
index eaff07e0..c63047b8 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Link-v8-with-libatomic-on-x86.patch
@@ -1,4 +1,4 @@
1From e60314a1257964bbebc0e7633d9799fd7c7ec35b Mon Sep 17 00:00:00 2001 1From 79aff9ed2ef07c562ba6dcbdd7e0274eebd3dc29 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 ab20142de9a..4ef4aa80cc0 100644 17index ba99c75140b..33cf943bcba 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@@ -3543,7 +3543,8 @@ v8_source_set("v8_base_without_compiler") { 20@@ -3862,7 +3862,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/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
deleted file mode 100644
index 464f952b..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 1b8d57ba6595bbd743f6570d834f6a08600fb117 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 Jan 2020 16:53:46 -0800
4Subject: [PATCH] chromium: Include <cstddef> and <cstdint>
5
6These headers are needed for uintXX_t and size_t definitions
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 chromium/third_party/webrtc/call/rtx_receive_stream.h | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h
14index 66cc46dc091..e8cadb2bb80 100644
15--- a/chromium/third_party/webrtc/call/rtx_receive_stream.h
16+++ b/chromium/third_party/webrtc/call/rtx_receive_stream.h
17@@ -11,6 +11,7 @@
18 #ifndef CALL_RTX_RECEIVE_STREAM_H_
19 #define CALL_RTX_RECEIVE_STREAM_H_
20
21+#include <cstdint>
22 #include <map>
23 #include <stdint.h>
24
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-icu-use-system-library-only-targets.patch
index 8a6660ff..8c990ce7 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-icu-use-system-library-only-targets.patch
@@ -1,4 +1,4 @@
1From 344e8a3945a29239dd2f27ea4969e3d64d5d8911 Mon Sep 17 00:00:00 2001 1From b670124d771e503a17cf0d0ac7bbaf8ef601f31f 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,13 +20,13 @@ 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 73673fa20ac..a656692c7bf 100644 23index 2430d3e48e5..5d00226667d 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@@ -8,9 +8,13 @@ import("//build/config/linux/pkg_config.gni")
27 import("//build/config/linux/pkg_config.gni")
28 import("//build/shim_headers.gni") 27 import("//build/shim_headers.gni")
29 import("//third_party/icu/config.gni") 28 import("//third_party/icu/config.gni")
29 import("//third_party/icu/sources.gni")
30+import("//v8/gni/snapshot_toolchain.gni") 30+import("//v8/gni/snapshot_toolchain.gni")
31 31
32 declare_args() { 32 declare_args() {
@@ -37,7 +37,7 @@ index 73673fa20ac..a656692c7bf 100644
37 } 37 }
38 38
39 if (is_android) { 39 if (is_android) {
40@@ -23,6 +27,12 @@ if (is_mac) { 40@@ -24,6 +28,12 @@ if (is_mac && !icu_is_in_fuchsia) {
41 assert(!icu_disable_thin_archive || !is_component_build, 41 assert(!icu_disable_thin_archive || !is_component_build,
42 "icu_disable_thin_archive only works in static library builds") 42 "icu_disable_thin_archive only works in static library builds")
43 43
@@ -50,7 +50,7 @@ index 73673fa20ac..a656692c7bf 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@@ -1222,7 +1232,7 @@ config("system_icu_config") { 53@@ -413,7 +423,7 @@ config("system_icu_config") {
54 } 54 }
55 } 55 }
56 56
@@ -59,7 +59,7 @@ index 73673fa20ac..a656692c7bf 100644
59 pkg_config("system_icui18n") { 59 pkg_config("system_icui18n") {
60 packages = [ "icu-i18n" ] 60 packages = [ "icu-i18n" ]
61 } 61 }
62@@ -1435,7 +1445,7 @@ shim_headers("icuuc_shim") { 62@@ -626,7 +636,7 @@ shim_headers("icuuc_shim") {
63 } 63 }
64 64
65 config("icu_config") { 65 config("icu_config") {
@@ -68,7 +68,7 @@ index 73673fa20ac..a656692c7bf 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@@ -1443,7 +1453,7 @@ config("icu_config") { 71@@ -634,7 +644,7 @@ config("icu_config") {
72 } 72 }
73 73
74 group("icuuc") { 74 group("icuuc") {
@@ -77,7 +77,7 @@ index 73673fa20ac..a656692c7bf 100644
77 deps = [ ":icuuc_shim" ] 77 deps = [ ":icuuc_shim" ]
78 public_configs = [ 78 public_configs = [
79 ":system_icu_config", 79 ":system_icu_config",
80@@ -1455,7 +1465,7 @@ group("icuuc") { 80@@ -646,7 +656,7 @@ group("icuuc") {
81 } 81 }
82 82
83 group("icui18n") { 83 group("icui18n") {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch
index 1b43fcbb..070f994d 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch
@@ -1,4 +1,4 @@
1From 5aa69767be0fbbc7a3a5075c6c94366a535c99a8 Mon Sep 17 00:00:00 2001 1From 967aab36341387968070ae75edd503b1208a6961 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Mon, 20 Apr 2020 23:56:48 +0200 3Date: Mon, 20 Apr 2020 23:56:48 +0200
4Subject: [PATCH] chromium: Fix sandbox 'Aw, snap' for syscalls 403 and 407 4Subject: [PATCH] chromium: Fix sandbox 'Aw, snap' for syscalls 403 and 407
@@ -48,10 +48,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
48 5 files changed, 36 insertions(+), 1 deletion(-) 48 5 files changed, 36 insertions(+), 1 deletion(-)
49 49
50diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 50diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
51index 768025ce192..87025d91785 100644 51index 3c67b124786..e6e989d7b49 100644
52--- a/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 52--- a/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
53+++ b/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 53+++ b/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
54@@ -148,7 +148,14 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno, 54@@ -157,7 +157,14 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
55 return Allow(); 55 return Allow();
56 #endif 56 #endif
57 57
@@ -68,7 +68,7 @@ index 768025ce192..87025d91785 100644
68 } 68 }
69 69
70diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc 70diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
71index 76193b62c9f..7731c697002 100644 71index b6c8c637746..81972a9d998 100644
72--- a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc 72--- a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
73+++ b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc 73+++ b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
74@@ -60,6 +60,12 @@ class RestrictClockIdPolicy : public bpf_dsl::Policy { 74@@ -60,6 +60,12 @@ class RestrictClockIdPolicy : public bpf_dsl::Policy {
@@ -102,11 +102,11 @@ index d9d18822f67..0db8745cb57 100644
102 #if defined(__i386__) || \ 102 #if defined(__i386__) || \
103 (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) 103 (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
104diff --git a/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h b/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h 104diff --git a/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h b/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
105index 1addd53843c..5de2162f981 100644 105index 85e2110b4c2..c39c22b5114 100644
106--- a/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h 106--- a/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
107+++ b/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h 107+++ b/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
108@@ -1385,6 +1385,14 @@ 108@@ -1441,6 +1441,14 @@
109 #define __NR_memfd_create (__NR_SYSCALL_BASE+385) 109 #define __NR_io_pgetevents (__NR_SYSCALL_BASE+399)
110 #endif 110 #endif
111 111
112+#if !defined(__NR_clock_gettime64) 112+#if !defined(__NR_clock_gettime64)
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Add-missing-include-for-C-strncpy.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Add-missing-include-for-C-strncpy.patch
new file mode 100644
index 00000000..10e924c0
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Add-missing-include-for-C-strncpy.patch
@@ -0,0 +1,22 @@
1From 5b64a08023887bd4664996175120312e07287f1b Mon Sep 17 00:00:00 2001
2From: Jani Suonpera <jani.suonpera@qt.io>
3Date: Thu, 4 Feb 2021 14:30:44 +0200
4Subject: [PATCH] Add missing include for C strncpy
5
6Task-number:QTBUG-90623
7---
8 .../mojo/public/cpp/platform/named_platform_channel_posix.cc | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc b/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc
12index 9082ac4da59..24b21771d89 100644
13--- a/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc
14+++ b/chromium/mojo/public/cpp/platform/named_platform_channel_posix.cc
15@@ -8,6 +8,7 @@
16 #include <sys/socket.h>
17 #include <sys/un.h>
18 #include <unistd.h>
19+#include <cstring> // strncpy
20
21 #include "base/files/file_util.h"
22 #include "base/files/scoped_file.h"
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index 01c46c05..1caa4a67 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -1,4 +1,4 @@
1From 0dbcdee3ccc23d3a6c9e66b5abc3fb3d1ccbc297 Mon Sep 17 00:00:00 2001 1From 56486b901c7101c5b78b1282f5b81e80141f9b05 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:01:12 -0700 3Date: Fri, 7 Jul 2017 14:01:12 -0700
4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not 4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 1 file changed, 9 insertions(+) 12 1 file changed, 9 insertions(+)
13 13
14diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c 14diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c
15index 854819bfbb4..a99d32741d0 100644 15index 5fdb4817af8..e5b9431daa0 100644
16--- a/chromium/sandbox/linux/suid/sandbox.c 16--- a/chromium/sandbox/linux/suid/sandbox.c
17+++ b/chromium/sandbox/linux/suid/sandbox.c 17+++ b/chromium/sandbox/linux/suid/sandbox.c
18@@ -46,6 +46,15 @@ static bool DropRoot(); 18@@ -46,6 +46,15 @@ static bool DropRoot();
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index 03226154..2e3b1155 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
1From bbb23eb876e1f4500e7c8fd716a73351ad660725 Mon Sep 17 00:00:00 2001 1From ee3e05b09ad149ea02d9d4b743ea75cdc38a6f4e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:09:06 -0700 3Date: Fri, 7 Jul 2017 14:09:06 -0700
4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux 4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
@@ -10,15 +10,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 2 files changed, 4 insertions(+), 2 deletions(-) 10 2 files changed, 4 insertions(+), 2 deletions(-)
11 11
12diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc 12diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
13index 044bd8d244f..cec43e1d59b 100644 13index 9d12c427bb3..900ab13519f 100644
14--- a/chromium/base/process/process_metrics_posix.cc 14--- a/chromium/base/process/process_metrics_posix.cc
15+++ b/chromium/base/process/process_metrics_posix.cc 15+++ b/chromium/base/process/process_metrics_posix.cc
16@@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() { 16@@ -119,14 +119,14 @@ size_t ProcessMetrics::GetMallocUsage() {
17 malloc_statistics_t stats = {0}; 17 malloc_statistics_t stats = {0};
18 malloc_zone_statistics(nullptr, &stats); 18 malloc_zone_statistics(nullptr, &stats);
19 return stats.size_in_use; 19 return stats.size_in_use;
20-#elif defined(OS_LINUX) || defined(OS_ANDROID) 20-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
21+#elif defined(__GLIBC__) || defined(OS_ANDROID) 21+#elif defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
22 struct mallinfo minfo = mallinfo(); 22 struct mallinfo minfo = mallinfo();
23 #if BUILDFLAG(USE_TCMALLOC) 23 #if BUILDFLAG(USE_TCMALLOC)
24 return minfo.uordblks; 24 return minfo.uordblks;
@@ -31,7 +31,7 @@ index 044bd8d244f..cec43e1d59b 100644
31 return 0; 31 return 0;
32 #endif 32 #endif
33diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc 33diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
34index 7e42cfc20bb..4e24fc711ad 100644 34index c327f486596..90129e851e8 100644
35--- a/chromium/base/trace_event/malloc_dump_provider.cc 35--- a/chromium/base/trace_event/malloc_dump_provider.cc
36+++ b/chromium/base/trace_event/malloc_dump_provider.cc 36+++ b/chromium/base/trace_event/malloc_dump_provider.cc
37@@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; 37@@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default;
@@ -42,7 +42,7 @@ index 7e42cfc20bb..4e24fc711ad 100644
42 { 42 {
43 base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_); 43 base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_);
44 if (!emit_metrics_on_memory_dump_) 44 if (!emit_metrics_on_memory_dump_)
45@@ -175,6 +176,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, 45@@ -170,6 +171,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
46 MemoryAllocatorDump::kUnitsBytes, 46 MemoryAllocatorDump::kUnitsBytes,
47 resident_size - allocated_objects_size); 47 resident_size - allocated_objects_size);
48 } 48 }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-include-fcntl.h-for-loff_t.patch
index 869ac113..5d97d60a 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-include-fcntl.h-for-loff_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-include-fcntl.h-for-loff_t.patch
@@ -1,4 +1,4 @@
1From d1d6bd4260eb847c1493a8ce4a974bb8d8ee0218 Mon Sep 17 00:00:00 2001 1From 7f62849b103d44e6467b8fb722217586f8b68016 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/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index 638c7312..9d3f327f 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
1From 7cf2404330f7888f3cc8a25becfe944cc2fc421e Mon Sep 17 00:00:00 2001 1From adf366d5da96db4a9538826a97cbd6833b17ac07 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/0020-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch
index 55939ddd..f6d604cb 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
1From 350b57a5cad7c655ccb68a8b4b91e7d32021a1d7 Mon Sep 17 00:00:00 2001 1From 0e1d9c34ad4488733c4cb5ec20b82e3d9473e5b6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:54:38 -0700 3Date: Fri, 7 Jul 2017 14:54:38 -0700
4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction 4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
@@ -9,15 +9,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
9 1 file changed, 1 insertion(+), 1 deletion(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc 11diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc
12index 5ea77ef2d27..85343a13905 100644 12index a5ca0b7191e..e80f67e54f1 100644
13--- a/chromium/base/allocator/allocator_check.cc 13--- a/chromium/base/allocator/allocator_check.cc
14+++ b/chromium/base/allocator/allocator_check.cc 14+++ b/chromium/base/allocator/allocator_check.cc
15@@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { 15@@ -27,7 +27,7 @@ bool IsAllocatorInitialized() {
16 // Set by allocator_shim_override_ucrt_symbols_win.h when the 16 // Set by allocator_shim_override_ucrt_symbols_win.h when the
17 // shimmed _set_new_mode() is called. 17 // shimmed _set_new_mode() is called.
18 return g_is_win_shim_layer_initialized; 18 return g_is_win_shim_layer_initialized;
19-#elif defined(OS_LINUX) && BUILDFLAG(USE_TCMALLOC) && \ 19-#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
20+#elif defined(__GLIBC__) && BUILDFLAG(USE_TCMALLOC) && \ 20+#elif (defined(__GLIBC__) || defined(OS_CHROMEOS)) && \
21 !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) 21 BUILDFLAG(USE_TCMALLOC) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
22 // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. 22 // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.
23 // TODO(primiano): replace with an include once base can depend on allocator. 23 // TODO(primiano): replace with an include once base can depend on allocator.
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index aea690d9..a43b6083 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
1From fea443adcea6e081cfee94a19c75e7b0516e1bce Mon Sep 17 00:00:00 2001 1From 8fc1e879eb657d9a46e4a08ae8989e1b589f5745 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
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 create mode 100644 chromium/net/dns/resolv_compat.h 13 create mode 100644 chromium/net/dns/resolv_compat.h
14 14
15diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc 15diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc
16index 2e0f06b0c1e..aaafef77d79 100644 16index 5a4aead0acf..3427923836b 100644
17--- a/chromium/net/dns/dns_config_service_posix.cc 17--- a/chromium/net/dns/dns_config_service_posix.cc
18+++ b/chromium/net/dns/dns_config_service_posix.cc 18+++ b/chromium/net/dns/dns_config_service_posix.cc
19@@ -29,6 +29,10 @@ 19@@ -30,6 +30,10 @@
20 #include "net/dns/public/dns_protocol.h" 20 #include "net/dns/public/dns_protocol.h"
21 #include "net/dns/serial_worker.h" 21 #include "net/dns/serial_worker.h"
22 22
@@ -24,11 +24,11 @@ index 2e0f06b0c1e..aaafef77d79 100644
24+#include "net/dns/resolv_compat.h" 24+#include "net/dns/resolv_compat.h"
25+#endif 25+#endif
26+ 26+
27 #if defined(OS_MACOSX) && !defined(OS_IOS) 27 #if defined(OS_MAC)
28 #include "net/dns/dns_config_watcher_mac.h" 28 #include "net/dns/dns_config_watcher_mac.h"
29 #endif 29 #endif
30diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc 30diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc
31index 1c014a65019..2670a827aa5 100644 31index 0672e711afb..300f77e3b38 100644
32--- a/chromium/net/dns/dns_reloader.cc 32--- a/chromium/net/dns/dns_reloader.cc
33+++ b/chromium/net/dns/dns_reloader.cc 33+++ b/chromium/net/dns/dns_reloader.cc
34@@ -9,6 +9,10 @@ 34@@ -9,6 +9,10 @@
@@ -40,8 +40,8 @@ index 1c014a65019..2670a827aa5 100644
40+#endif 40+#endif
41+ 41+
42 #include "base/lazy_instance.h" 42 #include "base/lazy_instance.h"
43 #include "base/logging.h"
44 #include "base/macros.h" 43 #include "base/macros.h"
44 #include "base/notreached.h"
45diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h 45diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h
46new file mode 100644 46new file mode 100644
47index 00000000000..4f0e852a19d 47index 00000000000..4f0e852a19d
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index cd1059e3..d817c3d0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -1,4 +1,4 @@
1From 64e79d346a2038b976f5bafe2b0b2032b1628229 Mon Sep 17 00:00:00 2001 1From 107051f8490498b30757d79c97f9309057bc4cc8 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/0025-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Adjust-default-pthread-stack-size.patch
index 50d17413..bd69316b 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,16 +1,16 @@
1From cecdf34d89110115948cfde44c04a43c9925b24a Mon Sep 17 00:00:00 2001 1From 3cc48f9e538838ef7bc6bc80041ed00d44bde697 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 16:41:23 -0700 3Date: Fri, 7 Jul 2017 16:41:23 -0700
4Subject: [PATCH] chromium: musl: Adjust default pthread stack size 4Subject: [PATCH] chromium: musl: Adjust default pthread stack size
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 chromium/base/threading/platform_thread_linux.cc | 3 ++- 8 chromium/base/threading/platform_thread_linux.cc | 3 ++-
9 chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 2 +- 9 .../third_party/blink/renderer/platform/wtf/stack_util.cc | 4 ++--
10 2 files changed, 3 insertions(+), 2 deletions(-) 10 2 files changed, 4 insertions(+), 3 deletions(-)
11 11
12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc 12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
13index 74a01ad5af5..dab5773d73b 100644 13index c1a705e2b89..f322fdb8352 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@@ -377,7 +377,8 @@ void TerminateOnThread() {} 16@@ -377,7 +377,8 @@ void TerminateOnThread() {}
@@ -24,7 +24,7 @@ index 74a01ad5af5..dab5773d73b 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 ab1dff4167e..b0763b0bd9a 100644 27index 71b901f4044..f33aba04bc3 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() {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
deleted file mode 100644
index 37276844..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 68decc5d87b4eb013f1455fc4f81f67f926fa3b2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:09:02 -0700
4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
5 for musl
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 chromium/base/allocator/allocator_shim.cc | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
13index ef42d5ad67f..626e4c996a5 100644
14--- a/chromium/base/allocator/allocator_shim.cc
15+++ b/chromium/base/allocator/allocator_shim.cc
16@@ -352,7 +352,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) {
17 // In the case of tcmalloc we also want to plumb into the glibc hooks
18 // to avoid that allocations made in glibc itself (e.g., strdup()) get
19 // accidentally performed on the glibc heap instead of the tcmalloc one.
20-#if BUILDFLAG(USE_TCMALLOC)
21+#if BUILDFLAG(USE_TCMALLOC) && defined(__GLIBC__)
22 #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h"
23 #endif
24
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
index 07a1e3d6..9ce9edce 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -1,4 +1,4 @@
1From ae4187267b4d0d2ff13a6593b69ca06cee321eea Mon Sep 17 00:00:00 2001 1From 46283c0005cfb5d882b76df89a5c4fd880c0de42 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
@@ -8,55 +8,61 @@ glibc defines both. musl libc only the former.
8 8
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 10---
11 .../src/client/linux/dump_writer_common/ucontext_reader.cc | 4 ++-- 11 .../client/linux/dump_writer_common/ucontext_reader.cc | 8 ++++----
12 .../src/client/linux/dump_writer_common/ucontext_reader.h | 2 +- 12 .../src/client/linux/dump_writer_common/ucontext_reader.h | 4 ++--
13 .../src/client/linux/minidump_writer/minidump_writer.h | 2 +- 13 .../src/client/linux/minidump_writer/minidump_writer.h | 2 +-
14 3 files changed, 4 insertions(+), 4 deletions(-) 14 3 files changed, 7 insertions(+), 7 deletions(-)
15 15
16diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc 16diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
17index 6ee6cc1e4cd..a8f9ccc72ac 100644 17index 6eec1be2465..57d91943e83 100644
18--- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc 18--- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
19+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc 19+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
20@@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { 20@@ -48,8 +48,8 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
21 return uc->uc_mcontext.gregs[REG_EIP];
21 } 22 }
22 23
23 void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, 24-void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
24- const struct _libc_fpstate* fp) { 25- const fpstate_t* fp) {
26+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
25+ const struct _fpstate* fp) { 27+ const struct _fpstate* fp) {
26 const greg_t* regs = uc->uc_mcontext.gregs; 28 const greg_t* regs = uc->uc_mcontext.gregs;
27 29
28 out->context_flags = MD_CONTEXT_X86_FULL | 30 out->context_flags = MD_CONTEXT_X86_FULL |
29@@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { 31@@ -96,8 +96,8 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
32 return uc->uc_mcontext.gregs[REG_RIP];
30 } 33 }
31 34
32 void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, 35-void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
33- const struct _libc_fpstate* fpregs) { 36- const fpstate_t* fpregs) {
37+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
34+ const struct _fpstate* fpregs) { 38+ const struct _fpstate* fpregs) {
35 const greg_t* regs = uc->uc_mcontext.gregs; 39 const greg_t* regs = uc->uc_mcontext.gregs;
36 40
37 out->context_flags = MD_CONTEXT_AMD64_FULL; 41 out->context_flags = MD_CONTEXT_AMD64_FULL;
38diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h 42diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
39index f830618f240..f3dde1f4dff 100644 43index 7d41008815f..6cacabe4369 100644
40--- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h 44--- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
41+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h 45+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
42@@ -50,7 +50,7 @@ struct UContextReader { 46@@ -50,8 +50,8 @@ struct UContextReader {
47 // out: the minidump structure
43 // info: the collection of register structures. 48 // info: the collection of register structures.
44 #if defined(__i386__) || defined(__x86_64) 49 #if defined(__i386__) || defined(__x86_64)
45 static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, 50- static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
46- const struct _libc_fpstate* fp); 51- const fpstate_t* fp);
52+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
47+ const struct _fpstate* fp); 53+ const struct _fpstate* fp);
48 #elif defined(__aarch64__) 54 #elif defined(__aarch64__)
49 static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, 55 static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
50 const struct fpsimd_context* fpregs); 56 const struct fpsimd_context* fpregs);
51diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h 57diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
52index d1dc331215a..d1cc5624cd4 100644 58index e3b0b16daea..5d144dcd27c 100644
53--- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h 59--- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
54+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h 60+++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
55@@ -48,7 +48,7 @@ class ExceptionHandler; 61@@ -49,7 +49,7 @@ class ExceptionHandler;
56 #if defined(__aarch64__) 62 #if defined(__aarch64__)
57 typedef struct fpsimd_context fpstate_t; 63 typedef struct fpsimd_context fpstate_t;
58 #elif !defined(__ARM_EABI__) && !defined(__mips__) 64 #elif !defined(__ARM_EABI__) && !defined(__mips__)
59-typedef struct _libc_fpstate fpstate_t; 65-typedef std::remove_pointer<fpregset_t>::type fpstate_t;
60+typedef struct _fpstate fpstate_t; 66+typedef struct _fpstate fpstate_t;
61 #endif 67 #endif
62 68
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
index 63f93873..11ff47f0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
@@ -1,4 +1,4 @@
1From f12f5d2dc91548ca77b296a0be3705aacc9fca33 Mon Sep 17 00:00:00 2001 1From 78e9d21a5a43c8af5329ba10daee1859e08d8ccf 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
@@ -7,13 +7,13 @@ Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9--- 9---
10 chromium/third_party/breakpad/breakpad/configure.ac | 2 +- 10 chromium/third_party/breakpad/breakpad/configure.ac | 2 +-
11 .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 3 ++- 11 .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 2 ++
12 .../breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 + 12 .../breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
13 3 files changed, 4 insertions(+), 2 deletions(-) 13 3 files changed, 4 insertions(+), 1 deletion(-)
14 14
15diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac 15diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac
16index 492d09038f9..a6403ed8c3c 100644 16index 08513687f34..13745540a5e 100644
17--- a/chromium/third_party/breakpad/breakpad/configure.ac 17--- a/chromium/third_party/breakpad/breakpad/configure.ac
18+++ b/chromium/third_party/breakpad/breakpad/configure.ac 18+++ b/chromium/third_party/breakpad/breakpad/configure.ac
19@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, 19@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32,
@@ -22,28 +22,25 @@ index 492d09038f9..a6403ed8c3c 100644
22 AX_PTHREAD 22 AX_PTHREAD
23-AC_CHECK_HEADERS([a.out.h sys/random.h]) 23-AC_CHECK_HEADERS([a.out.h sys/random.h])
24+AC_CHECK_HEADERS([a.out.h sys/random.h sys/reg.h]) 24+AC_CHECK_HEADERS([a.out.h sys/random.h sys/reg.h])
25 AC_CHECK_FUNCS([arc4random getrandom]) 25 AC_CHECK_FUNCS([arc4random getcontext getrandom])
26 AM_CONDITIONAL([HAVE_GETCONTEXT], [test "x$ac_cv_func_getcontext" = xyes])
26 27
27 AX_CXX_COMPILE_STDCXX(11, noext, mandatory)
28diff --git a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc 28diff --git a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc
29index 4135a51a980..be92b792d3c 100644 29index bbfdba68093..fa822e5453a 100644
30--- a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc 30--- a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc
31+++ b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc 31+++ b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc
32@@ -29,10 +29,11 @@ 32@@ -36,7 +36,9 @@
33 #ifndef _GNU_SOURCE
34 #define _GNU_SOURCE // needed for pread()
35 #endif
36-
37+#include <config.h>
38 #include <sys/types.h>
39 #include <sys/stat.h>
40 #include <sys/mman.h> 33 #include <sys/mman.h>
41+#include <sys/reg.h> 34 #include <sys/stat.h>
35 #include <sys/types.h>
36+#include <config.h>
42 #include <unistd.h> 37 #include <unistd.h>
43 #include <fcntl.h> 38+#include <sys/reg.h>
44 #include <string.h> 39
40 #include <algorithm>
41 #include <map>
45diff --git a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h 42diff --git a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
46index d03c7a88d38..28b55ab6300 100644 43index 6e153745dba..5cd2c6fcb23 100644
47--- a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h 44--- a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
48+++ b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h 45+++ b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
49@@ -33,6 +33,7 @@ 46@@ -33,6 +33,7 @@
@@ -52,5 +49,5 @@ index d03c7a88d38..28b55ab6300 100644
52 49
53+#include <sys/reg.h> 50+#include <sys/reg.h>
54 #include <elf.h> 51 #include <elf.h>
52 #include <limits.h>
55 #include <link.h> 53 #include <link.h>
56 #include <stddef.h>
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-pread-pwrite.patch
index edeb3272..554afdfe 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-pread-pwrite.patch
@@ -1,4 +1,4 @@
1From 3269ffba733ed7eeb7c2c36912dd19ca1ef35f8b Mon Sep 17 00:00:00 2001 1From 5ce942260f64c70234a0af73af9cc8d26e99f188 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,12 +14,12 @@ 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 fd8efdffea6..22a8863031c 100644 17index e4ac22644c0..37988077a23 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@@ -1244,6 +1244,11 @@ struct kernel_statfs { 20@@ -1258,6 +1258,11 @@ struct kernel_statfs {
21 #ifndef __NR_fallocate 21 #ifndef __NR_getrandom
22 #define __NR_fallocate 285 22 #define __NR_getrandom 318
23 #endif 23 #endif
24+#undef __NR_pread 24+#undef __NR_pread
25+#define __NR_pread __NR_pread64 25+#define __NR_pread __NR_pread64
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
index 72adf1cb..d2617a83 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
@@ -1,4 +1,4 @@
1From 0b04cbd5b93908bad4dfc6d829048fe90a09b868 Mon Sep 17 00:00:00 2001 1From b37418977ba9bb13dae396b929f3365866e86af1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 10 May 2020 08:16:01 -0700 3Date: Sun, 10 May 2020 08:16:01 -0700
4Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner 4Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner
@@ -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 7df6892d67e..030ff8896e4 100644 28index 71265568be5..42e0d298045 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@@ -1199,8 +1199,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( 31@@ -1151,8 +1151,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 27fa629f..62a41012 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -26,6 +26,7 @@ DEPENDS += " \
26 jpeg-native \ 26 jpeg-native \
27 freetype-native \ 27 freetype-native \
28 gperf-native \ 28 gperf-native \
29 nodejs-native \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ 30 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
30 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \ 31 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \
31" 32"
@@ -59,8 +60,6 @@ PACKAGECONFIG[libpng] = "-feature-webengine-system-png,-no-feature-webengine-sys
59PACKAGECONFIG[harfbuzz] = "-feature-webengine-system-harfbuzz,-no-feature-webengine-system-harfbuzz,harfbuzz" 60PACKAGECONFIG[harfbuzz] = "-feature-webengine-system-harfbuzz,-no-feature-webengine-system-harfbuzz,harfbuzz"
60PACKAGECONFIG[glib] = "-feature-webengine-system-glib,-no-feature-webengine-system-glib,glib-2.0" 61PACKAGECONFIG[glib] = "-feature-webengine-system-glib,-no-feature-webengine-system-glib,glib-2.0"
61PACKAGECONFIG[zlib] = "-feature-webengine-system-zlib,-no-feature-webengine-system-zlib,zlib" 62PACKAGECONFIG[zlib] = "-feature-webengine-system-zlib,-no-feature-webengine-system-zlib,zlib"
62PACKAGECONFIG[protobuf] = "-feature-webengine-system-protobuf,-no-feature-webengine-system-protobuf,protobuf"
63PACKAGECONFIG[jsoncpp] = "-feature-webengine-system-jsoncpp,-no-feature-webengine-system-jsoncpp,jsoncpp"
64PACKAGECONFIG[libxml2] = "-feature-webengine-system-libxml2,-no-feature-webengine-system-libxml2,libxml2" 63PACKAGECONFIG[libxml2] = "-feature-webengine-system-libxml2,-no-feature-webengine-system-libxml2,libxml2"
65PACKAGECONFIG[minizip] = "-feature-webengine-system-minizip,-no-feature-webengine-system-minizip,minizip" 64PACKAGECONFIG[minizip] = "-feature-webengine-system-minizip,-no-feature-webengine-system-minizip,minizip"
66PACKAGECONFIG[proprietary-codecs] = "-feature-webengine-proprietary-codecs,-no-feature-webengine-proprietary-codecs" 65PACKAGECONFIG[proprietary-codecs] = "-feature-webengine-proprietary-codecs,-no-feature-webengine-proprietary-codecs"
@@ -144,7 +143,7 @@ RDEPENDS_${PN}-examples += " \
144 qtdeclarative-qmlplugins \ 143 qtdeclarative-qmlplugins \
145" 144"
146 145
147QT_MODULE_BRANCH_CHROMIUM = "83-based" 146QT_MODULE_BRANCH_CHROMIUM = "87-based"
148 147
149# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc 148# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc
150# 5.15-glibc.meta-qt5.8 149# 5.15-glibc.meta-qt5.8
@@ -164,41 +163,39 @@ SRC_URI_append_libc-musl = "\
164# 80-based-glibc.meta-qt5.4 163# 80-based-glibc.meta-qt5.4
165SRC_URI += " \ 164SRC_URI += " \
166 file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ 165 file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
167 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ 166 file://chromium/0002-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/0003-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/0004-chromium-Do-not-try-to-set-the-guessed-values-for.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/0005-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/0006-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/0007-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 \ 172 file://chromium/0008-chromium-Include-cstddef-for-size_t-definition.patch;patchdir=src/3rdparty \
174 file://chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch;patchdir=src/3rdparty \ 173 file://chromium/0009-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/0010-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \
176 file://chromium/0011-chromium-Include-cstddef-and-cstdint.patch;patchdir=src/3rdparty \ 175 file://chromium/0011-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \
177 file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ 176 file://chromium/0012-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \
178 file://chromium/0014-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ 177 file://chromium/0013-chromium-Add-missing-include-for-C-strncpy.patch;patchdir=src/3rdparty \
179 file://chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \
180" 178"
181 179
182# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based 180# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based
183# 80-based.meta-qt5.4 181# 80-based.meta-qt5.4
184SRC_URI_append_libc-musl = "\ 182SRC_URI_append_libc-musl = "\
185 file://chromium/0016-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ 183 file://chromium/0014-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
186 file://chromium/0017-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ 184 file://chromium/0015-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
187 file://chromium/0018-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ 185 file://chromium/0016-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \
188 file://chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ 186 file://chromium/0017-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 \ 187 file://chromium/0018-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 \ 188 file://chromium/0019-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
191 file://chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ 189 file://chromium/0020-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
192 file://chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ 190 file://chromium/0021-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
193 file://chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ 191 file://chromium/0022-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \
194 file://chromium/0026-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \ 192 file://chromium/0023-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \
195 file://chromium/0027-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ 193 file://chromium/0024-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
196 file://chromium/0028-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 194 file://chromium/0025-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
197 file://chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
198" 195"
199 196
200SRCREV_qtwebengine = "f328054d2eafc073b98a0246b2d644ee09c99d9c" 197SRCREV_qtwebengine = "7a9b2483f6e1476ad373df6733d96f17bbf103a6"
201SRCREV_chromium = "25db271c9b53e576cbb2cdc84d2c56ca5e8633a8" 198SRCREV_chromium = "3b1e8320c3e93dc41211ccd66cfd26fa7eec18c5"
202SRCREV = "${SRCREV_qtwebengine}" 199SRCREV = "${SRCREV_qtwebengine}"
203 200
204SRCREV_FORMAT = "qtwebengine_chromium" 201SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index 058b2d45..025c0b77 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 = "550a8cee241bbf8c11863dec9587d579dcb1108b" 21SRCREV = "42e9105b277c83270e774e1de091b089a25a6077"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 1e48483f..525bd9cd 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 = "e7883bc64440b1ff4666272ac6eb710ee4bc221b" 14SRCREV = "43f9a2dbf9bff83203db4ebe969af3d0523ae5c5"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index c1300c6e..4246811c 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 = "920de5f1cd9f9001cfef1bfd2c19e6720793362f" 26SRCREV = "2e7a10fa88f363a2cdd3ab1b567f8e39c10bdba3"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 2d692b5a..59fdd02e 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 = "3898f5484fd4864b047729bfeda9a1222f32364f" 15SRCREV = "2c3c665cf1629aa55fec9c24d9d1324c28ebfc0b"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index a458e0b5..0d198f4c 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 = "189e28d0aff1f3d7960228ba318b83e3cadac98c" 28SRCREV = "4f20b58bf26d04f940db39bb5bafa5686299289a"
29 29
30BBCLASSEXTEND =+ "native nativesdk" 30BBCLASSEXTEND =+ "native nativesdk"