summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Suonpera <jani.suonpera@qt.io>2020-11-03 12:43:11 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-11-17 07:09:19 +0200
commit72459ce0639eb3ce408558a7abede945e1f8ddc9 (patch)
tree775d465f8db9fab5c4202be3d4a17f9cead61ee2
parent6557244eca22a8722cf0fde2f3cc62f45cb72651 (diff)
downloadmeta-qt5-72459ce0639eb3ce408558a7abede945e1f8ddc9.tar.gz
Submodule update for 5.15v5.15.2
Modify patches for removing "Fuzz detected". Remove patches which already merged to upstream branch. Add depends jpeg-native and freetype-native. Task-number: QTBUG-86641 Change-Id: I40c6fed9b47d6a7749069554ea080db3e017f724 Reviewed-by: Jani Heikkinen <jani.heikkinen@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/qt5-git.inc6
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch18
-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.bb4
-rw-r--r--recipes-qt/qt5/qtlottie_git.bb2
-rw-r--r--recipes-qt/qt5/qtmqtt_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtopcua_git.bb2
-rw-r--r--recipes-qt/qt5/qtpurchasing_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtquicktimeline_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.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-stack-pointer-clobber.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch18
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch)9
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch54
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch24
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch18
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb13
-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
67 files changed, 136 insertions, 194 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index e31f8018..60cabe66 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() {
194do_generate_qt_environment_file[umask] = "022" 194do_generate_qt_environment_file[umask] = "022"
195addtask generate_qt_environment_file after do_install before do_package 195addtask generate_qt_environment_file after do_install before do_package
196 196
197SRCREV = "e4961b35deb202525d4711dbb14f8c2bb0bf5c26" 197SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 817bb2c4..294cffb4 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
36 ${S}/src/quick3d/imports/input/importsinput.pro 36 ${S}/src/quick3d/imports/input/importsinput.pro
37} 37}
38 38
39SRCREV = "dc26105a3abe6fe420151fd3f1b228835d2088ed" 39SRCREV = "34171b1d99f55fde1627df3c57eed50480ab2ae7"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 862eeb18..f1d724dd 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,8 +2,8 @@
2# Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.15" 5QT_MODULE_BRANCH ?= "5.15.2"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
7 7
8# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
9SRC_URI = " \ 9SRC_URI = " \
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.15.1+git${SRCPV}" 17PV = "5.15.2+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 23f0ad7c..bfd1a805 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -141,4 +141,4 @@ do_install() {
141 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 141 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
142} 142}
143 143
144SRCREV = "e4961b35deb202525d4711dbb14f8c2bb0bf5c26" 144SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index a8d85346..37e0a6a9 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
1From 8442f94819458c79a88ad6177207c0e922a007bd Mon Sep 17 00:00:00 2001 1From c97da220d95091386724e1eadc360ed16ed52dfe Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH] Add linux-oe-g++ platform 4Subject: [PATCH] Add linux-oe-g++ platform
@@ -65,10 +65,10 @@ index 934a18a924..0f5b1b6333 100644
65 msg = "test $$1 succeeded" 65 msg = "test $$1 succeeded"
66 write_file($$QMAKE_CONFIG_LOG, msg, append) 66 write_file($$QMAKE_CONFIG_LOG, msg, append)
67diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf 67diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
68index 99b7fe6562..1ddfddb2bd 100644 68index 69d1954306..37f7c9c4a2 100644
69--- a/mkspecs/features/qt.prf 69--- a/mkspecs/features/qt.prf
70+++ b/mkspecs/features/qt.prf 70+++ b/mkspecs/features/qt.prf
71@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) { 71@@ -151,7 +151,7 @@ import_plugins:qtConfig(static) {
72 plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB 72 plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
73 plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) 73 plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
74 isEmpty(plug_path): \ 74 isEmpty(plug_path): \
@@ -77,7 +77,7 @@ index 99b7fe6562..1ddfddb2bd 100644
77 LIBS += $$plug_path/$$plug_type/$$plug_name 77 LIBS += $$plug_path/$$plug_type/$$plug_name
78 } else { 78 } else {
79 LIBS += -l$${plug}$$qtPlatformTargetSuffix() 79 LIBS += -l$${plug}$$qtPlatformTargetSuffix()
80@@ -271,8 +271,8 @@ for(ever) { 80@@ -274,8 +274,8 @@ for(ever) {
81 # static builds: link qml import plugins into the target. 81 # static builds: link qml import plugins into the target.
82 contains(all_qt_module_deps, qml): \ 82 contains(all_qt_module_deps, qml): \
83 qtConfig(static):import_plugins:!host_build:!no_import_scan { 83 qtConfig(static):import_plugins:!host_build:!no_import_scan {
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
index f91792c0..751e59d7 100644
--- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,4 +1,4 @@
1From 56eb22b1063d9bbdcf6ec39828e4c3498b72c99c Mon Sep 17 00:00:00 2001 1From 44e37eab48ff04bd20815fd4ae0b5d79d493aabc Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 25 Aug 2015 10:05:15 -0400 3Date: Tue, 25 Aug 2015 10:05:15 -0400
4Subject: [PATCH] configure: bump path length from 256 to 512 characters 4Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
15 1 file changed, 3 insertions(+), 3 deletions(-) 15 1 file changed, 3 insertions(+), 3 deletions(-)
16 16
17diff --git a/configure.pri b/configure.pri 17diff --git a/configure.pri b/configure.pri
18index e775bf046e..a20eded987 100644 18index 49755f7abf..f84862d1ca 100644
19--- a/configure.pri 19--- a/configure.pri
20+++ b/configure.pri 20+++ b/configure.pri
21@@ -876,10 +876,10 @@ defineTest(qtConfOutput_preparePaths) { 21@@ -883,10 +883,10 @@ defineTest(qtConfOutput_preparePaths) {
22 22
23 $${currentConfig}.output.qconfigSource = \ 23 $${currentConfig}.output.qconfigSource = \
24 "/* Installation Info */" \ 24 "/* Installation Info */" \
diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
index 4353d43e..08a79898 100644
--- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
+++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
@@ -1,4 +1,4 @@
1From c4393e037ebfc6bfa1a58ceab29fdb78389cd47e Mon Sep 17 00:00:00 2001 1From 18904a169397f343e75bee5f29fa9ae1444a295f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 27 Jul 2017 08:02:51 -0700 3Date: Thu, 27 Jul 2017 08:02:51 -0700
4Subject: [PATCH] Replace pthread_yield with sched_yield 4Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -36,7 +36,7 @@ index 19b3289390..4d0cdf8b5f 100644
36 QMetaType info(tp); 36 QMetaType info(tp);
37 if (!info.isValid()) { 37 if (!info.isValid()) {
38diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 38diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
39index 6dd390ccbd..43b92606d9 100644 39index e397e80fe0..cdb7893e56 100644
40--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 40--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
41+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 41+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
42@@ -78,6 +78,7 @@ 42@@ -78,6 +78,7 @@
@@ -46,8 +46,8 @@ index 6dd390ccbd..43b92606d9 100644
46+#include <sched.h> 46+#include <sched.h>
47 #endif 47 #endif
48 48
49 #include "private/qhostinfo_p.h" 49 #include <memory>
50@@ -2199,8 +2200,8 @@ public slots: 50@@ -2200,8 +2201,8 @@ public slots:
51 51
52 #if defined(Q_OS_MAC) 52 #if defined(Q_OS_MAC)
53 pthread_yield_np(); 53 pthread_yield_np();
diff --git a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
index c032ec03..69063457 100644
--- a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
+++ b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
@@ -1,4 +1,4 @@
1From 557aa4d5584525cca4efcf20d6a86ad3ae99e36b Mon Sep 17 00:00:00 2001 1From 6c9e68cffb15cc1e848ca57ea12d4e5905d46507 Mon Sep 17 00:00:00 2001
2From: Nicola Lunghi <nick83ola@gmail.com> 2From: Nicola Lunghi <nick83ola@gmail.com>
3Date: Wed, 5 Feb 2020 15:32:25 +0000 3Date: Wed, 5 Feb 2020 15:32:25 +0000
4Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform 4Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform
@@ -13,10 +13,10 @@ Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/2894
13 1 file changed, 37 insertions(+), 13 deletions(-) 13 1 file changed, 37 insertions(+), 13 deletions(-)
14 14
15diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp 15diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
16index 45798cc527..de3f156cae 100644 16index 42e98ce363..0ca9b87f04 100644
17--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp 17--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
18+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp 18+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
19@@ -2894,19 +2894,43 @@ void tst_QPainter::monoImages() 19@@ -2931,19 +2931,43 @@ void tst_QPainter::monoImages()
20 #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__) 20 #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__)
21 #include <fenv.h> 21 #include <fenv.h>
22 22
@@ -67,7 +67,7 @@ index 45798cc527..de3f156cae 100644
67 return QLatin1String("Invalid operation"); 67 return QLatin1String("Invalid operation");
68 return QLatin1String("No exception"); 68 return QLatin1String("No exception");
69 } 69 }
70@@ -2932,7 +2956,7 @@ private: 70@@ -2969,7 +2993,7 @@ private:
71 71
72 void fpe_rasterizeLine_task232012() 72 void fpe_rasterizeLine_task232012()
73 { 73 {
@@ -76,7 +76,7 @@ index 45798cc527..de3f156cae 100644
76 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); 76 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
77 img.fill(0x0); 77 img.fill(0x0);
78 QPainter p(&img); 78 QPainter p(&img);
79@@ -2944,7 +2968,7 @@ void fpe_rasterizeLine_task232012() 79@@ -2981,7 +3005,7 @@ void fpe_rasterizeLine_task232012()
80 80
81 void fpe_pixmapTransform() 81 void fpe_pixmapTransform()
82 { 82 {
@@ -85,7 +85,7 @@ index 45798cc527..de3f156cae 100644
85 85
86 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); 86 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
87 87
88@@ -2972,7 +2996,7 @@ void fpe_pixmapTransform() 88@@ -3009,7 +3033,7 @@ void fpe_pixmapTransform()
89 89
90 void fpe_zeroLengthLines() 90 void fpe_zeroLengthLines()
91 { 91 {
@@ -94,7 +94,7 @@ index 45798cc527..de3f156cae 100644
94 94
95 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); 95 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
96 96
97@@ -2984,7 +3008,7 @@ void fpe_zeroLengthLines() 97@@ -3021,7 +3045,7 @@ void fpe_zeroLengthLines()
98 98
99 void fpe_divByZero() 99 void fpe_divByZero()
100 { 100 {
@@ -103,7 +103,7 @@ index 45798cc527..de3f156cae 100644
103 103
104 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); 104 QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
105 105
106@@ -3007,7 +3031,7 @@ void fpe_divByZero() 106@@ -3044,7 +3068,7 @@ void fpe_divByZero()
107 107
108 void fpe_steepSlopes() 108 void fpe_steepSlopes()
109 { 109 {
@@ -112,7 +112,7 @@ index 45798cc527..de3f156cae 100644
112 112
113 QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied); 113 QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied);
114 114
115@@ -3026,7 +3050,7 @@ void fpe_steepSlopes() 115@@ -3063,7 +3087,7 @@ void fpe_steepSlopes()
116 116
117 void fpe_radialGradients() 117 void fpe_radialGradients()
118 { 118 {
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 50817084..989e5abb 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -294,4 +294,4 @@ sed -i \
294 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 294 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
295} 295}
296 296
297SRCREV = "e4961b35deb202525d4711dbb14f8c2bb0bf5c26" 297SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index d43c9266..1a5238f1 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "68a2a439898f154279ef41dcc6e7164030d20d54" 11SRCREV = "a67f812548b008e3eedcd2bb9313828a195fd23b"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb
index 65c45cd3..83ee40b7 100644
--- a/recipes-qt/qt5/qtcoap_git.bb
+++ b/recipes-qt/qt5/qtcoap_git.bb
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
11 11
12DEPENDS += "qtbase" 12DEPENDS += "qtbase"
13 13
14SRCREV = "bd047261570166b593071212fa4749262e6c5caa" 14SRCREV = "628d3b8abd47ffde45252cf6591ed10ec2fa28ac"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 79dd0850..948f59a5 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "6fe502ad842c322981b45632e4f59182be1908d2" 22SRCREV = "ca6cc606d9fc0947ea6c27738a1ca8f12f3258ea"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 30438bf7..70e14f06 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "09801264493e1b2ceb4918be59a13dde1a24d882" 11SRCREV = "1168c788a117e4556e6cd0ba1e267a86ef62b0c4"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 6d9b884a..6eae8173 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() {
30 rm -rf ${D}${OE_QMAKE_PATH_QML} 30 rm -rf ${D}${OE_QMAKE_PATH_QML}
31} 31}
32 32
33SRCREV = "02c499996bc70eae5472a0290ca09f1f1741e5cb" 33SRCREV = "104eae5b17b0ec700391e9539ee3a4f638588194"
34 34
35BBCLASSEXTEND =+ "native nativesdk" 35BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 56ef1ef1..076f25a6 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
14 14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16 16
17SRCREV = "7bf40625ab31685a827f5b6dc13922ae685e8a4f" 17SRCREV = "ff933a4e72826a77c81c4153f1adcf765ead35f0"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 6a98362b..9657a5ef 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "c343d7746b0331af722d69f3b5b47840f57a4cca" 21SRCREV = "66b7fbaca4b323dce337e87e3093c8836577c561"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 643a2498..43db80ff 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "2cacdd5d5c8feab792126b99d0384092683c551b" 28SRCREV = "74a5bc4a45195b876454e596e76cb23aeb365410"
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb
index 50e0e5ab..9891eefb 100644
--- a/recipes-qt/qt5/qtknx_git.bb
+++ b/recipes-qt/qt5/qtknx_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "d6148a65aeff1cb2060f0e3e462541bb1ff5219b" 12SRCREV = "0d2ce613010c0cc9c69f6821c06a34b6721482b4"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 7337b157..89d42813 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -35,7 +35,7 @@ SRC_URI += " \
35 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 35 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
36" 36"
37 37
38SRCREV_qtlocation = "bae290d25a37fddf88f3a6e2e94c3ee68b2cc038" 38SRCREV_qtlocation = "02a21217a9706402802f38c646797be8eccb86e4"
39SRCREV_qtlocation-mapboxgl = "d7e368c42f2ac7971e81f60b981e566352f1e4fa" 39SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d"
40 40
41SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 41SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb
index cd355177..b4a93300 100644
--- a/recipes-qt/qt5/qtlottie_git.bb
+++ b/recipes-qt/qt5/qtlottie_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase qtdeclarative" 10DEPENDS += "qtbase qtdeclarative"
11 11
12SRCREV = "2245b587f162f8d7a152049832739af9700e7c2d" 12SRCREV = "b182dcd78a35b4667b2568857b7719d555c7fddb"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index 4361890b..b3db343e 100644
--- a/recipes-qt/qt5/qtmqtt_git.bb
+++ b/recipes-qt/qt5/qtmqtt_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "0da764d8fec459ee28b70f68028ada81ed31abf7" 12SRCREV = "cade213f562049400da81e60762400df68d7c56b"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 7ff7ea39..fdbebd6d 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -38,7 +38,7 @@ SRC_URI += "\
38# http://errors.yoctoproject.org/Errors/Build/44914/ 38# http://errors.yoctoproject.org/Errors/Build/44914/
39LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 39LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
40 40
41SRCREV = "73d9affb0c44dc21d83e9aeec5e4d83bc57d189b" 41SRCREV = "fd30913d4601d12437404e1d20113a1ed6364ccc"
42 42
43# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory 43# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
44do_install_append() { 44do_install_append() {
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 8e0147b7..79d00544 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "eacb61f5b180c676b53881a1fbd73339c3e5f303" 12SRCREV = "fb2d6d47a0c961278d63309789a1141c3734818b"
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index 7c5209f4..7b3ae682 100644
--- a/recipes-qt/qt5/qtopcua_git.bb
+++ b/recipes-qt/qt5/qtopcua_git.bb
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
18 18
19DEPENDS += "qtbase" 19DEPENDS += "qtbase"
20 20
21SRCREV = "f993294b068a70e93b248f556da6ff31245bf2d2" 21SRCREV = "6d45793cae6f9e744c7bba82f905e431978ce3d0"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index 57a12057..554bb8f7 100644
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtbase qtdeclarative" 11DEPENDS += "qtbase qtdeclarative"
12 12
13SRCREV = "cf85bd1d88dd9a25b9a2b1210ab9d9668159b871" 13SRCREV = "ddfa4d16243128d2871a51c513e025d518151b17"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index 1d92e5a1..a56e26db 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \
21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ 21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
22" 22"
23 23
24SRCREV_qtquick3d = "c2201f055ed723cf56afd1a7e05e81785b592534" 24SRCREV_qtquick3d = "2e05e6d6546635a8f25882c5140fb17697be0062"
25SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" 25SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
26 26
27SRCREV_FORMAT = "qtquick3d_assimp" 27SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index cd1cd12a..fed17dad 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative qtdeclarative-native" 11DEPENDS += "qtdeclarative qtdeclarative-native"
12 12
13SRCREV = "c0daab494a58ff881afc0252872359e5291a1478" 13SRCREV = "16f27dfa3588c2bf377568ce00bf534af48c9558"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index d645153b..c2960096 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
18" 18"
19 19
20SRCREV = "e22f5c4cd8ff47545e33a30f7a11d4963979ffb0" 20SRCREV = "7c29283041a50def3ceca7de4471f211c9b30d4e"
diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb
index 840860dd..61920c04 100644
--- a/recipes-qt/qt5/qtquicktimeline_git.bb
+++ b/recipes-qt/qt5/qtquicktimeline_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtbase qtdeclarative" 11DEPENDS = "qtbase qtdeclarative"
12 12
13SRCREV = "32d7031e87551f29b598e789cfacd275c8095245" 13SRCREV = "147ad75c589fc4804429710fdb177cc48a80dbea"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index eb81945f..c9519137 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "d08c7960de241d33ba6e4e2bc5dc2056a7ae3726" 28SRCREV = "8e889442508e284691c923470eb4552c96afdfe3"
29 29
30BBCLASSEXTEND += "native nativesdk" 30BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index a6023a0a..773bc044 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -36,4 +36,4 @@ DEPENDS += "qtbase"
36# http://errors.yoctoproject.org/Errors/Build/44915/ 36# http://errors.yoctoproject.org/Errors/Build/44915/
37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
38 38
39SRCREV = "d2f926751d322bc0a46d2ceed57f871e282f26b1" 39SRCREV = "5da7de1800eee3d604eb7e787b114479b61ffc93"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 78da9021..7a0975bf 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "38095de1942031707b05709b160e1399ecbf8276" 13SRCREV = "95aa78be795a862b95371afa75e1417029ec0a16"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15
16# 5.15.meta-qt5.1 16# 5.15.meta-qt5.1
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 3959bda3..c4b90f84 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "76fb972f600d9a2b4720a41fbec14955becc7885" 15SRCREV = "5618198e6df5e0224f79f786a44af7527b431545"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 3f86df6d..94e0fbbd 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "289fff1f7f14a7c2dd44ab2232f7a2f17bda5fcf" 14SRCREV = "1aa9b03756baead139943712839af5ecedeb2989"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index ab359428..b59d921d 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "6f5fa73a354d71d4e86c5cc686b0c0f79d4c52a9" 15SRCREV = "192e376b01e65e7277772bdc94106613c22cf531"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 65f855bb..52d82653 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "6b444e832d31ce9a9497ca8e6aff0520f1d888ea" 15SRCREV = "52d3788c7b0116ea3db232dccca5f1e3f1e229ac"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index f89d63a3..0c8b3e26 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -49,7 +49,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
49 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ 49 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
50" 50"
51 51
52SRCREV = "72744ac361a94bfd80af16403a69f8ff2422d583" 52SRCREV = "cc52debd905e0ed061290d6fd00a5f1ab67478a5"
53 53
54BBCLASSEXTEND = "native nativesdk" 54BBCLASSEXTEND = "native nativesdk"
55 55
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 23c25e4c..ecc9db2f 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ 98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
99" 99"
100 100
101SRCREV = "ec3a7a623ae7dc228e7a9795a605c6d7916816ec" 101SRCREV = "cb1857418b36780b0444333f3aa6250ca3780f19"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 0eefdb6e..c3b8a90f 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
71 71
72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" 72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
73 73
74SRCREV = "ae04a778c8bafa20812e337fbb80f60b898b8313" 74SRCREV = "7b90415c58dd02c682a9ba317f273d7b3398ff88"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 5900a4f3..f3fea401 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 = "c25f8b8fa4dc6d096382d34849b997ab7fe69c5c" 46SRCREV = "3cc17177b1b03053276eb6236fda137c588261a7"
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 3a4e6175..052bfd80 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
14 14
15SRCREV = "5bab22c141948e6215bd5239e22926b4c2e9b332" 15SRCREV = "90cffd49575b075b0dc28440c693753d860fee87"
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
index 3abe38b6..8b5d41ba 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
@@ -1,4 +1,4 @@
1From 105421c09f009b77019e60db2de22d5966a73602 Mon Sep 17 00:00:00 2001 1From 5af62581e5116b57efbe4bb7cc467efeb0aab941 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 30 Mar 2017 11:37:24 +0300 3Date: Thu, 30 Mar 2017 11:37:24 +0300
4Subject: [PATCH] chromium: workaround for too long .rps file name 4Subject: [PATCH] chromium: workaround for too long .rps file name
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
index 497dd3b8..c93ba991 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
@@ -1,4 +1,4 @@
1From 99453086770508f96eeb95635dda3f9831c485bf Mon Sep 17 00:00:00 2001 1From 8dd7987fc70fd8dab4a9f7ee32334c8d28ed34e4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Dec 2018 16:58:04 -0800 3Date: Sun, 23 Dec 2018 16:58:04 -0800
4Subject: [PATCH] chromium: stack pointer clobber 4Subject: [PATCH] chromium: stack pointer clobber
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 3 insertions(+), 3 deletions(-) 17 1 file changed, 3 insertions(+), 3 deletions(-)
18 18
19diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h 19diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
20index 8e0cc385792..d2bd9df4d40 100644 20index d2baee9d243..fd8efdffea6 100644
21--- a/chromium/third_party/lss/linux_syscall_support.h 21--- a/chromium/third_party/lss/linux_syscall_support.h
22+++ b/chromium/third_party/lss/linux_syscall_support.h 22+++ b/chromium/third_party/lss/linux_syscall_support.h
23@@ -2012,7 +2012,7 @@ struct kernel_statfs { 23@@ -2017,7 +2017,7 @@ struct kernel_statfs {
24 : "i" (__NR_##name), "ri" ((long)(arg1)), \ 24 : "i" (__NR_##name), "ri" ((long)(arg1)), \
25 "c" ((long)(arg2)), "d" ((long)(arg3)), \ 25 "c" ((long)(arg2)), "d" ((long)(arg3)), \
26 "S" ((long)(arg4)), "D" ((long)(arg5)) \ 26 "S" ((long)(arg4)), "D" ((long)(arg5)) \
@@ -29,7 +29,7 @@ index 8e0cc385792..d2bd9df4d40 100644
29 LSS_RETURN(type,__res); \ 29 LSS_RETURN(type,__res); \
30 } 30 }
31 #undef _syscall6 31 #undef _syscall6
32@@ -2034,7 +2034,7 @@ struct kernel_statfs { 32@@ -2039,7 +2039,7 @@ struct kernel_statfs {
33 : "i" (__NR_##name), "0" ((long)(&__s)), \ 33 : "i" (__NR_##name), "0" ((long)(&__s)), \
34 "c" ((long)(arg2)), "d" ((long)(arg3)), \ 34 "c" ((long)(arg2)), "d" ((long)(arg3)), \
35 "S" ((long)(arg4)), "D" ((long)(arg5)) \ 35 "S" ((long)(arg4)), "D" ((long)(arg5)) \
@@ -38,7 +38,7 @@ index 8e0cc385792..d2bd9df4d40 100644
38 LSS_RETURN(type,__res); \ 38 LSS_RETURN(type,__res); \
39 } 39 }
40 LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, 40 LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
41@@ -2120,7 +2120,7 @@ struct kernel_statfs { 41@@ -2125,7 +2125,7 @@ struct kernel_statfs {
42 : "0"(-EINVAL), "i"(__NR_clone), 42 : "0"(-EINVAL), "i"(__NR_clone),
43 "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), 43 "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
44 "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) 44 "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
index 253cdaf6..a3f292c3 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
@@ -1,4 +1,4 @@
1From d3889654a28d901d345cae8fc8ec23988a085dab Mon Sep 17 00:00:00 2001 1From be18ba6e0b879fbd542f4e0d1a249f2ab5abb27c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Feb 2019 19:28:59 -0800 3Date: Sat, 2 Feb 2019 19:28:59 -0800
4Subject: [PATCH] chromium: fix build with clang 4Subject: [PATCH] chromium: fix build with clang
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 2 insertions(+), 25 deletions(-) 10 1 file changed, 2 insertions(+), 25 deletions(-)
11 11
12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
13index fdfcf65f5ab..13d71d04030 100644 13index ca81bd8ce0f..d3c588b21e3 100644
14--- a/chromium/build/config/compiler/BUILD.gn 14--- a/chromium/build/config/compiler/BUILD.gn
15+++ b/chromium/build/config/compiler/BUILD.gn 15+++ b/chromium/build/config/compiler/BUILD.gn
16@@ -779,8 +779,6 @@ config("compiler_cpu_abi") { 16@@ -776,8 +776,6 @@ config("compiler_cpu_abi") {
17 } 17 }
18 } else if (current_cpu == "arm") { 18 } else if (current_cpu == "arm") {
19 if (is_clang && !is_android && !is_nacl) { 19 if (is_clang && !is_android && !is_nacl) {
@@ -22,7 +22,7 @@ index fdfcf65f5ab..13d71d04030 100644
22 } 22 }
23 if (!is_nacl) { 23 if (!is_nacl) {
24 cflags += [ 24 cflags += [
25@@ -793,8 +791,6 @@ config("compiler_cpu_abi") { 25@@ -790,8 +788,6 @@ config("compiler_cpu_abi") {
26 } 26 }
27 } else if (current_cpu == "arm64") { 27 } else if (current_cpu == "arm64") {
28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) { 28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -31,7 +31,7 @@ index fdfcf65f5ab..13d71d04030 100644
31 } 31 }
32 } else if (current_cpu == "mipsel" && !is_nacl) { 32 } else if (current_cpu == "mipsel" && !is_nacl) {
33 ldflags += [ "-Wl,--hash-style=sysv" ] 33 ldflags += [ "-Wl,--hash-style=sysv" ]
34@@ -803,9 +799,6 @@ config("compiler_cpu_abi") { 34@@ -800,9 +796,6 @@ config("compiler_cpu_abi") {
35 if (is_android) { 35 if (is_android) {
36 cflags += [ "--target=mipsel-linux-android" ] 36 cflags += [ "--target=mipsel-linux-android" ]
37 ldflags += [ "--target=mipsel-linux-android" ] 37 ldflags += [ "--target=mipsel-linux-android" ]
@@ -41,7 +41,7 @@ index fdfcf65f5ab..13d71d04030 100644
41 } 41 }
42 } else { 42 } else {
43 cflags += [ "-EL" ] 43 cflags += [ "-EL" ]
44@@ -884,10 +877,7 @@ config("compiler_cpu_abi") { 44@@ -881,10 +874,7 @@ config("compiler_cpu_abi") {
45 } else if (current_cpu == "mips" && !is_nacl) { 45 } else if (current_cpu == "mips" && !is_nacl) {
46 ldflags += [ "-Wl,--hash-style=sysv" ] 46 ldflags += [ "-Wl,--hash-style=sysv" ]
47 if (custom_toolchain == "") { 47 if (custom_toolchain == "") {
@@ -53,7 +53,7 @@ index fdfcf65f5ab..13d71d04030 100644
53 cflags += [ "-EB" ] 53 cflags += [ "-EB" ]
54 ldflags += [ "-EB" ] 54 ldflags += [ "-EB" ]
55 } 55 }
56@@ -934,9 +924,6 @@ config("compiler_cpu_abi") { 56@@ -931,9 +921,6 @@ config("compiler_cpu_abi") {
57 if (is_android) { 57 if (is_android) {
58 cflags += [ "--target=mips64el-linux-android" ] 58 cflags += [ "--target=mips64el-linux-android" ]
59 ldflags += [ "--target=mips64el-linux-android" ] 59 ldflags += [ "--target=mips64el-linux-android" ]
@@ -63,7 +63,7 @@ index fdfcf65f5ab..13d71d04030 100644
63 } 63 }
64 } else { 64 } else {
65 cflags += [ 65 cflags += [
66@@ -993,10 +980,7 @@ config("compiler_cpu_abi") { 66@@ -990,10 +977,7 @@ config("compiler_cpu_abi") {
67 } else if (current_cpu == "mips64") { 67 } else if (current_cpu == "mips64") {
68 ldflags += [ "-Wl,--hash-style=sysv" ] 68 ldflags += [ "-Wl,--hash-style=sysv" ]
69 if (custom_toolchain == "") { 69 if (custom_toolchain == "") {
@@ -75,7 +75,7 @@ index fdfcf65f5ab..13d71d04030 100644
75 cflags += [ 75 cflags += [
76 "-EB", 76 "-EB",
77 "-mabi=64", 77 "-mabi=64",
78@@ -1165,13 +1149,6 @@ config("compiler_deterministic") { 78@@ -1157,13 +1141,6 @@ config("compiler_deterministic") {
79 } 79 }
80 } 80 }
81 } 81 }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
index 5b150b5f..c3de3cc5 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -1,4 +1,4 @@
1From 7a778d56065b041e55c60e500d5e60c71b7e345f Mon Sep 17 00:00:00 2001 1From 7eeed60fceeca490c5252e256baff08100e13259 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 5 Feb 2019 14:32:20 -0800 3Date: Tue, 5 Feb 2019 14:32:20 -0800
4Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm 4Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 4 insertions(+), 1 deletion(-) 15 1 file changed, 4 insertions(+), 1 deletion(-)
16 16
17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn 17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
18index 4422fecc0c8..1b398ad981a 100644 18index 00d1e7c6ca3..f2c36d72dd2 100644
19--- a/chromium/third_party/zlib/BUILD.gn 19--- a/chromium/third_party/zlib/BUILD.gn
20+++ b/chromium/third_party/zlib/BUILD.gn 20+++ b/chromium/third_party/zlib/BUILD.gn
21@@ -80,8 +80,11 @@ if (use_arm_neon_optimizations) { 21@@ -86,8 +86,11 @@ if (use_arm_neon_optimizations) {
22 # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: 22 # Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
23 # "All implementations of the ARMv8.1 architecture are required to 23 # "All implementations of the ARMv8.1 architecture are required to
24 # implement the CRC32* instructions. These are optional in ARMv8.0." 24 # implement the CRC32* instructions. These are optional in ARMv8.0."
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch
index 00293e5f..5f3f4528 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch
@@ -1,7 +1,8 @@
1From 7cabdbd5f444dc10f4c87ed554792e97a527075b Mon Sep 17 00:00:00 2001 1From 0faac107930255380ea07aa75267153022de2248 Mon Sep 17 00:00:00 2001
2From: Johannes Pointner <johannes.pointner@br-automation.com> 2From: Johannes Pointner <johannes.pointner@br-automation.com>
3Date: Fri, 3 May 2019 09:12:38 +0200 3Date: Fri, 3 May 2019 09:12:38 +0200
4Subject: [PATCH] chromium: Do not try to set the guessed values for 4Subject: [PATCH] chromium: Do not try to set the guessed values for
5
5 march/mtune/float-abi OE config machinary has computed these values already 6 march/mtune/float-abi OE config machinary has computed these values already
6 and fed it via compiler cmdline to chromium build 7 and fed it via compiler cmdline to chromium build
7 8
@@ -12,15 +13,17 @@ Upstream-Status: Inappropriate [OE-Specific]
12 13
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com> 15Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
16
17%% original patch: 0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
15--- 18---
16 chromium/build/config/compiler/BUILD.gn | 9 --------- 19 chromium/build/config/compiler/BUILD.gn | 9 ---------
17 1 file changed, 9 deletions(-) 20 1 file changed, 9 deletions(-)
18 21
19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 22diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
20index 13d71d04030..3ebcf1ddbc3 100644 23index d3c588b21e3..6d49fde33cc 100644
21--- a/chromium/build/config/compiler/BUILD.gn 24--- a/chromium/build/config/compiler/BUILD.gn
22+++ b/chromium/build/config/compiler/BUILD.gn 25+++ b/chromium/build/config/compiler/BUILD.gn
23@@ -780,15 +780,6 @@ config("compiler_cpu_abi") { 26@@ -777,15 +777,6 @@ config("compiler_cpu_abi") {
24 } else if (current_cpu == "arm") { 27 } else if (current_cpu == "arm") {
25 if (is_clang && !is_android && !is_nacl) { 28 if (is_clang && !is_android && !is_nacl) {
26 } 29 }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
index 798b5f05..f560e315 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
@@ -1,4 +1,4 @@
1From e7e0646f07d1c0dcf6502cd1c074d50839f3d461 Mon Sep 17 00:00:00 2001 1From 69abe5acb926cef9ac771015ade3873fa9985f3b Mon Sep 17 00:00:00 2001
2From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> 2From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
3Date: Thu, 8 Mar 2018 15:39:55 +0100 3Date: Thu, 8 Mar 2018 15:39:55 +0100
4Subject: [PATCH] chromium: aarch64 skia build fix 4Subject: [PATCH] chromium: aarch64 skia build fix
@@ -28,7 +28,7 @@ Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
28 1 file changed, 2 insertions(+), 15 deletions(-) 28 1 file changed, 2 insertions(+), 15 deletions(-)
29 29
30diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 30diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
31index 0d610ccfe33..c1844b61168 100644 31index 831f5b3bb03..bb9377c3641 100644
32--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 32--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
33+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 33+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
34@@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) { 34@@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
index 307ce4d4..1c7a3b1e 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch
@@ -1,4 +1,4 @@
1From a5cdae084e84be8c847f4b0613b92e0462bbb038 Mon Sep 17 00:00:00 2001 1From 8a0cc2a6be8fb9f8c3f4976ad4b41b291e672a67 Mon Sep 17 00:00:00 2001
2From: Jiri Slaby <jslaby@suse.cz> 2From: Jiri Slaby <jslaby@suse.cz>
3Date: Thu, 11 Jul 2019 09:35:13 +0200 3Date: Thu, 11 Jul 2019 09:35:13 +0200
4Subject: [PATCH] chromium: fix build after y2038 changes in glibc 4Subject: [PATCH] chromium: fix build after y2038 changes in glibc
@@ -15,7 +15,7 @@ Upstream-Status: Pending
15 1 file changed, 1 insertion(+) 15 1 file changed, 1 insertion(+)
16 16
17diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc 17diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
18index ead4e57dc15..7ba975e660a 100644 18index 0cbcb8130c6..bc3dd3bddda 100644
19--- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc 19--- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
20+++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc 20+++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
21@@ -71,6 +71,7 @@ typedef void* SockOptArg; 21@@ -71,6 +71,7 @@ typedef void* SockOptArg;
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
index 05917cd6..63a460cc 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -1,4 +1,4 @@
1From c769d6be7210a2fbc866e36f87ad21bcc91e9c6e Mon Sep 17 00:00:00 2001 1From ddedffaeb9f04ac8530f87f5010e0008dc548b96 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Nov 2019 10:07:43 -0800 3Date: Sat, 30 Nov 2019 10:07:43 -0800
4Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t 4Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
@@ -11,27 +11,10 @@ input.h [1]
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13--- 13---
14 chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 4 ++--
15 chromium/ui/events/ozone/evdev/event_converter_evdev.h | 5 +++++ 14 chromium/ui/events/ozone/evdev/event_converter_evdev.h | 5 +++++
16 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++--- 15 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 3 +--
17 chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | 5 +++++ 16 2 files changed, 6 insertions(+), 2 deletions(-)
18 4 files changed, 15 insertions(+), 5 deletions(-)
19 17
20diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
21index 9f27d39e209..f565dd2ce5c 100644
22--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
23+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc
24@@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback(
25 base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent(
26 const input_event& event) {
27 base::TimeTicks timestamp =
28- ui::EventTimeStampFromSeconds(event.time.tv_sec) +
29- base::TimeDelta::FromMicroseconds(event.time.tv_usec);
30+ ui::EventTimeStampFromSeconds(event.input_event_sec) +
31+ base::TimeDelta::FromMicroseconds(event.input_event_usec);
32 ValidateEventTimeClock(&timestamp);
33 return timestamp;
34 }
35diff --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
36index 717410f2ebc..a4cd55ca20e 100644 19index 717410f2ebc..a4cd55ca20e 100644
37--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h 20--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
@@ -49,37 +32,16 @@ index 717410f2ebc..a4cd55ca20e 100644
49 32
50 namespace ui { 33 namespace ui {
51diff --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
52index 363c3183e05..4fccfd62f84 100644 35index 01e49b7bbfd..4fccfd62f84 100644
53--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc 36--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
54+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc 37+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc
55@@ -59,11 +59,11 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { 38@@ -63,8 +63,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) {
56 for (int i = 0; i < kDebugBufferSize; ++i) {
57 struct TouchEvent* te =
58 &logged_events_[(debug_buffer_tail_ + i) % kDebugBufferSize];
59- if (te->ev.time.tv_sec == 0 && te->ev.time.tv_usec == 0)
60+ if (te->ev.input_event_sec == 0 && te->ev.input_event_usec == 0)
61 continue; 39 continue;
62 std::string event_string = base::StringPrintf( 40 std::string event_string = base::StringPrintf(
63- "E: %ld.%06ld %04x %04x %d %d\n", te->ev.time.tv_sec, 41 "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec,
64- te->ev.time.tv_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); 42- te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value,
65+ "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, 43- te->slot);
66+ te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); 44+ te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot);
67 report_content += event_string; 45 report_content += event_string;
68 } 46 }
69 file.Write(0, report_content.c_str(), report_content.length()); 47 file.Write(0, report_content.c_str(), report_content.length());
70diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
71index 0d5b83148f6..1f17608e94d 100644
72--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
73+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
74@@ -14,6 +14,11 @@
75
76 #include "base/component_export.h"
77
78+#ifndef input_event_sec
79+#define input_event_sec time.tv_sec
80+#define input_event_usec time.tv_usec
81+#endif
82+
83 namespace ui {
84
85 class EventDeviceInfo;
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
index 3659f586..41a8ce36 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
@@ -1,4 +1,4 @@
1From 58783bf8f46657200643543f765f405a91699440 Mon Sep 17 00:00:00 2001 1From 022100d701dca71ecfe237e133712398bc1c59a7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 25 Dec 2019 15:41:16 -0800 3Date: Wed, 25 Dec 2019 15:41:16 -0800
4Subject: [PATCH] chromium: Include cstddef for size_t definition 4Subject: [PATCH] chromium: Include cstddef for size_t definition
@@ -22,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 1 file changed, 1 insertion(+) 22 1 file changed, 1 insertion(+)
23 23
24diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 24diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
25index b87fb2d0345..b3faffcfc79 100644 25index ec972949d89..2a76775cfb6 100644
26--- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 26--- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
27+++ b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 27+++ b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
28@@ -14,6 +14,7 @@ 28@@ -15,6 +15,7 @@
29 #include <map> 29 #include <map>
30 #include <set> 30 #include <set>
31 #include <vector> 31 #include <vector>
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
index 965ecd72..abe1e16d 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch
@@ -1,4 +1,4 @@
1From faff740bb831e1a25c7acb1754df9bbd028330b9 Mon Sep 17 00:00:00 2001 1From 9d9db26e626e1c8d4d10eab1522daf0efc8cb11c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 2 Jan 2020 17:13:55 -0800 3Date: Thu, 2 Jan 2020 17:13:55 -0800
4Subject: [PATCH] chromium: Move CharAllocator definition to a header file 4Subject: [PATCH] chromium: Move CharAllocator definition to a header file
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
index a6abd037..464f952b 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
@@ -1,4 +1,4 @@
1From 33005dfa49d65170fb006cd4ca4dbb8c6cf901e5 Mon Sep 17 00:00:00 2001 1From 1b8d57ba6595bbd743f6570d834f6a08600fb117 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 Jan 2020 16:53:46 -0800 3Date: Wed, 15 Jan 2020 16:53:46 -0800
4Subject: [PATCH] chromium: Include <cstddef> and <cstdint> 4Subject: [PATCH] chromium: Include <cstddef> and <cstdint>
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
index 169b4c9b..eaff07e0 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch
@@ -1,4 +1,4 @@
1From 910fe61d3ee439b26a6a33cc9f65e1f7a52f332d Mon Sep 17 00:00:00 2001 1From e60314a1257964bbebc0e7633d9799fd7c7ec35b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 1 Feb 2020 12:17:23 -0800 3Date: Sat, 1 Feb 2020 12:17:23 -0800
4Subject: [PATCH] chromium: Link v8 with libatomic on x86 4Subject: [PATCH] chromium: Link v8 with libatomic on x86
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 2 insertions(+), 1 deletion(-) 14 1 file changed, 2 insertions(+), 1 deletion(-)
15 15
16diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn 16diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn
17index 9107b302476..12d8171d238 100644 17index ab20142de9a..4ef4aa80cc0 100644
18--- a/chromium/v8/BUILD.gn 18--- a/chromium/v8/BUILD.gn
19+++ b/chromium/v8/BUILD.gn 19+++ b/chromium/v8/BUILD.gn
20@@ -3324,7 +3324,8 @@ v8_source_set("v8_base_without_compiler") { 20@@ -3543,7 +3543,8 @@ v8_source_set("v8_base_without_compiler") {
21 if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || 21 if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" ||
22 v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || 22 v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" ||
23 v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || 23 v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
deleted file mode 100644
index b13532d3..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 06dcf80d09523fc075edc157231b33da63b3f37e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:12:39 -0700
4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
5 LinuxSigInfo
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc
13index 003708d2c89..0fef3148f9d 100644
14--- a/chromium/sandbox/linux/seccomp-bpf/trap.cc
15+++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc
16@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
17 // most versions of glibc don't include this information in siginfo_t. So,
18 // we need to explicitly copy it into a arch_sigsys structure.
19 struct arch_sigsys sigsys;
20- memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
21+ memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
22
23 #if defined(__mips__)
24 // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index ea2acd56..033780d8 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
1From 991b9f17d0743c80340685181095dc8903a57b53 Mon Sep 17 00:00:00 2001 1From a49d5e2c256d18853c0e00e698759f763eaddf04 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,7 +13,7 @@ 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 eaa5336c339..18b40d7d005 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@@ -29,6 +29,10 @@
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index 91b87490..97fce663 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -1,4 +1,4 @@
1From 19969b1ef03bce06fbc8518b4db999a243855c32 Mon Sep 17 00:00:00 2001 1From 6e44772c5aa78c39d52910aaf4cc2db3bcf0ba7e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:39:57 -0700 3Date: Fri, 7 Jul 2017 15:39:57 -0700
4Subject: [PATCH] chromium: musl: Do not define __sbrk on musl 4Subject: [PATCH] chromium: musl: Do not define __sbrk on musl
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
index b0833018..53ecedd4 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,19 +1,19 @@
1From dd7561980e6669aebae6c1fab1c4653139b6740f Mon Sep 17 00:00:00 2001 1From 31b50a484935d1a610da74fa5a06489f8309fd6d 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 .../third_party/blink/renderer/platform/wtf/stack_util.cc | 4 ++-- 9 chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 2 +-
10 2 files changed, 4 insertions(+), 3 deletions(-) 10 2 files changed, 3 insertions(+), 2 deletions(-)
11 11
12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc 12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
13index 095c49b8dc0..d1479b54d48 100644 13index 74a01ad5af5..dab5773d73b 100644
14--- a/chromium/base/threading/platform_thread_linux.cc 14--- a/chromium/base/threading/platform_thread_linux.cc
15+++ b/chromium/base/threading/platform_thread_linux.cc 15+++ b/chromium/base/threading/platform_thread_linux.cc
16@@ -186,7 +186,8 @@ void TerminateOnThread() {} 16@@ -377,7 +377,8 @@ void TerminateOnThread() {}
17 17
18 size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { 18 size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
19 #if !defined(THREAD_SANITIZER) 19 #if !defined(THREAD_SANITIZER)
@@ -24,15 +24,15 @@ index 095c49b8dc0..d1479b54d48 100644
24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the 24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the
25 // default stack size isn't enough for some browser tests. 25 // default stack size isn't enough for some browser tests.
26diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 26diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
27index b2421649ff3..a31b96e90e6 100644 27index ab1dff4167e..b0763b0bd9a 100644
28--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 28--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
29+++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 29+++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
30@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() { 30@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size 31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
32 // correctly for the main thread. 32 // correctly for the main thread.
33 33
34-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ 34-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
35+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ 35+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
36 defined(OS_FUCHSIA) 36 defined(OS_FUCHSIA)
37 // pthread_getattr_np() can fail if the thread is not invoked by 37 // pthread_getattr_np() can fail if the thread is not invoked by
38 // pthread_create() (e.g., the main thread of blink_unittests). 38 // pthread_create() (e.g., the main thread of blink_unittests).
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
index d71a0926..750d0d5e 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
@@ -1,4 +1,4 @@
1From 2150bb364442a2a352fff1f915c387f4dc37bdef Mon Sep 17 00:00:00 2001 1From d687194f970d5ed19d21916eba4f597625d20dfc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Sep 2018 12:35:07 -0700 3Date: Tue, 25 Sep 2018 12:35:07 -0700
4Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on 4Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
index b829057e..4ed957ee 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
@@ -1,4 +1,4 @@
1From f3f26710c365425453d7f8577fc6437f03b89a5c Mon Sep 17 00:00:00 2001 1From 976ee610f4bb87d1b5f57756c04f13b06f3ebf26 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Sep 2018 12:59:05 -0700 3Date: Tue, 25 Sep 2018 12:59:05 -0700
4Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get 4Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
index e7ba75f0..61a1137c 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch
@@ -1,4 +1,4 @@
1From 3c26038e4588bd73d92d5fbd4bd8c2c9a520ea8d Mon Sep 17 00:00:00 2001 1From 4cb584454ab1537c1e1e5ae8453f57a98aa9a928 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,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 5 insertions(+) 14 1 file changed, 5 insertions(+)
15 15
16diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h 16diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
17index d2bd9df4d40..88ea7f508aa 100644 17index fd8efdffea6..22a8863031c 100644
18--- a/chromium/third_party/lss/linux_syscall_support.h 18--- a/chromium/third_party/lss/linux_syscall_support.h
19+++ b/chromium/third_party/lss/linux_syscall_support.h 19+++ b/chromium/third_party/lss/linux_syscall_support.h
20@@ -1239,6 +1239,11 @@ struct kernel_statfs { 20@@ -1244,6 +1244,11 @@ struct kernel_statfs {
21 #ifndef __NR_fallocate 21 #ifndef __NR_fallocate
22 #define __NR_fallocate 285 22 #define __NR_fallocate 285
23 #endif 23 #endif
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
index d316929c..0d73e07c 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
@@ -1,4 +1,4 @@
1From f0cb2c411e58217b694f9bdf9d34cbc56bd0d785 Mon Sep 17 00:00:00 2001 1From acc3b1b674a2568dd19418ec5b3c58330a29521a 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 572472a6993..504fdb5d5c6 100644 28index 7df6892d67e..030ff8896e4 100644
29--- a/chromium/net/socket/udp_socket_posix.cc 29--- a/chromium/net/socket/udp_socket_posix.cc
30+++ b/chromium/net/socket/udp_socket_posix.cc 30+++ b/chromium/net/socket/udp_socket_posix.cc
31@@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( 31@@ -1199,8 +1199,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
32 for (auto& buffer : buffers) 32 for (auto& buffer : buffers)
33 msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); 33 msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
34 msgvec->reserve(buffers.size()); 34 msgvec->reserve(buffers.size());
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index cd79a8a6..1d7fe83f 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -23,6 +23,8 @@ DEPENDS += " \
23 qtlocation \ 23 qtlocation \
24 libdrm fontconfig pixman openssl pango cairo icu pciutils nss \ 24 libdrm fontconfig pixman openssl pango cairo icu pciutils nss \
25 libcap \ 25 libcap \
26 jpeg-native \
27 freetype-native \
26 gperf-native \ 28 gperf-native \
27 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ 29 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \ 30 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst', '', d)} \
@@ -43,7 +45,7 @@ SECURITY_STRINGFORMAT = ""
43 45
44# To use system ffmpeg you need to enable also libwebp, opus, vpx 46# To use system ffmpeg you need to enable also libwebp, opus, vpx
45# Only depenedencies available in oe-core are enabled by default 47# Only depenedencies available in oe-core are enabled by default
46PACKAGECONFIG ??= "libwebp libevent libpng \ 48PACKAGECONFIG ??= "libevent libpng \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 49 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
48 50
49PACKAGECONFIG[icu] = "-feature-webengine-system-icu,-no-feature-webengine-system-icu,icu" 51PACKAGECONFIG[icu] = "-feature-webengine-system-icu,-no-feature-webengine-system-icu,icu"
@@ -142,7 +144,7 @@ RDEPENDS_${PN}-examples += " \
142 qtdeclarative-qmlplugins \ 144 qtdeclarative-qmlplugins \
143" 145"
144 146
145QT_MODULE_BRANCH_CHROMIUM = "80-based" 147QT_MODULE_BRANCH_CHROMIUM = "83-based"
146 148
147# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 149# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15
148# 5.15.meta-qt5.7 150# 5.15.meta-qt5.7
@@ -163,7 +165,7 @@ SRC_URI += " \
163 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ 165 file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
164 file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ 166 file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
165 file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ 167 file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
166 file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ 168 file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch;patchdir=src/3rdparty \
167 file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \ 169 file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \
168 file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \ 170 file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \
169 file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \ 171 file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \
@@ -180,7 +182,6 @@ SRC_URI_append_libc-musl = "\
180 file://chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ 182 file://chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \
181 file://chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ 183 file://chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \
182 file://chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ 184 file://chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \
183 file://chromium/0019-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \
184 file://chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ 185 file://chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \
185 file://chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ 186 file://chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \
186 file://chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ 187 file://chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \
@@ -190,8 +191,8 @@ SRC_URI_append_libc-musl = "\
190 file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ 191 file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
191" 192"
192 193
193SRCREV_qtwebengine = "9e4d1eb45d5c6299e79ac3f28282fd76f949980e" 194SRCREV_qtwebengine = "5537ff4437ea7a5f9ea140071343f88bf48deddc"
194SRCREV_chromium = "62bc475876cbae17e2e39175fe321780512e5951" 195SRCREV_chromium = "fb6ab5e483876298235be1c6a6013b426c82b759"
195SRCREV = "${SRCREV_qtwebengine}" 196SRCREV = "${SRCREV_qtwebengine}"
196 197
197SRCREV_FORMAT = "qtwebengine_chromium" 198SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index 8eb8fce3..fd14851a 100644
--- a/recipes-qt/qt5/qtwebglplugin_git.bb
+++ b/recipes-qt/qt5/qtwebglplugin_git.bb
@@ -18,4 +18,4 @@ do_configure_prepend() {
18 18
19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
20 20
21SRCREV = "835b594bda455a3ecb768605d64fb3ca29ceb51d" 21SRCREV = "5e41e564aaf96b7e49403af5099995efbe4cac8e"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index a7cc57db..c84f7828 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "9a0dd9a7b74a405488c4922a922d8a2ed8e8e28a" 14SRCREV = "f73735911b2124ef16aa39228bf8f89ee900ba5d"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 0c5205dc..fcabec7a 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -23,4 +23,4 @@ python() {
23 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): 23 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
24 raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') 24 raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
25} 25}
26SRCREV = "93bdca425bde930d58062216bd3cfae2abdc60c6" 26SRCREV = "800926cc4e0ecfdb37a3b34486403354b66a37a4"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 80c8b7db..8a24f2f7 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "afa3ad1c1cb04ce1e51b0af4bdac028809f9d0d4" 15SRCREV = "9bb0adeac84da6723cf57a2bb0d0c3b405691a15"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index bfacbfbb..f5db658d 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -25,6 +25,6 @@ do_configure_prepend() {
25 25
26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
27 27
28SRCREV = "c4d24e467d7159a43eb90891b954f4cd816ba04b" 28SRCREV = "50421402f05b3ee3c76c6cff455a69efaf576b6d"
29 29
30BBCLASSEXTEND =+ "native nativesdk" 30BBCLASSEXTEND =+ "native nativesdk"