diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-09 20:42:22 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-11 12:55:06 +0000 |
commit | d4b9962a4ca37bc42b6ffdcac923e4ecd0bb8169 (patch) | |
tree | 6c810c8520ebcb9637578e478815bc5081dafc1f /recipes-qt/qt5/qtwebengine/chromium | |
parent | f705a8a47e542a5819380f024c92e43eebf08f5e (diff) | |
parent | 51e07805e0cf8f53bc9609854d1afd5e51494151 (diff) | |
download | meta-qt5-d4b9962a4ca37bc42b6ffdcac923e4ecd0bb8169.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
In addition to commits below, fixed PV value to "5.12.1" in qt5-git.inc
* upstream/master:
51e0780 qtbase: replace the fix for gcc-4.8 with the one from upstream
c67abd6 qtbase: Fix build with gcc 4.8
f69fc40 qtwebengine: Fix build with musl/gcc9
7cc177d qtwebkit-examples: drop recipe
1b755b2 qttranslations, packagegroup-qt5-toolchain-target: drop qmlviewer
5443af9 qtwayland: revert one patch from 5.12 branch to make it compatible with 5.12.0 qtbase
bd9d830 qt3d-runtime: drop patch resolved upstream
44f4fc3 qt5everywheredemo: add dependency on qtxmlpatterns
77edae5 qtconnectivity: drop patch resolved upstream
d45b966 qtwebengine: update chromium musl patchset
8c7797b qtbase: add env variable for host bin suffix
f1a5e8a qtwebengine: include sources in the debug package, add x11 PACKAGECONFIG
2be2731 libqofono: add dependency on qtxmlpatterns
725fc1f qtxmlpatterns: add qtdeclarative PACKAGECONFIG
b7b0a78 qtdeclarative: remove qtxmlpatterns PACKAGECONFIG
57aab31 qtwayland: update PACKAGECONFIG options
299a326 qtbase: update xinput PACKAGECONFIG
6531fa7 qtbase: use v5.12.0 as base
c8d5ef5 qt5: upgrade to latest revision in 5.12
c6be23d qt5: upgrade to latest revision in 5.12
201fcf2 qt5-plugin-generic-vboxtouch: fix segfault
5b35f89 qtwebengine: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
808d65c qt5: refresh .patch files, meta-qt5/qt* repos and their tags in recipes
a55a993 libconnman-qt5: Don't harcode libdir to fix multilib build
c483f15 qtbase: Fix build with gcc9
b725e6d qtbase: Consider clang when computing QMAKE_CXX.COMPILER_MACROS
7016481 qt5-creator: Enable clang plugin support when clang is used as toolchain
ba03a76 qtwebkit: Fix build with clang
7223816 maliit: Disable tests
4c3d66f qtbase: Drop QMAKE_WAYLAND_SCANNER from clang mkspecs file
f2d7b94 qtconnectivity: Ignore -Waddress-of-temporary when using clang
b8fade9 qtbase: Fix build with clang/musl
0cdf727 qt5: upgrade to 5.11.3
9fc65c0 qtwebengine: Configure Ninja to honor PARALLEL_MAKE
010a29e qmllive: add new recipe
f227502 python-pyqt5: MAKEFLAGS pass -j 1 via MAKEFLAGS during do_install
fe453ec packagegroup-qt5-toolchain-target: Skip qtwebkit if opengl not found
18f82a8 python-pyqt5: Disable parallel install
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch
recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch
recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch
recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch
recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch
recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: Ic896ea4ae0f64daaedc43a6736fc0243599f05f6
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium')
18 files changed, 169 insertions, 43 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch index e2094a68..d914a862 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9a97eb31696f24ed9edd9193bf65a439cbcc1bc1 Mon Sep 17 00:00:00 2001 | 1 | From f430c2c9b3d38f9150588da6dc154aa2285584e6 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] chromium: Force host toolchain configuration | 4 | Subject: [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 | ||
16 | diff --git a/gn/build/gen.py b/gn/build/gen.py | 16 | diff --git a/gn/build/gen.py b/gn/build/gen.py |
17 | index 87db4c26bc..34c853b7f4 100755 | 17 | index 87db4c26bcf..34c853b7f4a 100755 |
18 | --- a/gn/build/gen.py | 18 | --- a/gn/build/gen.py |
19 | +++ b/gn/build/gen.py | 19 | +++ b/gn/build/gen.py |
20 | @@ -310,10 +310,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): | 20 | @@ -310,10 +310,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/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 75958512..9a3affdf 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/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 @@ | |||
1 | From b83ddad1ae371c3de893673cec86190b4c894c72 Mon Sep 17 00:00:00 2001 | 1 | From 350f26fa393353ecbbb85ed1bc990b8072160c7e Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Thu, 30 Mar 2017 11:37:24 +0300 | 3 | Date: Thu, 30 Mar 2017 11:37:24 +0300 |
4 | Subject: [PATCH] chromium: workaround for too long .rps file name | 4 | Subject: [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 | ||
20 | diff --git a/gn/tools/gn/ninja_action_target_writer.cc b/gn/tools/gn/ninja_action_target_writer.cc | 20 | diff --git a/gn/tools/gn/ninja_action_target_writer.cc b/gn/tools/gn/ninja_action_target_writer.cc |
21 | index 7e945c0de0..3deb587668 100644 | 21 | index 7e945c0de0e..3deb587668c 100644 |
22 | --- a/gn/tools/gn/ninja_action_target_writer.cc | 22 | --- a/gn/tools/gn/ninja_action_target_writer.cc |
23 | +++ b/gn/tools/gn/ninja_action_target_writer.cc | 23 | +++ b/gn/tools/gn/ninja_action_target_writer.cc |
24 | @@ -118,9 +118,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { | 24 | @@ -118,9 +118,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 index cbde56a4..ef44aaf6 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 301d74843b0e897dccfe1c32f27c5b3c608446ae Mon Sep 17 00:00:00 2001 | 1 | From 5945b54c4095cd52eef8ab43c47a5c8c24a1aa0a Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Tue, 5 Jun 2018 13:58:16 +0000 | 3 | Date: Tue, 5 Jun 2018 13:58:16 +0000 |
4 | Subject: [PATCH] chromium: Fix build with gcc8 | 4 | Subject: [PATCH] chromium: Fix build with gcc8 |
@@ -10,7 +10,7 @@ Subject: [PATCH] chromium: Fix build with gcc8 | |||
10 | 3 files changed, 3 insertions(+), 3 deletions(-) | 10 | 3 files changed, 3 insertions(+), 3 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h | 12 | diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h |
13 | index 2cc54270ad..917415f8db 100644 | 13 | index 2cc54270ad1..917415f8db4 100644 |
14 | --- a/chromium/mojo/public/c/system/buffer.h | 14 | --- a/chromium/mojo/public/c/system/buffer.h |
15 | +++ b/chromium/mojo/public/c/system/buffer.h | 15 | +++ b/chromium/mojo/public/c/system/buffer.h |
16 | @@ -30,7 +30,7 @@ struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions { | 16 | @@ -30,7 +30,7 @@ struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions { |
@@ -23,7 +23,7 @@ index 2cc54270ad..917415f8db 100644 | |||
23 | "MojoCreateSharedBufferOptions has wrong size"); | 23 | "MojoCreateSharedBufferOptions has wrong size"); |
24 | 24 | ||
25 | diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h | 25 | diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h |
26 | index 3702cdb624..a86c8e8b32 100644 | 26 | index 3702cdb6249..a86c8e8b321 100644 |
27 | --- a/chromium/mojo/public/c/system/data_pipe.h | 27 | --- a/chromium/mojo/public/c/system/data_pipe.h |
28 | +++ b/chromium/mojo/public/c/system/data_pipe.h | 28 | +++ b/chromium/mojo/public/c/system/data_pipe.h |
29 | @@ -40,7 +40,7 @@ struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions { | 29 | @@ -40,7 +40,7 @@ struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions { |
@@ -36,7 +36,7 @@ index 3702cdb624..a86c8e8b32 100644 | |||
36 | "MojoCreateDataPipeOptions has wrong size"); | 36 | "MojoCreateDataPipeOptions has wrong size"); |
37 | 37 | ||
38 | diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h | 38 | diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h |
39 | index 9f222f9aa8..4878774707 100644 | 39 | index 9f222f9aa81..4878774707a 100644 |
40 | --- a/chromium/mojo/public/c/system/message_pipe.h | 40 | --- a/chromium/mojo/public/c/system/message_pipe.h |
41 | +++ b/chromium/mojo/public/c/system/message_pipe.h | 41 | +++ b/chromium/mojo/public/c/system/message_pipe.h |
42 | @@ -35,7 +35,7 @@ struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions { | 42 | @@ -35,7 +35,7 @@ struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions { |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-stack-pointer-clobber.patch new file mode 100644 index 00000000..7716a76f --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-stack-pointer-clobber.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From d517836886eee72503aecc3e866fb7f08e6b0c49 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 23 Dec 2018 16:58:04 -0800 | ||
4 | Subject: [PATCH] chromium: stack pointer clobber | ||
5 | |||
6 | Do not add stack pointer to clobber list | ||
7 | |||
8 | it was being ignored until gcc 9.0 became capable | ||
9 | of flagging this silent ignoring via [1] | ||
10 | |||
11 | [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813<Paste> | ||
12 | |||
13 | Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | chromium/third_party/lss/linux_syscall_support.h | 10 +++++----- | ||
17 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
18 | |||
19 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | ||
20 | index 5d9c2e8582f..e19e51dd304 100644 | ||
21 | --- a/chromium/third_party/lss/linux_syscall_support.h | ||
22 | +++ b/chromium/third_party/lss/linux_syscall_support.h | ||
23 | @@ -1964,7 +1964,7 @@ struct kernel_statfs { | ||
24 | __asm__ volatile(LSS_ENTRYPOINT \ | ||
25 | : "=a" (__res) \ | ||
26 | : "0" (__NR_##name) \ | ||
27 | - : "esp", "memory"); \ | ||
28 | + : "memory"); \ | ||
29 | LSS_RETURN(type,__res); \ | ||
30 | } | ||
31 | #undef _syscall1 | ||
32 | @@ -2012,7 +2012,7 @@ struct kernel_statfs { | ||
33 | : "i" (__NR_##name), "ri" ((long)(arg1)), \ | ||
34 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ | ||
35 | "S" ((long)(arg4)), "D" ((long)(arg5)) \ | ||
36 | - : "esp", "memory"); \ | ||
37 | + : "memory"); \ | ||
38 | LSS_RETURN(type,__res); \ | ||
39 | } | ||
40 | #undef _syscall6 | ||
41 | @@ -2034,7 +2034,7 @@ struct kernel_statfs { | ||
42 | : "i" (__NR_##name), "0" ((long)(&__s)), \ | ||
43 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ | ||
44 | "S" ((long)(arg4)), "D" ((long)(arg5)) \ | ||
45 | - : "esp", "memory"); \ | ||
46 | + : "memory"); \ | ||
47 | LSS_RETURN(type,__res); \ | ||
48 | } | ||
49 | LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, | ||
50 | @@ -2120,7 +2120,7 @@ struct kernel_statfs { | ||
51 | : "0"(-EINVAL), "i"(__NR_clone), | ||
52 | "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), | ||
53 | "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) | ||
54 | - : "esp", "memory", "ecx", "edx", "esi", "edi"); | ||
55 | + : "memory", "ecx", "edx", "esi", "edi"); | ||
56 | LSS_RETURN(int, __res); | ||
57 | } | ||
58 | |||
59 | @@ -2405,7 +2405,7 @@ struct kernel_statfs { | ||
60 | "d"(LSS_SYSCALL_ARG(parent_tidptr)), | ||
61 | "r"(LSS_SYSCALL_ARG(newtls)), | ||
62 | "r"(LSS_SYSCALL_ARG(child_tidptr)) | ||
63 | - : "rsp", "memory", "r8", "r10", "r11", "rcx"); | ||
64 | + : "memory", "r8", "r10", "r11", "rcx"); | ||
65 | } | ||
66 | LSS_RETURN(int, __res); | ||
67 | } | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index c8b18f5f..0340d995 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 71bb7a3ab845c554e3b59d538666641d350e9a85 Mon Sep 17 00:00:00 2001 | 1 | From 3386b5df27ec6dfd42fa5bc30b5e307b293a0a5f Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:01:12 -0700 | 3 | Date: Fri, 7 Jul 2017 14:01:12 -0700 |
4 | Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not | 4 | Subject: [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 | ||
14 | diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c | 14 | diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c |
15 | index 66f68ef138..9284d0d4fc 100644 | 15 | index 66f68ef1387..9284d0d4fc5 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/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index 0c1b2017..3d1c7ff0 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 22a60b7403ba8404e2936caf9126c6c666fa577b Mon Sep 17 00:00:00 2001 | 1 | From 8a99b4662109d03502baa1578d5484bfdd399caf Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 | 3 | Date: Fri, 7 Jul 2017 14:09:06 -0700 |
4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux | 4 | Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux |
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 2 files changed, 4 insertions(+), 2 deletions(-) | 10 | 2 files changed, 4 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc | 12 | diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc |
13 | index a09bbf2c56..b309f6b694 100644 | 13 | index a09bbf2c56e..b309f6b694e 100644 |
14 | --- a/chromium/base/process/process_metrics_posix.cc | 14 | --- a/chromium/base/process/process_metrics_posix.cc |
15 | +++ b/chromium/base/process/process_metrics_posix.cc | 15 | +++ b/chromium/base/process/process_metrics_posix.cc |
16 | @@ -100,14 +100,14 @@ size_t ProcessMetrics::GetMallocUsage() { | 16 | @@ -100,14 +100,14 @@ size_t ProcessMetrics::GetMallocUsage() { |
@@ -31,7 +31,7 @@ index a09bbf2c56..b309f6b694 100644 | |||
31 | return 0; | 31 | return 0; |
32 | #endif | 32 | #endif |
33 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc | 33 | diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc |
34 | index 46fdb3e214..27936e6b20 100644 | 34 | index 46fdb3e2146..27936e6b200 100644 |
35 | --- a/chromium/base/trace_event/malloc_dump_provider.cc | 35 | --- a/chromium/base/trace_event/malloc_dump_provider.cc |
36 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc | 36 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc |
37 | @@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; | 37 | @@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch index 80f7d5f7..05a8ac33 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 34d37948df08f250aaf31125c40f088b1d0d2aa0 Mon Sep 17 00:00:00 2001 | 1 | From f451b8f55b6258a725a2ba470ca8feaa600f621e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:37:49 -0700 | 3 | Date: Fri, 7 Jul 2017 14:37:49 -0700 |
4 | Subject: [PATCH] chromium: musl: include fcntl.h for loff_t | 4 | Subject: [PATCH] chromium: musl: include fcntl.h for loff_t |
@@ -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 | ||
11 | diff --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 | 11 | diff --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 |
12 | index 13aa415e25..9d1309b836 100644 | 12 | index 13aa415e250..9d1309b836f 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 | @@ -154,6 +154,7 @@ extern "C" { | 15 | @@ -154,6 +154,7 @@ extern "C" { |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index e98074d9..1acfd7be 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 52ba569d06e28de9fec463481411792661d66d9e Mon Sep 17 00:00:00 2001 | 1 | From 36d8ce0f390678080a670d1c48340c341d33bfad Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 | 3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 |
4 | Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t | 4 | Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t |
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 1 file changed, 5 insertions(+), 5 deletions(-) | 12 | 1 file changed, 5 insertions(+), 5 deletions(-) |
13 | 13 | ||
14 | diff --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 | 14 | diff --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 |
15 | index 2f6116fa45..7486a05a27 100755 | 15 | index 2f6116fa45c..7486a05a272 100755 |
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 | @@ -60,7 +60,7 @@ | 18 | @@ -60,7 +60,7 @@ |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch index 5e60ce45..7a6636fe 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7f8e9ac3c1018b198574a60b3be444b0ae6433d5 Mon Sep 17 00:00:00 2001 | 1 | From 606a0f86fdfb600ab43221e079483d5de5db39bb Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 | 3 | Date: Fri, 7 Jul 2017 14:54:38 -0700 |
4 | Subject: [PATCH] chromium: musl: linux != glibc, make the distinction | 4 | Subject: [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 | ||
11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc | 11 | diff --git a/chromium/base/allocator/allocator_check.cc b/chromium/base/allocator/allocator_check.cc |
12 | index a17ff21733..9f6175ad1d 100644 | 12 | index a17ff217331..9f6175ad1de 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/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch index b1b9f076..82ac109d 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c071a51e75e370c432bf4348fdda2b794927c896 Mon Sep 17 00:00:00 2001 | 1 | From 418261c2f6f4c5ec81e390af265aa22b7adba272 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 | 3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 |
4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols | 4 | Subject: [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 | ||
12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc | 12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc |
13 | index e919f094c3..414a21d32a 100644 | 13 | index e919f094c37..414a21d32ad 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/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch index 4e426e07..2916dbd3 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b082f048a5789f7ab6466c84d7e955a4f2c03d03 Mon Sep 17 00:00:00 2001 | 1 | From 69d01ff29ba4e338c9d13369a511e90ab0168afa Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:12:39 -0700 | 3 | Date: Fri, 7 Jul 2017 15:12:39 -0700 |
4 | Subject: [PATCH] chromium: musl: Use correct member name __si_fields from | 4 | Subject: [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 | ||
12 | diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc | 12 | diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc |
13 | index 003708d2c8..0fef3148f9 100644 | 13 | index 003708d2c89..0fef3148f9d 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/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index d4fc2bbc..6abab3ea 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bec65d7ea2899131007b46336d4a1df1e59709df Mon Sep 17 00:00:00 2001 | 1 | From ad6c7f73c56dc465b0554437da971adf763c4032 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:27:50 -0700 | 3 | Date: Fri, 7 Jul 2017 15:27:50 -0700 |
4 | Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc | 4 | Subject: [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 | ||
15 | diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc | 15 | diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc |
16 | index 06e9d7969c..8e18a297a9 100644 | 16 | index 06e9d7969c0..8e18a297a96 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 06e9d7969c..8e18a297a9 100644 | |||
28 | #include "net/dns/dns_config_watcher_mac.h" | 28 | #include "net/dns/dns_config_watcher_mac.h" |
29 | #endif | 29 | #endif |
30 | diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc | 30 | diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc |
31 | index ad96f681cc..334ff59ad7 100644 | 31 | index ad96f681ccd..334ff59ad75 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 ad96f681cc..334ff59ad7 100644 | |||
44 | #include "base/macros.h" | 44 | #include "base/macros.h" |
45 | diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h | 45 | diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h |
46 | new file mode 100644 | 46 | new file mode 100644 |
47 | index 0000000000..4f0e852a19 | 47 | index 00000000000..4f0e852a19d |
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/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch new file mode 100644 index 00000000..8f3463de --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From f1060910189ba7760b7285a4b221065c1d677241 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 15:39:57 -0700 | ||
4 | Subject: [PATCH] chromium: musl: Do not define __sbrk on musl | ||
5 | |||
6 | musl libc does not have sbrk. on musl libc will only work when called with 0 as | ||
7 | argument, so we just let it out for now | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | .../third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --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 | ||
15 | index 7486a05a272..610a10b659a 100755 | ||
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 | ||
18 | @@ -206,7 +206,7 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size, | ||
19 | return result; | ||
20 | } | ||
21 | |||
22 | -#ifndef __UCLIBC__ | ||
23 | +#if !defined(__UCLIBC__) && defined(__GLIBC__) | ||
24 | // libc's version: | ||
25 | extern "C" void* __sbrk(intptr_t increment); | ||
26 | |||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch index 844b2da1..a3b34b22 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dcfd333f7c6c19fc2e206637683a3b0e90ed6c83 Mon Sep 17 00:00:00 2001 | 1 | From 7f95397de67e00390fd90ed6b2f70dcfde8d7285 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 | 3 | Date: Fri, 7 Jul 2017 16:41:23 -0700 |
4 | Subject: [PATCH] chromium: musl: Adjust default pthread stack size | 4 | Subject: [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 | ||
12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc | 12 | diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc |
13 | index 190acedf7c..343e1a8c61 100644 | 13 | index 190acedf7c5..343e1a8c61d 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 190acedf7c..343e1a8c61 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. |
26 | diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 26 | diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc |
27 | index 10f1c0df11..8e86a2eb1e 100644 | 27 | index 10f1c0df11f..8e86a2eb1e9 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 | @@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { | 30 | @@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch index 1036d943..5595c777 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e9a71c8bc66cd4ae996a81130ec9995cd1121b2a Mon Sep 17 00:00:00 2001 | 1 | From 010cff20ca97bba43ed9d6332bd3e9b0198c97a4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 17:15:34 -0700 | 3 | Date: Fri, 7 Jul 2017 17:15:34 -0700 |
4 | Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 | 4 | Subject: [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 | ||
11 | diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc | 11 | diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc |
12 | index d6ed5e1f88..b550f895ef 100644 | 12 | index d6ed5e1f889..b550f895ef5 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/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch index db52d77b..fc9eef80 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 5d74f21ea59cc3a2ed214b83432a634d93140c3f Mon Sep 17 00:00:00 2001 | 1 | From 7bc63fb1e62c906db5be40acd1d10095461cd4bd Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 25 Sep 2018 12:35:07 -0700 | 3 | Date: Tue, 25 Sep 2018 12:35:07 -0700 |
4 | Subject: [PATCH] Use _fpstate instead of _libc_fpstate on linux | 4 | Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on |
5 | linux | ||
5 | 6 | ||
6 | glibc defines both. musl libc only the former. | 7 | glibc defines both. musl libc only the former. |
7 | 8 | ||
@@ -13,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | 3 files changed, 4 insertions(+), 4 deletions(-) | 14 | 3 files changed, 4 insertions(+), 4 deletions(-) |
14 | 15 | ||
15 | diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc | 16 | diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc |
16 | index 052ce37cb4..95b0fb44e1 100644 | 17 | index 052ce37cb44..95b0fb44e12 100644 |
17 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc | 18 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc |
18 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc | 19 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc |
19 | @@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { | 20 | @@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { |
@@ -35,7 +36,7 @@ index 052ce37cb4..95b0fb44e1 100644 | |||
35 | 36 | ||
36 | out->context_flags = MD_CONTEXT_AMD64_FULL; | 37 | out->context_flags = MD_CONTEXT_AMD64_FULL; |
37 | diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h | 38 | diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h |
38 | index f830618f24..f3dde1f4df 100644 | 39 | index f830618f240..f3dde1f4dff 100644 |
39 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h | 40 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h |
40 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h | 41 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h |
41 | @@ -50,7 +50,7 @@ struct UContextReader { | 42 | @@ -50,7 +50,7 @@ struct UContextReader { |
@@ -48,7 +49,7 @@ index f830618f24..f3dde1f4df 100644 | |||
48 | static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, | 49 | static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, |
49 | const struct fpsimd_context* fpregs); | 50 | const struct fpsimd_context* fpregs); |
50 | diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h | 51 | diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h |
51 | index d1dc331215..d1cc5624cd 100644 | 52 | index d1dc331215a..d1cc5624cd4 100644 |
52 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h | 53 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h |
53 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h | 54 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h |
54 | @@ -48,7 +48,7 @@ class ExceptionHandler; | 55 | @@ -48,7 +48,7 @@ class ExceptionHandler; |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch index da890915..51e852ce 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch | |||
@@ -1,10 +1,11 @@ | |||
1 | From e6b0d8e952706f450ba6204ffe894330f2087f86 Mon Sep 17 00:00:00 2001 | 1 | From 7652de3ab9dbc9eacf73a3fe16559a1651a48b1a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 25 Sep 2018 12:59:05 -0700 | 3 | Date: Tue, 25 Sep 2018 12:59:05 -0700 |
4 | Subject: [PATCH] elf_reader.cc: include <sys/reg.h> to get __WORDSIZE on musl | 4 | Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get |
5 | libc | 5 | __WORDSIZE on musl libc |
6 | 6 | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | 9 | --- |
9 | chromium/third_party/breakpad/breakpad/configure.ac | 2 +- | 10 | chromium/third_party/breakpad/breakpad/configure.ac | 2 +- |
10 | .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 3 ++- | 11 | .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 3 ++- |
@@ -12,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 3 files changed, 4 insertions(+), 2 deletions(-) | 13 | 3 files changed, 4 insertions(+), 2 deletions(-) |
13 | 14 | ||
14 | diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac | 15 | diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac |
15 | index 9cca5aa069..04139a728c 100644 | 16 | index 9cca5aa069c..04139a728cc 100644 |
16 | --- a/chromium/third_party/breakpad/breakpad/configure.ac | 17 | --- a/chromium/third_party/breakpad/breakpad/configure.ac |
17 | +++ b/chromium/third_party/breakpad/breakpad/configure.ac | 18 | +++ b/chromium/third_party/breakpad/breakpad/configure.ac |
18 | @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, | 19 | @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, |
@@ -25,7 +26,7 @@ index 9cca5aa069..04139a728c 100644 | |||
25 | 26 | ||
26 | AX_CXX_COMPILE_STDCXX(11, noext, mandatory) | 27 | AX_CXX_COMPILE_STDCXX(11, noext, mandatory) |
27 | diff --git a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc | 28 | diff --git a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc |
28 | index 4135a51a98..be92b792d3 100644 | 29 | index 4135a51a980..be92b792d3c 100644 |
29 | --- a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc | 30 | --- a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc |
30 | +++ b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc | 31 | +++ b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc |
31 | @@ -29,10 +29,11 @@ | 32 | @@ -29,10 +29,11 @@ |
@@ -42,7 +43,7 @@ index 4135a51a98..be92b792d3 100644 | |||
42 | #include <fcntl.h> | 43 | #include <fcntl.h> |
43 | #include <string.h> | 44 | #include <string.h> |
44 | diff --git a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 45 | diff --git a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h |
45 | index d03c7a88d3..28b55ab630 100644 | 46 | index d03c7a88d38..28b55ab6300 100644 |
46 | --- a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 47 | --- a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h |
47 | +++ b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 48 | +++ b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h |
48 | @@ -33,6 +33,7 @@ | 49 | @@ -33,6 +33,7 @@ |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-pread-pwrite.patch new file mode 100644 index 00000000..fd6ed6ad --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-pread-pwrite.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From b8d97e253b4df62b2ab8b313a34d69d29c63b24c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 23 Dec 2018 16:58:04 -0800 | ||
4 | Subject: [PATCH] chromium: musl: pread pwrite | ||
5 | |||
6 | Redefine pread/pwrite in terms of 64bit variants on musl | ||
7 | since 32bit variants don't exist and aliases are not defined in | ||
8 | libc either | ||
9 | |||
10 | Upstream-Status: Submitted [https://codereview.chromium.org/1743093002/] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | chromium/third_party/lss/linux_syscall_support.h | 5 +++++ | ||
14 | 1 file changed, 5 insertions(+) | ||
15 | |||
16 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | ||
17 | index e19e51dd304..5c661949d1e 100644 | ||
18 | --- a/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 { | ||
21 | #ifndef __NR_fallocate | ||
22 | #define __NR_fallocate 285 | ||
23 | #endif | ||
24 | +#undef __NR_pread | ||
25 | +#define __NR_pread __NR_pread64 | ||
26 | +#undef __NR_pwrite | ||
27 | +#define __NR_pwrite __NR_pwrite64 | ||
28 | + | ||
29 | /* End of x86-64 definitions */ | ||
30 | #elif defined(__mips__) | ||
31 | #if _MIPS_SIM == _MIPS_SIM_ABI32 | ||