summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-06-26 12:42:33 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2018-06-27 12:03:36 +0000
commit6765cbe6a255771cc1d06e5d3878c7e705769fc3 (patch)
tree377c10e198c33bb5ffa509f24748891a7e341a02 /recipes-qt/qt5/qtwebengine
parentb84881444814a361fcc17e7eb34407fb175541da (diff)
parent40054db1de152d85c22aefdae50b136ca56967c5 (diff)
downloadmeta-qt5-6765cbe6a255771cc1d06e5d3878c7e705769fc3.tar.gz
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master: 40054db qt5: qtbase: Upgrade Double-Conversion dd1ce3c README: Rework to start using GitHub for development ef5f5d9 qt5: upgrade to 5.11.1 820f3ef qt5: add common PACKAGECONFIG for QtQuickCompiler e199d80 python-pyqt5: update recipe to 5.10.1 65db89e qtbase: don't pass empty filename to function 3b27896 nativesdk-qtbase: add quotes to CC and CXX in environment file a36cc5f libvcard: add recipe 1ac92b6 qtbase: Add packageconfigs for renameat2 and getentropy use 557aabd qttranslations: remove qtquick1 translation package 00aafa0 qt5-creator: Remove qtquick1 dependency 731334a qtwebengine: fix build with plugins as well as ozone enabled 70ce980 qtwebengine: add -fpermissive 33f58ff qtwebengine: fix build with gcc8, part II 267a38f qtwebengine: fix build with gcc8 7193a7f qtquick1: remove recipe and all references 29445f6 qtwebkit: do not skip build - use cmake as build system dde9b55 qt5: refresh the patches and update them on meta-qt5 repositories e0a4e23 qt5: Update to Qt 5.11.0 73f99f2 gstreamer1.0-plugins-{good,bad}: move the qt5 PACKAGECONFIG from bad to good bbappend Change-Id: Ib58d0e103bda0b58338989c00f1fa80bd699534c
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch50
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch (renamed from recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch)4
-rw-r--r--recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch (renamed from recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch)4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch (renamed from recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch)4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch (renamed from recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch)4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch50
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch (renamed from recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch)4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch (renamed from recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch)8
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch (renamed from recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch (renamed from recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch (renamed from recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch)4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch (renamed from recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch)4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch (renamed from recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch)4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch (renamed from recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch)14
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch (renamed from recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch (renamed from recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch)6
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch (renamed from recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch)4
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch (renamed from recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch)6
21 files changed, 151 insertions, 51 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
index 17f34052..b0b9a7d3 100644
--- a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
@@ -1,4 +1,4 @@
1From 882d9b41fd538c3dd4170bdcdb3938f8989d7700 Mon Sep 17 00:00:00 2001 1From 8638cd129e040e8958570c95a3d4e91d9366f5a8 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Fri, 25 Dec 2015 18:16:05 -0200 3Date: Fri, 25 Dec 2015 18:16:05 -0200
4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor 4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
9 1 file changed, 2 insertions(+) 9 1 file changed, 2 insertions(+)
10 10
11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h 11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
12index 73607aa..151d261 100644 12index 1723da7e..4d9e5981 100644
13--- a/src/webengine/api/qquickwebengineview_p_p.h 13--- a/src/webengine/api/qquickwebengineview_p_p.h
14+++ b/src/webengine/api/qquickwebengineview_p_p.h 14+++ b/src/webengine/api/qquickwebengineview_p_p.h
15@@ -61,6 +61,8 @@ 15@@ -61,6 +61,8 @@
diff --git a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch
index e8cd395f..2184408c 100644
--- a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch
@@ -1,4 +1,4 @@
1From 1095ff439340980b297eb988f23fceb5d198b18e Mon Sep 17 00:00:00 2001 1From 0101ed343c6f6eb652c5992ed2279ddd5c6d5969 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200 3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH] Include dependency to QCoreApplication::translate() 4Subject: [PATCH] Include dependency to QCoreApplication::translate()
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
9 1 file changed, 2 insertions(+) 9 1 file changed, 2 insertions(+)
10 10
11diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h 11diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
12index 579d159..0904c46 100644 12index 579d159a..0904c468 100644
13--- a/src/core/media_capture_devices_dispatcher.h 13--- a/src/core/media_capture_devices_dispatcher.h
14+++ b/src/core/media_capture_devices_dispatcher.h 14+++ b/src/core/media_capture_devices_dispatcher.h
15@@ -45,6 +45,8 @@ 15@@ -45,6 +45,8 @@
diff --git a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch
index 13e0dc9b..eaed7a6c 100644
--- a/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From e0d8fe57a8bbd1c24ae35d93c54ab0c6e58eff20 Mon Sep 17 00:00:00 2001 1From a7eff4032f84490b33df27771d43e098ceea439e Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -18,7 +18,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
18 2 files changed, 8 insertions(+), 8 deletions(-) 18 2 files changed, 8 insertions(+), 8 deletions(-)
19 19
20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
21index dd0d3e3..70161c8 100644 21index dd0d3e32..70161c82 100644
22--- a/src/buildtools/configure_host.pro 22--- a/src/buildtools/configure_host.pro
23+++ b/src/buildtools/configure_host.pro 23+++ b/src/buildtools/configure_host.pro
24@@ -4,7 +4,7 @@ TEMPLATE = aux 24@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -57,7 +57,7 @@ index dd0d3e3..70161c8 100644
57 " nm = \"$$which(nm)\" " \ 57 " nm = \"$$which(nm)\" " \
58 " toolchain_args = { " \ 58 " toolchain_args = { " \
59diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri 59diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
60index 68d64fd..9ab43df 100644 60index b56134ad..69f463e9 100644
61--- a/src/core/config/linux.pri 61--- a/src/core/config/linux.pri
62+++ b/src/core/config/linux.pri 62+++ b/src/core/config/linux.pri
63@@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") { 63@@ -91,7 +91,7 @@ contains(QT_ARCH, "mips") {
diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch b/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
new file mode 100644
index 00000000..0b79599d
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0004-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
@@ -0,0 +1,50 @@
1From 9e8b0fda6b2338feed486d238a61c2a51e4fd2b3 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 10 Jun 2018 10:26:17 +0000
4Subject: [PATCH] chromium_overrides.cpp: Fix build with plugins and ozone
5 enabled
6
7* otherwise it fails with:
8 | make[3]: Entering directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core'
9| creating linker version script QtWebEngineCore.version
10| rm -f libQt5WebEngineCore.so.5.10.1 libQt5WebEngineCore.so libQt5WebEngineCore.so.5 libQt5WebEngineCore.so.5.10
11| linking ../../lib/libQt5WebEngineCore.so.5.10.1
12| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: error: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/content/browser/browser/pepper_truetype_font_list_ozone.o: multiple definition of 'content::GetFontFamilies_SlowBlocking(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)'
13| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/QtWebEngineCore/chromium_overrides.o: previous definition here
14| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: error: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/content/browser/browser/pepper_truetype_font_list_ozone.o: multiple definition of 'content::GetFontsInFamily_SlowBlocking(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<ppapi::proxy::SerializedTrueTypeFontDesc, std::allocator<ppapi::proxy::SerializedTrueTypeFontDesc> >*)'
15| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/QtWebEngineCore/chromium_overrides.o: previous definition here
16| collect2: error: ld returned 1 exit status
17| Makefile.core_module:74: recipe for target '../../lib/libQt5WebEngineCore.so.5.10.1' failed
18| make[3]: *** [../../lib/libQt5WebEngineCore.so.5.10.1] Error 1
19| make[3]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core'
20| Makefile:122: recipe for target 'sub-core_module-pro-make_first' failed
21| make[2]: *** [sub-core_module-pro-make_first] Error 2
22| make[2]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core'
23| Makefile:78: recipe for target 'sub-core-make_first' failed
24| make[1]: *** [sub-core-make_first] Error 2
25| make[1]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src'
26| Makefile:46: recipe for target 'sub-src-make_first' failed
27| make: *** [sub-src-make_first] Error 2
28| ERROR: oe_runmake failed
29| WARNING: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/temp/run.do_compile.10122:1 exit 1 from 'exit 1'
30| ERROR: Function failed: do_compile (log file is located at /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/temp/log.do_compile.10122)
31
32Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
33Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
34---
35 src/core/chromium_overrides.cpp | 2 +-
36 1 file changed, 1 insertion(+), 1 deletion(-)
37
38diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp
39index 8f6687ff..994e2799 100644
40--- a/src/core/chromium_overrides.cpp
41+++ b/src/core/chromium_overrides.cpp
42@@ -159,7 +159,7 @@ std::unique_ptr<base::ListValue> GetFontList_SlowBlocking()
43 return std::move(font_list);
44 }
45
46-#if BUILDFLAG(ENABLE_PLUGINS)
47+#if BUILDFLAG(ENABLE_PLUGINS) && !defined(USE_OZONE)
48 // content/browser/renderer_host/pepper/pepper_truetype_font_list.h
49 void GetFontFamilies_SlowBlocking(std::vector<std::string> *font_families)
50 {
diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
index f67baea2..f36f0902 100644
--- a/recipes-qt/qt5/qtwebengine/0004-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
@@ -1,4 +1,4 @@
1From 84d83fa843e72e2154375c8a002a74dc31ab8aae Mon Sep 17 00:00:00 2001 1From 6dec716e02e46bc75230b01aafb115f35fd3a895 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 12 Dec 2017 16:06:14 +0200 3Date: Tue, 12 Dec 2017 16:06:14 +0200
4Subject: [PATCH] musl: don't use pvalloc as it's not available on musl 4Subject: [PATCH] musl: don't use pvalloc as it's not available on musl
@@ -10,7 +10,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
10 1 file changed, 8 deletions(-) 10 1 file changed, 8 deletions(-)
11 11
12diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp 12diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp
13index 002a1af..8fd2da3 100644 13index 002a1af2..8fd2da36 100644
14--- a/src/core/api/qtbug-61521.cpp 14--- a/src/core/api/qtbug-61521.cpp
15+++ b/src/core/api/qtbug-61521.cpp 15+++ b/src/core/api/qtbug-61521.cpp
16@@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc); 16@@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc);
diff --git a/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch
index 88d95428..8dd07d65 100644
--- a/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch
+++ b/recipes-qt/qt5/qtwebengine/0006-musl-link-against-libexecinfo.patch
@@ -1,4 +1,4 @@
1From acc9fd7805f48fc998f1733db1fd58b05d381582 Mon Sep 17 00:00:00 2001 1From 418ff96920a520a4c9d082f56864ee8654f584f7 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 14 Dec 2017 11:28:10 +0200 3Date: Thu, 14 Dec 2017 11:28:10 +0200
4Subject: [PATCH] musl: link against libexecinfo 4Subject: [PATCH] musl: link against libexecinfo
@@ -10,7 +10,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/src/core/core_module.pro b/src/core/core_module.pro 12diff --git a/src/core/core_module.pro b/src/core/core_module.pro
13index d21985e..eeebeb4 100644 13index d21985e6..eeebeb4f 100644
14--- a/src/core/core_module.pro 14--- a/src/core/core_module.pro
15+++ b/src/core/core_module.pro 15+++ b/src/core/core_module.pro
16@@ -54,7 +54,7 @@ linux { 16@@ -54,7 +54,7 @@ linux {
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
index c5e9ea57..32efcf99 100644
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From 42ad6935a99271f9b481423162d9ead15ffa9ec9 Mon Sep 17 00:00:00 2001 1From 761754d5edf129d526e87ed5ace71d24f30e9618 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] chromium: Force host toolchain configuration 4Subject: [PATCH] chromium: Force host toolchain configuration
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 3 insertions(+), 3 deletions(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
15 15
16diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py 16diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py
17index 93c6446..0fe7e67 100755 17index 93c6446f28..0fe7e6737d 100755
18--- a/chromium/tools/gn/bootstrap/bootstrap.py 18--- a/chromium/tools/gn/bootstrap/bootstrap.py
19+++ b/chromium/tools/gn/bootstrap/bootstrap.py 19+++ b/chromium/tools/gn/bootstrap/bootstrap.py
20@@ -352,10 +352,10 @@ def write_gn_ninja(path, root_gen_dir, options): 20@@ -352,10 +352,10 @@ def write_gn_ninja(path, root_gen_dir, options):
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
index bc066645..b5c6c5de 100644
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-workaround-for-too-long-.rps-file-name.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
@@ -1,4 +1,4 @@
1From 95c0c42ca5103adef307fc29b53d8f95b4755baa Mon Sep 17 00:00:00 2001 1From 108bc7caf7544b47a392aac690f0d616f1c6c42e 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
@@ -18,7 +18,7 @@ Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
18 1 file changed, 9 insertions(+) 18 1 file changed, 9 insertions(+)
19 19
20diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc 20diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc
21index bab07c5..8f889ae 100644 21index bab07c5d2b..8f889aebc1 100644
22--- a/chromium/tools/gn/ninja_action_target_writer.cc 22--- a/chromium/tools/gn/ninja_action_target_writer.cc
23+++ b/chromium/tools/gn/ninja_action_target_writer.cc 23+++ b/chromium/tools/gn/ninja_action_target_writer.cc
24@@ -117,9 +117,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { 24@@ -117,9 +117,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
new file mode 100644
index 00000000..f2747330
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
@@ -0,0 +1,50 @@
1From d16d04ea5c47974f038c4434011e69dbfc23c797 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 5 Jun 2018 13:58:16 +0000
4Subject: [PATCH] chromium: Fix build with gcc8
5
6---
7 chromium/mojo/public/c/system/buffer.h | 2 +-
8 chromium/mojo/public/c/system/data_pipe.h | 2 +-
9 chromium/mojo/public/c/system/message_pipe.h | 2 +-
10 3 files changed, 3 insertions(+), 3 deletions(-)
11
12diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h
13index 09f6d285f3..e516a09e49 100644
14--- a/chromium/mojo/public/c/system/buffer.h
15+++ b/chromium/mojo/public/c/system/buffer.h
16@@ -35,7 +35,7 @@ const MojoCreateSharedBufferOptionsFlags
17 ((MojoCreateSharedBufferOptionsFlags)0)
18 #endif
19
20-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
21+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
22 struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions {
23 uint32_t struct_size;
24 MojoCreateSharedBufferOptionsFlags flags;
25diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h
26index 62adbea1ea..76225858ba 100644
27--- a/chromium/mojo/public/c/system/data_pipe.h
28+++ b/chromium/mojo/public/c/system/data_pipe.h
29@@ -46,7 +46,7 @@ const MojoCreateDataPipeOptionsFlags MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE =
30 ((MojoCreateDataPipeOptionsFlags)0)
31 #endif
32
33-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
34+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
35 struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions {
36 MOJO_ALIGNAS(4) uint32_t struct_size;
37 MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags;
38diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h
39index f0f69d1025..364a02971e 100644
40--- a/chromium/mojo/public/c/system/message_pipe.h
41+++ b/chromium/mojo/public/c/system/message_pipe.h
42@@ -44,7 +44,7 @@ const MojoCreateMessagePipeOptionsFlags
43 ((MojoCreateMessagePipeOptionsFlags)0)
44 #endif
45
46-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
47+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
48 struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions {
49 uint32_t struct_size;
50 MojoCreateMessagePipeOptionsFlags flags;
diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index 375b01a1..8aeba5f1 100644
--- a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -1,4 +1,4 @@
1From 37e7051ef185d7b1a237db725d98f63a155fc95b Mon Sep 17 00:00:00 2001 1From 48bcb9e0efa3d67543cc755a2fc0f97b6514cbab 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 66f68ef..9284d0d 100644 15index 66f68ef138..9284d0d4fc 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@@ -44,6 +44,15 @@ static bool DropRoot(); 18@@ -44,6 +44,15 @@ static bool DropRoot();
diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index 46f1c9ce..9a0b3370 100644
--- a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
1From 2ddd74e630db38b951697c0b020245c0c83b2316 Mon Sep 17 00:00:00 2001 1From 913e3c0834dd0371ee62ab91b71428fc2b77b3c4 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
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 3 files changed, 5 insertions(+), 4 deletions(-) 11 3 files changed, 5 insertions(+), 4 deletions(-)
12 12
13diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc 13diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
14index 73a52d6..4867198 100644 14index 73a52d6210..4867198a50 100644
15--- a/chromium/base/process/process_metrics_posix.cc 15--- a/chromium/base/process/process_metrics_posix.cc
16+++ b/chromium/base/process/process_metrics_posix.cc 16+++ b/chromium/base/process/process_metrics_posix.cc
17@@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() { 17@@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() {
@@ -32,7 +32,7 @@ index 73a52d6..4867198 100644
32 return 0; 32 return 0;
33 #endif 33 #endif
34diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc 34diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
35index ffd5191..0c9131e 100644 35index ffd519133c..0c9131e98e 100644
36--- a/chromium/base/trace_event/malloc_dump_provider.cc 36--- a/chromium/base/trace_event/malloc_dump_provider.cc
37+++ b/chromium/base/trace_event/malloc_dump_provider.cc 37+++ b/chromium/base/trace_event/malloc_dump_provider.cc
38@@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; 38@@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() = default;
@@ -53,7 +53,7 @@ index ffd5191..0c9131e 100644
53 } 53 }
54 54
55diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc 55diff --git a/chromium/content/child/content_child_helpers.cc b/chromium/content/child/content_child_helpers.cc
56index 7ddeb4d..b8c73b0 100644 56index 7ddeb4d16a..b8c73b09c5 100644
57--- a/chromium/content/child/content_child_helpers.cc 57--- a/chromium/content/child/content_child_helpers.cc
58+++ b/chromium/content/child/content_child_helpers.cc 58+++ b/chromium/content/child/content_child_helpers.cc
59@@ -25,7 +25,7 @@ namespace content { 59@@ -25,7 +25,7 @@ namespace content {
diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch
index e9324b69..a57d74ec 100644
--- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch
@@ -1,15 +1,15 @@
1From e627afbd990a189d3eaf9992088bd506e306a680 Mon Sep 17 00:00:00 2001 1From 5547d8bcd9241726f2ea01ada0204c4a4a4e922b 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
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 1 + 8 .../tcmalloc/chromium/src/base/linux_syscall_support.h | 1 +
9 1 file changed, 1 insertion(+) 9 1 file changed, 1 insertion(+)
10 10
11diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 11diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
12index b29ec2d..91f77dd 100644 12index b29ec2d29a..91f77dd88d 100644
13--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 13--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
14+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 14+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
15@@ -150,6 +150,7 @@ extern "C" { 15@@ -150,6 +150,7 @@ extern "C" {
diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index 6e636311..26fe1bd4 100644
--- a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
1From cfd8e1d9c17cc365c5d49d99b47ce8e06e725f86 Mon Sep 17 00:00:00 2001 1From 69905bc0ef6576240b3b72c7a00e041b2512fea2 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
@@ -8,11 +8,11 @@ Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
8 8
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 10---
11 .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++----- 11 .../tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++-----
12 1 file changed, 5 insertions(+), 5 deletions(-) 12 1 file changed, 5 insertions(+), 5 deletions(-)
13 13
14diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 14diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
15index 715c045..edc8cf2 100644 15index 715c045f66..edc8cf2db7 100644
16--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 16--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
17+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 17+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
18@@ -77,7 +77,7 @@ typedef off64_t __off64_t; 18@@ -77,7 +77,7 @@ typedef off64_t __off64_t;
diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch
index dd2d7a3a..66e22bba 100644
--- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
1From 3bfe9fa1e05ae2faec6dc73895c2bf265ec66d3b Mon Sep 17 00:00:00 2001 1From 8f5a007da9926f411d7ced9d07fcd00e4acc750a 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,7 +9,7 @@ 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 9cd5d22..1e70095 100644 12index 9cd5d2207d..1e70095648 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() {
diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
index a9e5e2b1..d622ee53 100644
--- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -1,4 +1,4 @@
1From f9e47fe475eb60c4615215214cea344280e5b26f Mon Sep 17 00:00:00 2001 1From b93340f0e24d97015a62649616cc52c92473ac64 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:09:02 -0700 3Date: Fri, 7 Jul 2017 15:09:02 -0700
4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols 4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc 12diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
13index 4b7de5e..fe56522 100644 13index 4b7de5e1a3..fe565223f2 100644
14--- a/chromium/base/allocator/allocator_shim.cc 14--- a/chromium/base/allocator/allocator_shim.cc
15+++ b/chromium/base/allocator/allocator_shim.cc 15+++ b/chromium/base/allocator/allocator_shim.cc
16@@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) { 16@@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) {
diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
index 2d47fd27..910c917e 100644
--- a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
@@ -1,4 +1,4 @@
1From 33fb1fa2f8a846734544db7b21f120f5924f9316 Mon Sep 17 00:00:00 2001 1From e43710f187e1263264fadefef991048d5bfb2fe9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:12:39 -0700 3Date: Fri, 7 Jul 2017 15:12:39 -0700
4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from 4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc 12diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc
13index 003708d..0fef314 100644 13index 003708d2c8..0fef3148f9 100644
14--- a/chromium/sandbox/linux/seccomp-bpf/trap.cc 14--- a/chromium/sandbox/linux/seccomp-bpf/trap.cc
15+++ b/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) { 16@@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
diff --git a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index 5f6dc254..cbe5d19b 100644
--- a/recipes-qt/qt5/qtwebengine/0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
@@ -1,4 +1,4 @@
1From ea8b649d60037b08bbb2134f878098c8373a08b7 Mon Sep 17 00:00:00 2001 1From 1567c7984f1d368cdf32033e801f5568c0855213 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
@@ -6,14 +6,14 @@ Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
6 6
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8--- 8---
9 chromium/net/dns/dns_config_service_posix.cc | 4 ++++ 9 chromium/net/dns/dns_config_service_posix.cc | 4 +++
10 chromium/net/dns/dns_reloader.cc | 4 ++++ 10 chromium/net/dns/dns_reloader.cc | 4 +++
11 chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++++++++++ 11 chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++
12 3 files changed, 37 insertions(+) 12 3 files changed, 37 insertions(+)
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 f2e6633..6fe84dd 100644 16index f2e66331e3..6fe84dd66a 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@@ -27,6 +27,10 @@ 19@@ -27,6 +27,10 @@
@@ -28,7 +28,7 @@ index f2e6633..6fe84dd 100644
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 322c8a5..72ff40d 100644 31index 322c8a5f0f..72ff40dbe1 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 @@
@@ -44,7 +44,7 @@ index 322c8a5..72ff40d 100644
44 #include "base/macros.h" 44 #include "base/macros.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 0000000..4f0e852 47index 0000000000..4f0e852a19
48--- /dev/null 48--- /dev/null
49+++ b/chromium/net/dns/resolv_compat.h 49+++ b/chromium/net/dns/resolv_compat.h
50@@ -0,0 +1,29 @@ 50@@ -0,0 +1,29 @@
diff --git a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index 57f313c9..e84290e3 100644
--- a/recipes-qt/qt5/qtwebengine/0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
@@ -1,4 +1,4 @@
1From 567105c9014cbad00aba5bcd172e6aed3e32c509 Mon Sep 17 00:00:00 2001 1From bc578326c48554e2123640869199d0d4505fa357 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
@@ -8,11 +8,11 @@ argument, so we just let it out for now
8 8
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 10---
11 chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- 11 .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 13
14diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 14diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
15index edc8cf2..a868b50 100644 15index edc8cf2db7..a868b50d30 100644
16--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 16--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
17+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h 17+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
18@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, 18@@ -233,7 +233,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size,
diff --git a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch
index a247eb80..7fee0d61 100644
--- a/recipes-qt/qt5/qtwebengine/0012-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -1,4 +1,4 @@
1From fdd90ccaebc488bdb68b020a9bc3d89232795559 Mon Sep 17 00:00:00 2001 1From c2bf9db1e3d32a756bcce69c1bc5ce38941b3cd4 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
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 2 files changed, 4 insertions(+), 3 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 9917a7b..cb40665 100644 13index 9917a7b1fd..cb406659b9 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@@ -173,7 +173,8 @@ void TerminateOnThread() {} 16@@ -173,7 +173,8 @@ void TerminateOnThread() {}
@@ -24,7 +24,7 @@ index 9917a7b..cb40665 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/WebKit/Source/platform/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp 26diff --git a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp
27index 13c3f90..07308e0 100644 27index 13c3f907f8..07308e0835 100644
28--- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp 28--- a/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp
29+++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp 29+++ b/chromium/third_party/WebKit/Source/platform/wtf/StackUtil.cpp
30@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { 30@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() {
diff --git a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
index b97045d0..bf4f362f 100644
--- a/recipes-qt/qt5/qtwebengine/0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
@@ -1,4 +1,4 @@
1From ba501cce8252a22a4baba2d9e524bd7538a079bd Mon Sep 17 00:00:00 2001 1From 26bdd2d86b57adb8f87081f102431854a55c734a 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 17:15:34 -0700 3Date: Fri, 7 Jul 2017 17:15:34 -0700
4Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 4Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
9 1 file changed, 1 insertion(+) 9 1 file changed, 1 insertion(+)
10 10
11diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc 11diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc
12index d6ed5e1..b550f89 100644 12index d6ed5e1f88..b550f895ef 100644
13--- a/chromium/device/serial/serial_io_handler_posix.cc 13--- a/chromium/device/serial/serial_io_handler_posix.cc
14+++ b/chromium/device/serial/serial_io_handler_posix.cc 14+++ b/chromium/device/serial/serial_io_handler_posix.cc
15@@ -6,6 +6,7 @@ 15@@ -6,6 +6,7 @@
diff --git a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
index adc2d824..3d322708 100644
--- a/recipes-qt/qt5/qtwebengine/0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
@@ -1,15 +1,15 @@
1From fc03e0f3c36d4d20e00dfbcd02616a467e4b0a15 Mon Sep 17 00:00:00 2001 1From feabe4c75c5e86dbe2c624da9423f2ad82c6bfac Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 8 Jul 2017 09:08:23 -0700 3Date: Sat, 8 Jul 2017 09:08:23 -0700
4Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t 4Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +- 8 .../tcmalloc/chromium/src/base/linux_syscall_support.h | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
10 10
11diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 11diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
12index 91f77dd..bb84a0b 100644 12index 91f77dd88d..bb84a0b305 100644
13--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 13--- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
14+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 14+++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
15@@ -1929,7 +1929,7 @@ typedef unsigned long int ulong; 15@@ -1929,7 +1929,7 @@ typedef unsigned long int ulong;