diff options
32 files changed, 135 insertions, 520 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index d1a73717..be24bc51 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From efcb303585f8ebae43767ab284d1e808d44d290f Mon Sep 17 00:00:00 2001 | 1 | From 083cc8263e38640dc4da53796c4c3665e5b2444c 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] Force host toolchain configuration | 4 | Subject: [PATCH] Force host toolchain configuration |
@@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | |||
19 | 3 files changed, 10 insertions(+), 10 deletions(-) | 19 | 3 files changed, 10 insertions(+), 10 deletions(-) |
20 | 20 | ||
21 | diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri | 21 | diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri |
22 | index 56c18bdb..ea6142a6 100644 | 22 | index 7507d51e..1e078cbf 100644 |
23 | --- a/src/buildtools/config/linux.pri | 23 | --- a/src/buildtools/config/linux.pri |
24 | +++ b/src/buildtools/config/linux.pri | 24 | +++ b/src/buildtools/config/linux.pri |
25 | @@ -118,7 +118,7 @@ contains(QT_ARCH, "mips") { | 25 | @@ -118,7 +118,7 @@ contains(QT_ARCH, "mips") { |
diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index 2fbe73f7..a7c8f79f 100644 --- a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4d816d872fbb635ac5a6d263218634b7027fa0f9 Mon Sep 17 00:00:00 2001 | 1 | From e45b77542978de101d3a3e9d644bfcaccea6982d 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: Tue, 12 Dec 2017 16:06:14 +0200 | 3 | Date: Tue, 12 Dec 2017 16:06:14 +0200 |
4 | Subject: [PATCH] musl: don't use pvalloc as it's not available on musl | 4 | Subject: [PATCH] musl: don't use pvalloc as it's not available on musl |
diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch index e2ed63cb..fc5a39a0 100644 --- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5ff62acfe5882c39dcd9154dbb9bd631b10c20ab Mon Sep 17 00:00:00 2001 | 1 | From b00c5048b99a87665491d932dc05a2723a604edb 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, 14 Dec 2017 11:28:10 +0200 | 3 | Date: Thu, 14 Dec 2017 11:28:10 +0200 |
4 | Subject: [PATCH] musl: link against libexecinfo | 4 | Subject: [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 | ||
12 | diff --git a/src/core/core_module.pro b/src/core/core_module.pro | 12 | diff --git a/src/core/core_module.pro b/src/core/core_module.pro |
13 | index 3b439e81..b1669e19 100644 | 13 | index 520b452f..d2b29b29 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 | @@ -5,7 +5,7 @@ include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri) | 16 | @@ -5,7 +5,7 @@ include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri) |
diff --git a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch index 6569ced8..c2eac846 100644 --- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b52d58e204ffcb3dcd55ddee390d256cfbb1b54b Mon Sep 17 00:00:00 2001 | 1 | From a4099f31e1850c81a27ae3572b00705431b05254 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, 12 Nov 2019 19:53:59 -0800 | 3 | Date: Tue, 12 Nov 2019 19:53:59 -0800 |
4 | Subject: [PATCH] mkspecs: Allow builds with libc != glibc | 4 | Subject: [PATCH] mkspecs: Allow builds with libc != glibc |
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 2 files changed, 1 insertion(+), 7 deletions(-) | 10 | 2 files changed, 1 insertion(+), 7 deletions(-) |
11 | 11 | ||
12 | diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri | 12 | diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri |
13 | index e192f877..49ad4bf3 100644 | 13 | index e7f869a1..f9c9c24b 100644 |
14 | --- a/src/buildtools/config/support.pri | 14 | --- a/src/buildtools/config/support.pri |
15 | +++ b/src/buildtools/config/support.pri | 15 | +++ b/src/buildtools/config/support.pri |
16 | @@ -181,10 +181,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { | 16 | @@ -191,10 +191,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { |
17 | 17 | ||
18 | defineTest(qtwebengine_checkForGlibc) { | 18 | defineTest(qtwebengine_checkForGlibc) { |
19 | module = $$1 | 19 | module = $$1 |
@@ -25,10 +25,10 @@ index e192f877..49ad4bf3 100644 | |||
25 | } | 25 | } |
26 | 26 | ||
27 | diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json | 27 | diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json |
28 | index 1ca6214a..b352e675 100644 | 28 | index 812a91f9..a7c3d972 100644 |
29 | --- a/src/buildtools/configure.json | 29 | --- a/src/buildtools/configure.json |
30 | +++ b/src/buildtools/configure.json | 30 | +++ b/src/buildtools/configure.json |
31 | @@ -376,7 +376,6 @@ | 31 | @@ -373,7 +373,6 @@ |
32 | && (!config.sanitizer || features.webengine-sanitizer) | 32 | && (!config.sanitizer || features.webengine-sanitizer) |
33 | && (!config.linux || features.pkg-config) | 33 | && (!config.linux || features.pkg-config) |
34 | && (!config.linux || features.webengine-host-pkg-config) | 34 | && (!config.linux || features.webengine-host-pkg-config) |
@@ -36,7 +36,7 @@ index 1ca6214a..b352e675 100644 | |||
36 | && (!config.linux || features.webengine-system-khr) | 36 | && (!config.linux || features.webengine-system-khr) |
37 | && (!config.linux || features.webengine-system-nss) | 37 | && (!config.linux || features.webengine-system-nss) |
38 | && (!config.linux || features.webengine-system-dbus) | 38 | && (!config.linux || features.webengine-system-dbus) |
39 | @@ -743,8 +742,7 @@ | 39 | @@ -770,8 +769,7 @@ |
40 | "webengine-system-fontconfig", | 40 | "webengine-system-fontconfig", |
41 | "webengine-system-dbus", | 41 | "webengine-system-dbus", |
42 | "webengine-system-nss", | 42 | "webengine-system-nss", |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch index a783a1e7..1df41114 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0e5ecca67b6a9fb71bb200af534f22cb820ac652 Mon Sep 17 00:00:00 2001 | 1 | From 6c4a4b7c3dbfb1fc851522a67e1bcb7862b91184 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 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch index 659f938a..75dad974 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 52bcf1b214cd39139fdd547fef514acaf19bd3f8 Mon Sep 17 00:00:00 2001 | 1 | From 35cd9c8391865012644038b1af425ac7e2ae1828 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: Sat, 2 Feb 2019 19:28:59 -0800 | 3 | Date: Sat, 2 Feb 2019 19:28:59 -0800 |
4 | Subject: [PATCH] chromium: fix build with clang | 4 | Subject: [PATCH] chromium: fix build with clang |
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 1 file changed, 2 insertions(+), 25 deletions(-) | 10 | 1 file changed, 2 insertions(+), 25 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn | 12 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn |
13 | index ca81bd8ce0f..d3c588b21e3 100644 | 13 | index 6a58d21cf07..c007eab8ec9 100644 |
14 | --- a/chromium/build/config/compiler/BUILD.gn | 14 | --- a/chromium/build/config/compiler/BUILD.gn |
15 | +++ b/chromium/build/config/compiler/BUILD.gn | 15 | +++ b/chromium/build/config/compiler/BUILD.gn |
16 | @@ -776,8 +776,6 @@ config("compiler_cpu_abi") { | 16 | @@ -782,8 +782,6 @@ config("compiler_cpu_abi") { |
17 | } | 17 | } |
18 | } else if (current_cpu == "arm") { | 18 | } else if (current_cpu == "arm") { |
19 | if (is_clang && !is_android && !is_nacl) { | 19 | if (is_clang && !is_android && !is_nacl) { |
@@ -22,7 +22,7 @@ index ca81bd8ce0f..d3c588b21e3 100644 | |||
22 | } | 22 | } |
23 | if (!is_nacl) { | 23 | if (!is_nacl) { |
24 | cflags += [ | 24 | cflags += [ |
25 | @@ -790,8 +788,6 @@ config("compiler_cpu_abi") { | 25 | @@ -796,8 +794,6 @@ config("compiler_cpu_abi") { |
26 | } | 26 | } |
27 | } else if (current_cpu == "arm64") { | 27 | } else if (current_cpu == "arm64") { |
28 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { | 28 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { |
@@ -31,7 +31,7 @@ index ca81bd8ce0f..d3c588b21e3 100644 | |||
31 | } | 31 | } |
32 | } else if (current_cpu == "mipsel" && !is_nacl) { | 32 | } else if (current_cpu == "mipsel" && !is_nacl) { |
33 | ldflags += [ "-Wl,--hash-style=sysv" ] | 33 | ldflags += [ "-Wl,--hash-style=sysv" ] |
34 | @@ -800,9 +796,6 @@ config("compiler_cpu_abi") { | 34 | @@ -806,9 +802,6 @@ config("compiler_cpu_abi") { |
35 | if (is_android) { | 35 | if (is_android) { |
36 | cflags += [ "--target=mipsel-linux-android" ] | 36 | cflags += [ "--target=mipsel-linux-android" ] |
37 | ldflags += [ "--target=mipsel-linux-android" ] | 37 | ldflags += [ "--target=mipsel-linux-android" ] |
@@ -41,7 +41,7 @@ index ca81bd8ce0f..d3c588b21e3 100644 | |||
41 | } | 41 | } |
42 | } else { | 42 | } else { |
43 | cflags += [ "-EL" ] | 43 | cflags += [ "-EL" ] |
44 | @@ -881,10 +874,7 @@ config("compiler_cpu_abi") { | 44 | @@ -887,10 +880,7 @@ config("compiler_cpu_abi") { |
45 | } else if (current_cpu == "mips" && !is_nacl) { | 45 | } else if (current_cpu == "mips" && !is_nacl) { |
46 | ldflags += [ "-Wl,--hash-style=sysv" ] | 46 | ldflags += [ "-Wl,--hash-style=sysv" ] |
47 | if (custom_toolchain == "") { | 47 | if (custom_toolchain == "") { |
@@ -53,7 +53,7 @@ index ca81bd8ce0f..d3c588b21e3 100644 | |||
53 | cflags += [ "-EB" ] | 53 | cflags += [ "-EB" ] |
54 | ldflags += [ "-EB" ] | 54 | ldflags += [ "-EB" ] |
55 | } | 55 | } |
56 | @@ -931,9 +921,6 @@ config("compiler_cpu_abi") { | 56 | @@ -937,9 +927,6 @@ config("compiler_cpu_abi") { |
57 | if (is_android) { | 57 | if (is_android) { |
58 | cflags += [ "--target=mips64el-linux-android" ] | 58 | cflags += [ "--target=mips64el-linux-android" ] |
59 | ldflags += [ "--target=mips64el-linux-android" ] | 59 | ldflags += [ "--target=mips64el-linux-android" ] |
@@ -63,7 +63,7 @@ index ca81bd8ce0f..d3c588b21e3 100644 | |||
63 | } | 63 | } |
64 | } else { | 64 | } else { |
65 | cflags += [ | 65 | cflags += [ |
66 | @@ -990,10 +977,7 @@ config("compiler_cpu_abi") { | 66 | @@ -996,10 +983,7 @@ config("compiler_cpu_abi") { |
67 | } else if (current_cpu == "mips64") { | 67 | } else if (current_cpu == "mips64") { |
68 | ldflags += [ "-Wl,--hash-style=sysv" ] | 68 | ldflags += [ "-Wl,--hash-style=sysv" ] |
69 | if (custom_toolchain == "") { | 69 | if (custom_toolchain == "") { |
@@ -75,7 +75,7 @@ index ca81bd8ce0f..d3c588b21e3 100644 | |||
75 | cflags += [ | 75 | cflags += [ |
76 | "-EB", | 76 | "-EB", |
77 | "-mabi=64", | 77 | "-mabi=64", |
78 | @@ -1157,13 +1141,6 @@ config("compiler_deterministic") { | 78 | @@ -1166,13 +1150,6 @@ config("compiler_deterministic") { |
79 | } | 79 | } |
80 | } | 80 | } |
81 | } | 81 | } |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch deleted file mode 100644 index 0b14cf81..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From 1af3e18800c3be5c4fbe1aa96fc1a0c454d89817 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 | 6 +++--- | ||
17 | 1 file changed, 3 insertions(+), 3 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 d2baee9d243..fd8efdffea6 100644 | ||
21 | --- a/chromium/third_party/lss/linux_syscall_support.h | ||
22 | +++ b/chromium/third_party/lss/linux_syscall_support.h | ||
23 | @@ -2017,7 +2017,7 @@ struct kernel_statfs { | ||
24 | : "i" (__NR_##name), "ri" ((long)(arg1)), \ | ||
25 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ | ||
26 | "S" ((long)(arg4)), "D" ((long)(arg5)) \ | ||
27 | - : "esp", "memory"); \ | ||
28 | + : "memory"); \ | ||
29 | LSS_RETURN(type,__res); \ | ||
30 | } | ||
31 | #undef _syscall6 | ||
32 | @@ -2039,7 +2039,7 @@ struct kernel_statfs { | ||
33 | : "i" (__NR_##name), "0" ((long)(&__s)), \ | ||
34 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ | ||
35 | "S" ((long)(arg4)), "D" ((long)(arg5)) \ | ||
36 | - : "esp", "memory"); \ | ||
37 | + : "memory"); \ | ||
38 | LSS_RETURN(type,__res); \ | ||
39 | } | ||
40 | LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, | ||
41 | @@ -2125,7 +2125,7 @@ struct kernel_statfs { | ||
42 | : "0"(-EINVAL), "i"(__NR_clone), | ||
43 | "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), | ||
44 | "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) | ||
45 | - : "esp", "memory", "ecx", "edx", "esi", "edi"); | ||
46 | + : "memory", "ecx", "edx", "esi", "edi"); | ||
47 | LSS_RETURN(int, __res); | ||
48 | } | ||
49 | |||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch index f79c07a5..2f22f282 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1572f98f6be6ac77a45dfd5442b2f6ba1a03e360 Mon Sep 17 00:00:00 2001 | 1 | From 2fed766cdca44dc67a508b26ea66feab47eb49fd 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, 5 Feb 2019 14:32:20 -0800 | 3 | Date: Tue, 5 Feb 2019 14:32:20 -0800 |
4 | Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm | 4 | Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm |
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 4 insertions(+), 1 deletion(-) | 15 | 1 file changed, 4 insertions(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn | 17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn |
18 | index fb2a35e87f2..6cca80181ed 100644 | 18 | index 891c2c34bfb..5ab519bd133 100644 |
19 | --- a/chromium/third_party/zlib/BUILD.gn | 19 | --- a/chromium/third_party/zlib/BUILD.gn |
20 | +++ b/chromium/third_party/zlib/BUILD.gn | 20 | +++ b/chromium/third_party/zlib/BUILD.gn |
21 | @@ -89,8 +89,11 @@ if (use_arm_neon_optimizations) { | 21 | @@ -115,8 +115,11 @@ if (use_arm_neon_optimizations) { |
22 | # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: | 22 | # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: |
23 | # "All implementations of the ARMv8.1 architecture are required to | 23 | # "All implementations of the ARMv8.1 architecture are required to |
24 | # implement the CRC32* instructions. These are optional in ARMv8.0." | 24 | # implement the CRC32* instructions. These are optional in ARMv8.0." |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch index 37442d0a..92e16f40 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4e0bc86764ac1e324c50e698b47c630efab07632 Mon Sep 17 00:00:00 2001 | 1 | From 6c43c38e14a889950f1401d484fe16594cac2c22 Mon Sep 17 00:00:00 2001 |
2 | From: Johannes Pointner <johannes.pointner@br-automation.com> | 2 | From: Johannes Pointner <johannes.pointner@br-automation.com> |
3 | Date: Fri, 3 May 2019 09:12:38 +0200 | 3 | Date: Fri, 3 May 2019 09:12:38 +0200 |
4 | Subject: [PATCH] chromium: Do not try to set the guessed values for | 4 | Subject: [PATCH] chromium: Do not try to set the guessed values for |
@@ -20,10 +20,10 @@ Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com> | |||
20 | 1 file changed, 9 deletions(-) | 20 | 1 file changed, 9 deletions(-) |
21 | 21 | ||
22 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn | 22 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn |
23 | index d3c588b21e3..6d49fde33cc 100644 | 23 | index c007eab8ec9..feb4340f522 100644 |
24 | --- a/chromium/build/config/compiler/BUILD.gn | 24 | --- a/chromium/build/config/compiler/BUILD.gn |
25 | +++ b/chromium/build/config/compiler/BUILD.gn | 25 | +++ b/chromium/build/config/compiler/BUILD.gn |
26 | @@ -777,15 +777,6 @@ config("compiler_cpu_abi") { | 26 | @@ -783,15 +783,6 @@ config("compiler_cpu_abi") { |
27 | } else if (current_cpu == "arm") { | 27 | } else if (current_cpu == "arm") { |
28 | if (is_clang && !is_android && !is_nacl) { | 28 | if (is_clang && !is_android && !is_nacl) { |
29 | } | 29 | } |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch index 0dacc25f..f8e7d4ba 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3be4bd9030c774e5e06abd5e74f9f5465510b2db Mon Sep 17 00:00:00 2001 | 1 | From b2521c339d944c1f5333ccc258cbae2fd8b741a2 Mon Sep 17 00:00:00 2001 |
2 | From: Jiri Slaby <jslaby@suse.cz> | 2 | From: Jiri Slaby <jslaby@suse.cz> |
3 | Date: Thu, 11 Jul 2019 09:35:13 +0200 | 3 | Date: Thu, 11 Jul 2019 09:35:13 +0200 |
4 | Subject: [PATCH] chromium: fix build after y2038 changes in glibc | 4 | Subject: [PATCH] chromium: fix build after y2038 changes in glibc |
@@ -15,10 +15,10 @@ Upstream-Status: Pending | |||
15 | 1 file changed, 1 insertion(+) | 15 | 1 file changed, 1 insertion(+) |
16 | 16 | ||
17 | diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 17 | diff --git a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc |
18 | index 0cbcb8130c6..bc3dd3bddda 100644 | 18 | index cf6e7927951..e5df6f9d92c 100644 |
19 | --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 19 | --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc |
20 | +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 20 | +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc |
21 | @@ -71,6 +71,7 @@ typedef void* SockOptArg; | 21 | @@ -70,6 +70,7 @@ typedef void* SockOptArg; |
22 | #endif // WEBRTC_POSIX | 22 | #endif // WEBRTC_POSIX |
23 | 23 | ||
24 | #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) | 24 | #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch index b7c9f1b1..6677a03a 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e61af5f5bc6a14a3e77373eee1055cd15c54797f Mon Sep 17 00:00:00 2001 | 1 | From 5fc06ad92eaeb20e3b0afbc47a2436bf9038d942 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: Sat, 30 Nov 2019 10:07:43 -0800 | 3 | Date: Sat, 30 Nov 2019 10:07:43 -0800 |
4 | Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t | 4 | Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t |
@@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
16 | 2 files changed, 6 insertions(+), 2 deletions(-) | 16 | 2 files changed, 6 insertions(+), 2 deletions(-) |
17 | 17 | ||
18 | diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h | 18 | diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h |
19 | index 717410f2ebc..a4cd55ca20e 100644 | 19 | index 2d184811a00..fb2ba0069f1 100644 |
20 | --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h | 20 | --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h |
21 | +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h | 21 | +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h |
22 | @@ -20,6 +20,11 @@ | 22 | @@ -20,6 +20,11 @@ |
@@ -32,10 +32,10 @@ index 717410f2ebc..a4cd55ca20e 100644 | |||
32 | 32 | ||
33 | namespace ui { | 33 | namespace ui { |
34 | diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 34 | diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc |
35 | index 01e49b7bbfd..4fccfd62f84 100644 | 35 | index b8d089f7381..5d2d08b1ec6 100644 |
36 | --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 36 | --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc |
37 | +++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 37 | +++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc |
38 | @@ -63,8 +63,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { | 38 | @@ -62,8 +62,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { |
39 | continue; | 39 | continue; |
40 | std::string event_string = base::StringPrintf( | 40 | std::string event_string = base::StringPrintf( |
41 | "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, | 41 | "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch deleted file mode 100644 index 5da3c36f..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 2eab9281d34bf53fd5a4b58184f9e165e27f9eaf Mon Sep 17 00:00:00 2001 | ||
2 | From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | ||
3 | Date: Thu, 8 Mar 2018 15:39:55 +0100 | ||
4 | Subject: [PATCH] chromium: aarch64 skia build fix | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | GCC (tested rocko's 7.3.0) cannot find these intrinsics and the build fails: | ||
9 | |||
10 | ../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::F neon::from_half(neon::U16)': | ||
11 | ../../third_party/skia/src/opts/SkRasterPipeline_opts.h:657:26: error: cannot convert 'neon::U16 {aka short unsigned int}' to 'float16x4_ t {aka __vector(4) __ fp16}' for argument '1' to ' | ||
12 | float32x4_t vcvt_f32_f16(float16x4_t)' | ||
13 | return vcvt_f32_f16(h); | ||
14 | ^ | ||
15 | ../../third_party/skia/src/opts/SkRasterPipeline_opts.h: In function 'neon::U16 neon::to_half(neon::F)': | ||
16 | ../../third_party/skia/src/opts/SkRasterPipeline_opts.h:677:26: error: cannot convert 'neon::F {aka float}' to 'float32x4_t {aka __vector (4) float}' for argum ent '1' to 'float16x4_t vcvt | ||
17 | _f16_f32(float32x4_t)' | ||
18 | return vcvt_f16_f32(f); | ||
19 | ^ | ||
20 | |||
21 | Upstream seems to have had similar issues according to | ||
22 | https://skia-review.googlesource.com/c/skia/+/84222, but there is no fix at the | ||
23 | moment. | ||
24 | |||
25 | Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | ||
26 | --- | ||
27 | .../skia/src/opts/SkRasterPipeline_opts.h | 17 ++--------------- | ||
28 | 1 file changed, 2 insertions(+), 15 deletions(-) | ||
29 | |||
30 | diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | ||
31 | index 831f5b3bb03..bb9377c3641 100644 | ||
32 | --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | ||
33 | +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | ||
34 | @@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) { | ||
35 | } | ||
36 | |||
37 | SI F from_half(U16 h) { | ||
38 | -#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ | ||
39 | - && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
40 | - __fp16 fp16; | ||
41 | - memcpy(&fp16, &h, sizeof(U16)); | ||
42 | - return float(fp16); | ||
43 | - | ||
44 | -#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) | ||
45 | +#if defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) | ||
46 | return _mm256_cvtph_ps(h); | ||
47 | |||
48 | #else | ||
49 | @@ -1009,14 +1003,7 @@ SI F from_half(U16 h) { | ||
50 | } | ||
51 | |||
52 | SI U16 to_half(F f) { | ||
53 | -#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ | ||
54 | - && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
55 | - __fp16 fp16 = __fp16(f); | ||
56 | - U16 u16; | ||
57 | - memcpy(&u16, &fp16, sizeof(U16)); | ||
58 | - return u16; | ||
59 | - | ||
60 | -#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) | ||
61 | +#if defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) | ||
62 | return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION); | ||
63 | |||
64 | #else | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch index 78dbba17..064bb576 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 533788149c8b24d7da2702866594cd7a44c8f571 Mon Sep 17 00:00:00 2001 | 1 | From 3ed9af348ff76523e5aa16317a354b47dcae1766 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: Wed, 25 Dec 2019 15:41:16 -0800 | 3 | Date: Wed, 25 Dec 2019 15:41:16 -0800 |
4 | Subject: [PATCH] chromium: Include cstddef for size_t definition | 4 | Subject: [PATCH] chromium: Include cstddef for size_t definition |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch index d018397e..2ee2cce0 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ec96f37700a45c317027ad917a835e1eac2169fc Mon Sep 17 00:00:00 2001 | 1 | From 159ee1528e0870555bf1bac8f24795d84c223a56 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: Thu, 2 Jan 2020 17:13:55 -0800 | 3 | Date: Thu, 2 Jan 2020 17:13:55 -0800 |
4 | Subject: [PATCH] chromium: Move CharAllocator definition to a header file | 4 | Subject: [PATCH] chromium: Move CharAllocator definition to a header file |
@@ -13,11 +13,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | 2 files changed, 255 insertions(+), 251 deletions(-) | 13 | 2 files changed, 255 insertions(+), 251 deletions(-) |
14 | 14 | ||
15 | diff --git a/chromium/cc/base/list_container_helper.cc b/chromium/cc/base/list_container_helper.cc | 15 | diff --git a/chromium/cc/base/list_container_helper.cc b/chromium/cc/base/list_container_helper.cc |
16 | index 3a4c0b6a2f9..89df57a7b8e 100644 | 16 | index 7b594b4a458..9dae1c360c4 100644 |
17 | --- a/chromium/cc/base/list_container_helper.cc | 17 | --- a/chromium/cc/base/list_container_helper.cc |
18 | +++ b/chromium/cc/base/list_container_helper.cc | 18 | +++ b/chromium/cc/base/list_container_helper.cc |
19 | @@ -12,259 +12,8 @@ | 19 | @@ -13,259 +13,8 @@ |
20 | #include "base/logging.h" | 20 | #include "base/check_op.h" |
21 | #include "base/memory/aligned_memory.h" | 21 | #include "base/memory/aligned_memory.h" |
22 | 22 | ||
23 | -namespace { | 23 | -namespace { |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch index 1ce09e34..3abfb814 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 15e16b5f8405a402b94bd1be48d1eabff474795f Mon Sep 17 00:00:00 2001 | 1 | From 496d125361f53ef9b3e4e92bdcfa19aec57c0007 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: Sat, 1 Feb 2020 12:17:23 -0800 | 3 | Date: Sat, 1 Feb 2020 12:17:23 -0800 |
4 | Subject: [PATCH] chromium: Link v8 with libatomic on x86 | 4 | Subject: [PATCH] chromium: Link v8 with libatomic on x86 |
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn | 16 | diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn |
17 | index ab20142de9a..4ef4aa80cc0 100644 | 17 | index ba99c75140b..33cf943bcba 100644 |
18 | --- a/chromium/v8/BUILD.gn | 18 | --- a/chromium/v8/BUILD.gn |
19 | +++ b/chromium/v8/BUILD.gn | 19 | +++ b/chromium/v8/BUILD.gn |
20 | @@ -3543,7 +3543,8 @@ v8_source_set("v8_base_without_compiler") { | 20 | @@ -3862,7 +3862,8 @@ v8_source_set("v8_base_without_compiler") { |
21 | if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || | 21 | if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || |
22 | v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || | 22 | v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || |
23 | v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || | 23 | v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch index a8b52c39..355ff4fa 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-icu-use-system-library-only-targets.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f0aebd4351e729d281fb597627ff87cbe8a67dd0 Mon Sep 17 00:00:00 2001 | 1 | From acdb51541e4eb73177b28c79d395d8d6964ed161 Mon Sep 17 00:00:00 2001 |
2 | From: Andrej Valek <andrej.valek@siemens.com> | 2 | From: Andrej Valek <andrej.valek@siemens.com> |
3 | Date: Fri, 17 Apr 2020 09:43:32 +0200 | 3 | Date: Fri, 17 Apr 2020 09:43:32 +0200 |
4 | Subject: [PATCH] chromium: icu: use system library only targets | 4 | Subject: [PATCH] chromium: icu: use system library only targets |
@@ -20,13 +20,13 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
20 | 1 file changed, 14 insertions(+), 4 deletions(-) | 20 | 1 file changed, 14 insertions(+), 4 deletions(-) |
21 | 21 | ||
22 | diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn | 22 | diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn |
23 | index 73673fa20ac..a656692c7bf 100644 | 23 | index 2430d3e48e5..5d00226667d 100644 |
24 | --- a/chromium/third_party/icu/BUILD.gn | 24 | --- a/chromium/third_party/icu/BUILD.gn |
25 | +++ b/chromium/third_party/icu/BUILD.gn | 25 | +++ b/chromium/third_party/icu/BUILD.gn |
26 | @@ -7,9 +7,13 @@ import("//build/config/host_byteorder.gni") | 26 | @@ -8,9 +8,13 @@ import("//build/config/linux/pkg_config.gni") |
27 | import("//build/config/linux/pkg_config.gni") | ||
28 | import("//build/shim_headers.gni") | 27 | import("//build/shim_headers.gni") |
29 | import("//third_party/icu/config.gni") | 28 | import("//third_party/icu/config.gni") |
29 | import("//third_party/icu/sources.gni") | ||
30 | +import("//v8/gni/snapshot_toolchain.gni") | 30 | +import("//v8/gni/snapshot_toolchain.gni") |
31 | 31 | ||
32 | declare_args() { | 32 | declare_args() { |
@@ -37,7 +37,7 @@ index 73673fa20ac..a656692c7bf 100644 | |||
37 | } | 37 | } |
38 | 38 | ||
39 | if (is_android) { | 39 | if (is_android) { |
40 | @@ -23,6 +27,12 @@ if (is_mac) { | 40 | @@ -24,6 +28,12 @@ if (is_mac && !icu_is_in_fuchsia) { |
41 | assert(!icu_disable_thin_archive || !is_component_build, | 41 | assert(!icu_disable_thin_archive || !is_component_build, |
42 | "icu_disable_thin_archive only works in static library builds") | 42 | "icu_disable_thin_archive only works in static library builds") |
43 | 43 | ||
@@ -50,7 +50,7 @@ index 73673fa20ac..a656692c7bf 100644 | |||
50 | # Meta target that includes both icuuc and icui18n. Most targets want both. | 50 | # Meta target that includes both icuuc and icui18n. Most targets want both. |
51 | # You can depend on the individually if you need to. | 51 | # You can depend on the individually if you need to. |
52 | group("icu") { | 52 | group("icu") { |
53 | @@ -1222,7 +1232,7 @@ config("system_icu_config") { | 53 | @@ -413,7 +423,7 @@ config("system_icu_config") { |
54 | } | 54 | } |
55 | } | 55 | } |
56 | 56 | ||
@@ -59,7 +59,7 @@ index 73673fa20ac..a656692c7bf 100644 | |||
59 | pkg_config("system_icui18n") { | 59 | pkg_config("system_icui18n") { |
60 | packages = [ "icu-i18n" ] | 60 | packages = [ "icu-i18n" ] |
61 | } | 61 | } |
62 | @@ -1435,7 +1445,7 @@ shim_headers("icuuc_shim") { | 62 | @@ -626,7 +636,7 @@ shim_headers("icuuc_shim") { |
63 | } | 63 | } |
64 | 64 | ||
65 | config("icu_config") { | 65 | config("icu_config") { |
@@ -68,7 +68,7 @@ index 73673fa20ac..a656692c7bf 100644 | |||
68 | configs = [ ":system_icu_config"] | 68 | configs = [ ":system_icu_config"] |
69 | } else { | 69 | } else { |
70 | configs = [ ":bundled_icu_config"] | 70 | configs = [ ":bundled_icu_config"] |
71 | @@ -1443,7 +1453,7 @@ config("icu_config") { | 71 | @@ -634,7 +644,7 @@ config("icu_config") { |
72 | } | 72 | } |
73 | 73 | ||
74 | group("icuuc") { | 74 | group("icuuc") { |
@@ -77,7 +77,7 @@ index 73673fa20ac..a656692c7bf 100644 | |||
77 | deps = [ ":icuuc_shim" ] | 77 | deps = [ ":icuuc_shim" ] |
78 | public_configs = [ | 78 | public_configs = [ |
79 | ":system_icu_config", | 79 | ":system_icu_config", |
80 | @@ -1455,7 +1465,7 @@ group("icuuc") { | 80 | @@ -646,7 +656,7 @@ group("icuuc") { |
81 | } | 81 | } |
82 | 82 | ||
83 | group("icui18n") { | 83 | group("icui18n") { |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch deleted file mode 100644 index a8f3feb9..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | From 93a8a2a4c33ffece095ab3438eb3c7a4f60ead34 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 15 Jan 2020 16:53:46 -0800 | ||
4 | Subject: [PATCH] chromium: Include <cstddef> and <cstdint> | ||
5 | |||
6 | These headers are needed for uintXX_t and size_t definitions | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | chromium/third_party/webrtc/call/rtx_receive_stream.h | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h | ||
14 | index 66cc46dc091..e8cadb2bb80 100644 | ||
15 | --- a/chromium/third_party/webrtc/call/rtx_receive_stream.h | ||
16 | +++ b/chromium/third_party/webrtc/call/rtx_receive_stream.h | ||
17 | @@ -11,6 +11,7 @@ | ||
18 | #ifndef CALL_RTX_RECEIVE_STREAM_H_ | ||
19 | #define CALL_RTX_RECEIVE_STREAM_H_ | ||
20 | |||
21 | +#include <cstdint> | ||
22 | #include <map> | ||
23 | #include <stdint.h> | ||
24 | |||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index e1624cb9..9acb43ab 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d6a03a1de746c5fc460f3e63fe2ceec050663da4 Mon Sep 17 00:00:00 2001 | 1 | From a4e658527d513366e614c188f0572b4f32c385d1 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 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index ef45ed08..dbb4e4df 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 73d501e0503fc5a9a2229933f976c713b6e7f28a Mon Sep 17 00:00:00 2001 | 1 | From 4ad1b69cbb61baba2d8796d721b2009c33c00640 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,15 +10,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 2 files changed, 4 insertions(+), 2 deletions(-) | 10 | 2 files changed, 4 insertions(+), 2 deletions(-) |
11 | 11 | ||
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 044bd8d244f..cec43e1d59b 100644 | 13 | index 9d12c427bb3..900ab13519f 100644 |
14 | --- a/chromium/base/process/process_metrics_posix.cc | 14 | --- a/chromium/base/process/process_metrics_posix.cc |
15 | +++ b/chromium/base/process/process_metrics_posix.cc | 15 | +++ b/chromium/base/process/process_metrics_posix.cc |
16 | @@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() { | 16 | @@ -119,14 +119,14 @@ size_t ProcessMetrics::GetMallocUsage() { |
17 | malloc_statistics_t stats = {0}; | 17 | malloc_statistics_t stats = {0}; |
18 | malloc_zone_statistics(nullptr, &stats); | 18 | malloc_zone_statistics(nullptr, &stats); |
19 | return stats.size_in_use; | 19 | return stats.size_in_use; |
20 | -#elif defined(OS_LINUX) || defined(OS_ANDROID) | 20 | -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) |
21 | +#elif defined(__GLIBC__) || defined(OS_ANDROID) | 21 | +#elif defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID) |
22 | struct mallinfo minfo = mallinfo(); | 22 | struct mallinfo minfo = mallinfo(); |
23 | #if BUILDFLAG(USE_TCMALLOC) | 23 | #if BUILDFLAG(USE_TCMALLOC) |
24 | return minfo.uordblks; | 24 | return minfo.uordblks; |
@@ -31,7 +31,7 @@ index 044bd8d244f..cec43e1d59b 100644 | |||
31 | return 0; | 31 | return 0; |
32 | #endif | 32 | #endif |
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 1bf34c9d9ea..00e46d30b3a 100644 | 34 | index c327f486596..90129e851e8 100644 |
35 | --- a/chromium/base/trace_event/malloc_dump_provider.cc | 35 | --- a/chromium/base/trace_event/malloc_dump_provider.cc |
36 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc | 36 | +++ b/chromium/base/trace_event/malloc_dump_provider.cc |
37 | @@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; | 37 | @@ -77,6 +77,7 @@ MallocDumpProvider::~MallocDumpProvider() = default; |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch index 7cc717e2..cb49de14 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 181e65fb3a39ad4fb08c676b0ee67d887aeb68c7 Mon Sep 17 00:00:00 2001 | 1 | From c86fd26828f794d1e547d2d81970ecf3d701e9f7 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 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch deleted file mode 100644 index 7708a4c0..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch +++ /dev/null | |||
@@ -1,139 +0,0 @@ | |||
1 | From d073427b25915e1784c3d74296b68fef0076ceb0 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Mon, 20 Apr 2020 23:56:48 +0200 | ||
4 | Subject: [PATCH] chromium: Fix sandbox 'Aw, snap' for syscalls 403 and 407 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Taken as is from meta-browser. Saw my application freeze for syscall 0407 | ||
10 | trouble: | ||
11 | |||
12 | | ../../../../git/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc:**CRASHING**:seccomp-bpf failure in syscall 0407 | ||
13 | |||
14 | Original commit message: | ||
15 | |||
16 | * syscall 403: reported by ArchLinux users [1-2] | ||
17 | * syscall 407: reported by me [3] | ||
18 | |||
19 | Looking at [4-5] it seems that glibc (>=2.31?) introduced extra syscalls for | ||
20 | 32Bit systems to handle time64: | ||
21 | |||
22 | * __NR_clock_gettime -> __NR_clock_gettime64 | ||
23 | * __NR_clock_nanosleep -> __NR_clock_nanosleep_time64 | ||
24 | |||
25 | To fix | ||
26 | | ../../sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc:**CRASHING**:seccomp-bpf failure in syscall 0403 | ||
27 | | ../../sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc:**CRASHING**:seccomp-bpf failure in syscall 0407 | ||
28 | |||
29 | we handle new systemcalls in the same way as 64bit systems do and 32bit systems | ||
30 | did before glibc 2.31. | ||
31 | |||
32 | [1] https://bugs.archlinux32.org/index.php?do=details&task_id=105 | ||
33 | [2] https://bbs.archlinux32.org/viewtopic.php?id=2897 | ||
34 | [3] https://github.com/OSSystems/meta-browser/issues/357 | ||
35 | [4] https://sourceware.org/git/?p=glibc.git;a=commit;h=2e44b10b42d68d9887ccab17b76db5d7bbae4fb6 | ||
36 | [5] https://github.com/bminor/glibc/blob/019d828669df966dc4ef2684fce0b1c17bef9aae/sysdeps/unix/sysv/linux/clock_gettime.c#L30 | ||
37 | |||
38 | Upstream Status: Pending [Have no idea where to send this] | ||
39 | |||
40 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
41 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
42 | --- | ||
43 | .../sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc | 9 ++++++++- | ||
44 | .../syscall_parameters_restrictions_unittests.cc | 6 ++++++ | ||
45 | .../sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc | 6 ++++++ | ||
46 | .../sandbox/linux/system_headers/arm_linux_syscalls.h | 8 ++++++++ | ||
47 | .../sandbox/linux/system_headers/mips_linux_syscalls.h | 8 ++++++++ | ||
48 | 5 files changed, 36 insertions(+), 1 deletion(-) | ||
49 | |||
50 | diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc | ||
51 | index 712f9699a94..2a80dd2d2b3 100644 | ||
52 | --- a/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc | ||
53 | +++ b/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc | ||
54 | @@ -148,7 +148,14 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno, | ||
55 | return Allow(); | ||
56 | #endif | ||
57 | |||
58 | - if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) { | ||
59 | + if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep | ||
60 | +#if defined(__NR_clock_gettime64) | ||
61 | + || sysno == __NR_clock_gettime64 | ||
62 | +#endif | ||
63 | +#if defined(__NR_clock_nanosleep_time64) | ||
64 | + || sysno == __NR_clock_nanosleep_time64 | ||
65 | +#endif | ||
66 | + ) { | ||
67 | return RestrictClockID(); | ||
68 | } | ||
69 | |||
70 | diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc | ||
71 | index b6c8c637746..81972a9d998 100644 | ||
72 | --- a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc | ||
73 | +++ b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc | ||
74 | @@ -60,6 +60,12 @@ class RestrictClockIdPolicy : public bpf_dsl::Policy { | ||
75 | case __NR_clock_gettime: | ||
76 | case __NR_clock_getres: | ||
77 | case __NR_clock_nanosleep: | ||
78 | +#if defined(__NR_clock_nanosleep_time64) | ||
79 | + case __NR_clock_nanosleep_time64: | ||
80 | +#endif | ||
81 | +#if defined(__NR_clock_gettime64) | ||
82 | + case __NR_clock_gettime64: | ||
83 | +#endif | ||
84 | return RestrictClockID(); | ||
85 | default: | ||
86 | return Allow(); | ||
87 | diff --git a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc | ||
88 | index d9d18822f67..0db8745cb57 100644 | ||
89 | --- a/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc | ||
90 | +++ b/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc | ||
91 | @@ -39,6 +39,12 @@ bool SyscallSets::IsAllowedGettime(int sysno) { | ||
92 | // filtered by RestrictClokID(). | ||
93 | case __NR_clock_gettime: // Parameters filtered by RestrictClockID(). | ||
94 | case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID(). | ||
95 | +#if defined(__NR_clock_gettime64) | ||
96 | + case __NR_clock_gettime64: // Parameters filtered by RestrictClockID(). | ||
97 | +#endif | ||
98 | +#if defined(__NR_clock_nanosleep_time64) | ||
99 | + case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID(). | ||
100 | +#endif | ||
101 | case __NR_clock_settime: // Privileged. | ||
102 | #if defined(__i386__) || \ | ||
103 | (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) | ||
104 | diff --git a/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h b/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h | ||
105 | index 1addd53843c..5de2162f981 100644 | ||
106 | --- a/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h | ||
107 | +++ b/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h | ||
108 | @@ -1385,6 +1385,14 @@ | ||
109 | #define __NR_memfd_create (__NR_SYSCALL_BASE+385) | ||
110 | #endif | ||
111 | |||
112 | +#if !defined(__NR_clock_gettime64) | ||
113 | +#define __NR_clock_gettime64 (__NR_SYSCALL_BASE+403) | ||
114 | +#endif | ||
115 | + | ||
116 | +#if !defined(__NR_clock_nanosleep_time64) | ||
117 | +#define __NR_clock_nanosleep_time64 (__NR_SYSCALL_BASE+407) | ||
118 | +#endif | ||
119 | + | ||
120 | // ARM private syscalls. | ||
121 | #if !defined(__ARM_NR_BASE) | ||
122 | #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000) | ||
123 | diff --git a/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h b/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h | ||
124 | index ddbf97f3d8b..fa01b3bbc66 100644 | ||
125 | --- a/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h | ||
126 | +++ b/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h | ||
127 | @@ -1433,4 +1433,12 @@ | ||
128 | #define __NR_memfd_create (__NR_Linux + 354) | ||
129 | #endif | ||
130 | |||
131 | +#if !defined(__NR_clock_gettime64) | ||
132 | +#define __NR_clock_gettime64 (__NR_Linux + 403) | ||
133 | +#endif | ||
134 | + | ||
135 | +#if !defined(__NR_clock_nanosleep_time64) | ||
136 | +#define __NR_clock_nanosleep_time64 (__NR_Linux + 407) | ||
137 | +#endif | ||
138 | + | ||
139 | #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_ | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index 96d5f6c0..96862bb5 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 486e9c6aa16c9f2ea69a454bacbb15a11c0f96f2 Mon Sep 17 00:00:00 2001 | 1 | From 953e53d9f6f43db1a8648b6a6644528ed145aca8 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 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch index f01dbc80..56e0d365 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4d4ec444217441b360e0ed7d784558b8acbcd4ab Mon Sep 17 00:00:00 2001 | 1 | From a7bf393630fe1ad70cf32765c56a1a4f1c0e4d4c 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,15 +9,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | 10 | ||
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 5ea77ef2d27..85343a13905 100644 | 12 | index a5ca0b7191e..7017d48b5a0 100644 |
13 | --- a/chromium/base/allocator/allocator_check.cc | 13 | --- a/chromium/base/allocator/allocator_check.cc |
14 | +++ b/chromium/base/allocator/allocator_check.cc | 14 | +++ b/chromium/base/allocator/allocator_check.cc |
15 | @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { | 15 | @@ -27,7 +27,7 @@ bool IsAllocatorInitialized() { |
16 | // Set by allocator_shim_override_ucrt_symbols_win.h when the | 16 | // Set by allocator_shim_override_ucrt_symbols_win.h when the |
17 | // shimmed _set_new_mode() is called. | 17 | // shimmed _set_new_mode() is called. |
18 | return g_is_win_shim_layer_initialized; | 18 | return g_is_win_shim_layer_initialized; |
19 | -#elif defined(OS_LINUX) && BUILDFLAG(USE_TCMALLOC) && \ | 19 | -#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ |
20 | +#elif defined(__GLIBC__) && BUILDFLAG(USE_TCMALLOC) && \ | 20 | +#elif (defined(__GLIBC__) || defined(OS_CHROMEOS)) && \ |
21 | !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) | 21 | BUILDFLAG(USE_TCMALLOC) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) |
22 | // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. | 22 | // From third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h. |
23 | // TODO(primiano): replace with an include once base can depend on allocator. | 23 | // TODO(primiano): replace with an include once base can depend on allocator. |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index c359002e..eae797ce 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 50a0f95d35c5180ee04fd66ec5135bf020acdad2 Mon Sep 17 00:00:00 2001 | 1 | From d9897081f0ca3b0da9fd3e6fed67a703f3848d6a 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 |
@@ -6,29 +6,13 @@ Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc | |||
6 | 6 | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-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_reloader.cc | 4 ++++ |
10 | chromium/net/dns/dns_reloader.cc | 4 +++ | 10 | chromium/net/dns/resolv_compat.h | 29 +++++++++++++++++++++++++++++ |
11 | chromium/net/dns/resolv_compat.h | 29 ++++++++++++++++++++ | 11 | 2 files changed, 33 insertions(+) |
12 | 3 files changed, 37 insertions(+) | ||
13 | create mode 100644 chromium/net/dns/resolv_compat.h | 12 | create mode 100644 chromium/net/dns/resolv_compat.h |
14 | 13 | ||
15 | diff --git a/chromium/net/dns/dns_config_service_posix.cc b/chromium/net/dns/dns_config_service_posix.cc | ||
16 | index eaa5336c339..18b40d7d005 100644 | ||
17 | --- a/chromium/net/dns/dns_config_service_posix.cc | ||
18 | +++ b/chromium/net/dns/dns_config_service_posix.cc | ||
19 | @@ -29,6 +29,10 @@ | ||
20 | #include "net/dns/public/dns_protocol.h" | ||
21 | #include "net/dns/serial_worker.h" | ||
22 | |||
23 | +#if defined(OS_LINUX) && !defined(__GLIBC__) | ||
24 | +#include "net/dns/resolv_compat.h" | ||
25 | +#endif | ||
26 | + | ||
27 | #if defined(OS_MACOSX) && !defined(OS_IOS) | ||
28 | #include "net/dns/dns_config_watcher_mac.h" | ||
29 | #endif | ||
30 | diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc | 14 | diff --git a/chromium/net/dns/dns_reloader.cc b/chromium/net/dns/dns_reloader.cc |
31 | index 1c014a65019..2670a827aa5 100644 | 15 | index 0672e711afb..300f77e3b38 100644 |
32 | --- a/chromium/net/dns/dns_reloader.cc | 16 | --- a/chromium/net/dns/dns_reloader.cc |
33 | +++ b/chromium/net/dns/dns_reloader.cc | 17 | +++ b/chromium/net/dns/dns_reloader.cc |
34 | @@ -9,6 +9,10 @@ | 18 | @@ -9,6 +9,10 @@ |
@@ -40,8 +24,8 @@ index 1c014a65019..2670a827aa5 100644 | |||
40 | +#endif | 24 | +#endif |
41 | + | 25 | + |
42 | #include "base/lazy_instance.h" | 26 | #include "base/lazy_instance.h" |
43 | #include "base/logging.h" | ||
44 | #include "base/macros.h" | 27 | #include "base/macros.h" |
28 | #include "base/notreached.h" | ||
45 | diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h | 29 | diff --git a/chromium/net/dns/resolv_compat.h b/chromium/net/dns/resolv_compat.h |
46 | new file mode 100644 | 30 | new file mode 100644 |
47 | index 00000000000..4f0e852a19d | 31 | index 00000000000..4f0e852a19d |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Do-not-define-__sbrk-on-musl.patch index 2cdec0e0..71232258 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 095231f601a93c46408364d9ffd1378a14cc8d83 Mon Sep 17 00:00:00 2001 | 1 | From 9b3aa55d2ca61650ed99b17be5ca97989ead3a15 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:39:57 -0700 | 3 | Date: Fri, 7 Jul 2017 15:39:57 -0700 |
4 | Subject: [PATCH] chromium: musl: Do not define __sbrk on musl | 4 | Subject: [PATCH] chromium: musl: Do not define __sbrk on musl |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Adjust-default-pthread-stack-size.patch index 808cf67a..25aed494 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c24db93fd5fa5728da55448865ba6bb4d6355491 Mon Sep 17 00:00:00 2001 | 1 | From 36174b6d0a7db78739c90ab51643b68cc64c1d5e 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,10 +10,10 @@ 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 095c49b8dc0..d1479b54d48 100644 | 13 | index c1a705e2b89..f322fdb8352 100644 |
14 | --- a/chromium/base/threading/platform_thread_linux.cc | 14 | --- a/chromium/base/threading/platform_thread_linux.cc |
15 | +++ b/chromium/base/threading/platform_thread_linux.cc | 15 | +++ b/chromium/base/threading/platform_thread_linux.cc |
16 | @@ -186,7 +186,8 @@ void TerminateOnThread() {} | 16 | @@ -377,7 +377,8 @@ void TerminateOnThread() {} |
17 | 17 | ||
18 | size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { | 18 | size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { |
19 | #if !defined(THREAD_SANITIZER) | 19 | #if !defined(THREAD_SANITIZER) |
@@ -24,10 +24,10 @@ index 095c49b8dc0..d1479b54d48 100644 | |||
24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the | 24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the |
25 | // default stack size isn't enough for some browser tests. | 25 | // default stack size isn't enough for some browser tests. |
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 1aaaa1c60d2..f49152fa6ac 100644 | 27 | index 71b901f4044..f33aba04bc3 100644 |
28 | --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 28 | --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc |
29 | +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 29 | +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc |
30 | @@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { | 30 | @@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() { |
31 | // FIXME: On Mac OSX and Linux, this method cannot estimate stack size | 31 | // FIXME: On Mac OSX and Linux, this method cannot estimate stack size |
32 | // correctly for the main thread. | 32 | // correctly for the main thread. |
33 | 33 | ||
@@ -36,7 +36,7 @@ index 1aaaa1c60d2..f49152fa6ac 100644 | |||
36 | defined(OS_FUCHSIA) | 36 | defined(OS_FUCHSIA) |
37 | // pthread_getattr_np() can fail if the thread is not invoked by | 37 | // pthread_getattr_np() can fail if the thread is not invoked by |
38 | // pthread_create() (e.g., the main thread of blink_unittests). | 38 | // pthread_create() (e.g., the main thread of blink_unittests). |
39 | @@ -96,7 +96,7 @@ return Threading::ThreadStackSize(); | 39 | @@ -97,7 +97,7 @@ return Threading::ThreadStackSize(); |
40 | } | 40 | } |
41 | 41 | ||
42 | void* GetStackStart() { | 42 | void* GetStackStart() { |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch index e4ecf41e..6c46ba03 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 426b9ef79898e82ee04cfbe7c19746bdfd1c92ac Mon Sep 17 00:00:00 2001 | 1 | From 05bbf1b0d31cdeb8ac3c439fda261acb146cfe8d 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] chromium: musl: elf_reader.cc: include <sys/reg.h> to get | 4 | Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get |
@@ -7,13 +7,13 @@ Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get | |||
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 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
9 | --- | 9 | --- |
10 | chromium/third_party/breakpad/breakpad/configure.ac | 2 +- | 10 | chromium/third_party/breakpad/breakpad/configure.ac | 2 +- |
11 | .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 3 ++- | 11 | .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 2 ++ |
12 | .../breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 + | 12 | .../breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 + |
13 | 3 files changed, 4 insertions(+), 2 deletions(-) | 13 | 3 files changed, 4 insertions(+), 1 deletion(-) |
14 | 14 | ||
15 | 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 |
16 | index 492d09038f9..a6403ed8c3c 100644 | 16 | index 08513687f34..13745540a5e 100644 |
17 | --- a/chromium/third_party/breakpad/breakpad/configure.ac | 17 | --- a/chromium/third_party/breakpad/breakpad/configure.ac |
18 | +++ b/chromium/third_party/breakpad/breakpad/configure.ac | 18 | +++ b/chromium/third_party/breakpad/breakpad/configure.ac |
19 | @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, | 19 | @@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, |
@@ -22,28 +22,24 @@ index 492d09038f9..a6403ed8c3c 100644 | |||
22 | AX_PTHREAD | 22 | AX_PTHREAD |
23 | -AC_CHECK_HEADERS([a.out.h sys/random.h]) | 23 | -AC_CHECK_HEADERS([a.out.h sys/random.h]) |
24 | +AC_CHECK_HEADERS([a.out.h sys/random.h sys/reg.h]) | 24 | +AC_CHECK_HEADERS([a.out.h sys/random.h sys/reg.h]) |
25 | AC_CHECK_FUNCS([arc4random getrandom]) | 25 | AC_CHECK_FUNCS([arc4random getcontext getrandom]) |
26 | AM_CONDITIONAL([HAVE_GETCONTEXT], [test "x$ac_cv_func_getcontext" = xyes]) | ||
26 | 27 | ||
27 | AX_CXX_COMPILE_STDCXX(11, noext, mandatory) | ||
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 | 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 |
29 | index 4135a51a980..be92b792d3c 100644 | 29 | index bbfdba68093..d7d5dcf0e92 100644 |
30 | --- a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc | 30 | --- a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc |
31 | +++ b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc | 31 | +++ b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc |
32 | @@ -29,10 +29,11 @@ | 32 | @@ -30,6 +30,8 @@ |
33 | #ifndef _GNU_SOURCE | ||
34 | #define _GNU_SOURCE // needed for pread() | 33 | #define _GNU_SOURCE // needed for pread() |
35 | #endif | 34 | #endif |
36 | - | 35 | |
37 | +#include <config.h> | 36 | +#include <config.h> |
38 | #include <sys/types.h> | ||
39 | #include <sys/stat.h> | ||
40 | #include <sys/mman.h> | ||
41 | +#include <sys/reg.h> | 37 | +#include <sys/reg.h> |
42 | #include <unistd.h> | ||
43 | #include <fcntl.h> | 38 | #include <fcntl.h> |
39 | #include <limits.h> | ||
44 | #include <string.h> | 40 | #include <string.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 | 41 | 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 |
46 | index d03c7a88d38..28b55ab6300 100644 | 42 | index 6e153745dba..5cd2c6fcb23 100644 |
47 | --- a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 43 | --- a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h |
48 | +++ b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 44 | +++ b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h |
49 | @@ -33,6 +33,7 @@ | 45 | @@ -33,6 +33,7 @@ |
@@ -52,5 +48,5 @@ index d03c7a88d38..28b55ab6300 100644 | |||
52 | 48 | ||
53 | +#include <sys/reg.h> | 49 | +#include <sys/reg.h> |
54 | #include <elf.h> | 50 | #include <elf.h> |
51 | #include <limits.h> | ||
55 | #include <link.h> | 52 | #include <link.h> |
56 | #include <stddef.h> | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch deleted file mode 100644 index 96eac41d..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | From a07b5244ac103dd49c3deab81b6bed7589f5384e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 | ||
4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols | ||
5 | for musl | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | chromium/base/allocator/allocator_shim.cc | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc | ||
13 | index ef42d5ad67f..626e4c996a5 100644 | ||
14 | --- a/chromium/base/allocator/allocator_shim.cc | ||
15 | +++ b/chromium/base/allocator/allocator_shim.cc | ||
16 | @@ -352,7 +352,7 @@ ALWAYS_INLINE void ShimAlignedFree(void* address, void* context) { | ||
17 | // In the case of tcmalloc we also want to plumb into the glibc hooks | ||
18 | // to avoid that allocations made in glibc itself (e.g., strdup()) get | ||
19 | // accidentally performed on the glibc heap instead of the tcmalloc one. | ||
20 | -#if BUILDFLAG(USE_TCMALLOC) | ||
21 | +#if BUILDFLAG(USE_TCMALLOC) && defined(__GLIBC__) | ||
22 | #include "base/allocator/allocator_shim_override_glibc_weak_symbols.h" | ||
23 | #endif | ||
24 | |||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch index 1e615637..f6dd35a4 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-pread-pwrite.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-pread-pwrite.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1506681955d4f7a70372cb27bf47dddd1ca00954 Mon Sep 17 00:00:00 2001 | 1 | From dc3766d6b9c173d53027e6fddb8432afcced7398 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: Sun, 23 Dec 2018 16:58:04 -0800 | 3 | Date: Sun, 23 Dec 2018 16:58:04 -0800 |
4 | Subject: [PATCH] chromium: musl: pread pwrite | 4 | Subject: [PATCH] chromium: musl: pread pwrite |
@@ -10,17 +10,18 @@ libc either | |||
10 | Upstream-Status: Submitted [https://codereview.chromium.org/1743093002/] | 10 | Upstream-Status: Submitted [https://codereview.chromium.org/1743093002/] |
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | --- | 12 | --- |
13 | chromium/third_party/lss/linux_syscall_support.h | 5 +++++ | 13 | chromium/third_party/lss/linux_syscall_support.h | 6 ++++++ |
14 | 1 file changed, 5 insertions(+) | 14 | 1 file changed, 6 insertions(+) |
15 | 15 | ||
16 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | 16 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h |
17 | index fd8efdffea6..22a8863031c 100644 | 17 | index e4ac22644c0..f56203ccce4 100644 |
18 | --- a/chromium/third_party/lss/linux_syscall_support.h | 18 | --- a/chromium/third_party/lss/linux_syscall_support.h |
19 | +++ b/chromium/third_party/lss/linux_syscall_support.h | 19 | +++ b/chromium/third_party/lss/linux_syscall_support.h |
20 | @@ -1244,6 +1244,11 @@ struct kernel_statfs { | 20 | @@ -1258,6 +1258,12 @@ struct kernel_statfs { |
21 | #ifndef __NR_fallocate | 21 | #ifndef __NR_getrandom |
22 | #define __NR_fallocate 285 | 22 | #define __NR_getrandom 318 |
23 | #endif | 23 | #endif |
24 | + | ||
24 | +#undef __NR_pread | 25 | +#undef __NR_pread |
25 | +#define __NR_pread __NR_pread64 | 26 | +#define __NR_pread __NR_pread64 |
26 | +#undef __NR_pwrite | 27 | +#undef __NR_pwrite |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch index 97035dc5..3c1062fd 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2e220677883ce371119b9b07b2a90ff6bde1b6d3 Mon Sep 17 00:00:00 2001 | 1 | From e6953baf7bb353a8b0d901f75aff7d45b74798b2 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: Sun, 10 May 2020 08:16:01 -0700 | 3 | Date: Sun, 10 May 2020 08:16:01 -0700 |
4 | Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner | 4 | Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner |
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
25 | 1 file changed, 6 insertions(+), 2 deletions(-) | 25 | 1 file changed, 6 insertions(+), 2 deletions(-) |
26 | 26 | ||
27 | diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc | 27 | diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc |
28 | index 7df6892d67e..030ff8896e4 100644 | 28 | index 71265568be5..42e0d298045 100644 |
29 | --- a/chromium/net/socket/udp_socket_posix.cc | 29 | --- a/chromium/net/socket/udp_socket_posix.cc |
30 | +++ b/chromium/net/socket/udp_socket_posix.cc | 30 | +++ b/chromium/net/socket/udp_socket_posix.cc |
31 | @@ -1199,8 +1199,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( | 31 | @@ -1151,8 +1151,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( |
32 | for (auto& buffer : buffers) | 32 | for (auto& buffer : buffers) |
33 | msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); | 33 | msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); |
34 | msgvec->reserve(buffers.size()); | 34 | msgvec->reserve(buffers.size()); |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch deleted file mode 100644 index 786e65d8..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | From 01c128d575571f525a586fa769debf62826db888 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 25 Sep 2018 12:35:07 -0700 | ||
4 | Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on | ||
5 | linux | ||
6 | |||
7 | glibc defines both. musl libc only the former. | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | .../src/client/linux/dump_writer_common/ucontext_reader.cc | 4 ++-- | ||
12 | .../src/client/linux/dump_writer_common/ucontext_reader.h | 2 +- | ||
13 | .../src/client/linux/minidump_writer/minidump_writer.h | 2 +- | ||
14 | 3 files changed, 4 insertions(+), 4 deletions(-) | ||
15 | |||
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 | ||
17 | index 6ee6cc1e4cd..a8f9ccc72ac 100644 | ||
18 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc | ||
19 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc | ||
20 | @@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { | ||
21 | } | ||
22 | |||
23 | void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, | ||
24 | - const struct _libc_fpstate* fp) { | ||
25 | + const struct _fpstate* fp) { | ||
26 | const greg_t* regs = uc->uc_mcontext.gregs; | ||
27 | |||
28 | out->context_flags = MD_CONTEXT_X86_FULL | | ||
29 | @@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { | ||
30 | } | ||
31 | |||
32 | void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, | ||
33 | - const struct _libc_fpstate* fpregs) { | ||
34 | + const struct _fpstate* fpregs) { | ||
35 | const greg_t* regs = uc->uc_mcontext.gregs; | ||
36 | |||
37 | out->context_flags = MD_CONTEXT_AMD64_FULL; | ||
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 | ||
39 | index f830618f240..f3dde1f4dff 100644 | ||
40 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h | ||
41 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h | ||
42 | @@ -50,7 +50,7 @@ struct UContextReader { | ||
43 | // info: the collection of register structures. | ||
44 | #if defined(__i386__) || defined(__x86_64) | ||
45 | static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, | ||
46 | - const struct _libc_fpstate* fp); | ||
47 | + const struct _fpstate* fp); | ||
48 | #elif defined(__aarch64__) | ||
49 | static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, | ||
50 | const struct fpsimd_context* fpregs); | ||
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 | ||
52 | index d1dc331215a..d1cc5624cd4 100644 | ||
53 | --- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h | ||
54 | +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h | ||
55 | @@ -48,7 +48,7 @@ class ExceptionHandler; | ||
56 | #if defined(__aarch64__) | ||
57 | typedef struct fpsimd_context fpstate_t; | ||
58 | #elif !defined(__ARM_EABI__) && !defined(__mips__) | ||
59 | -typedef struct _libc_fpstate fpstate_t; | ||
60 | +typedef struct _fpstate fpstate_t; | ||
61 | #endif | ||
62 | |||
63 | // These entries store a list of memory regions that the client wants included | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 357a519a..963677ca 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -144,62 +144,59 @@ RDEPENDS_${PN}-examples += " \ | |||
144 | qtdeclarative-qmlplugins \ | 144 | qtdeclarative-qmlplugins \ |
145 | " | 145 | " |
146 | 146 | ||
147 | QT_MODULE_BRANCH_CHROMIUM = "83-based" | 147 | QT_MODULE_BRANCH_CHROMIUM = "87-based" |
148 | |||
149 | QT_MODULE_BRANCH = "5.15" | ||
150 | PV = "5.15.3+git${SRCPV}" | ||
148 | 151 | ||
149 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc | 152 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc |
150 | # 5.15-glibc.meta-qt5.9 | 153 | # 5.15-glibc.meta-qt5.10 |
151 | SRC_URI += " \ | 154 | SRC_URI += " \ |
152 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 155 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
153 | file://0001-Force-host-toolchain-configuration.patch \ | 156 | file://0001-Force-host-toolchain-configuration.patch \ |
154 | " | 157 | " |
155 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 | 158 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 |
156 | # 5.15.meta-qt5.9 | 159 | # 5.15.meta-qt5.10 |
157 | SRC_URI_append_libc-musl = "\ | 160 | SRC_URI_append_libc-musl = "\ |
158 | file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ | 161 | file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ |
159 | file://0003-musl-link-against-libexecinfo.patch \ | 162 | file://0003-musl-link-against-libexecinfo.patch \ |
160 | file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \ | 163 | file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \ |
161 | " | 164 | " |
162 | 165 | ||
163 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/83-based-glibc | 166 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc |
164 | # 83-based-glibc.meta-qt5.1 | 167 | # 87-based-glibc.meta-qt5.1 |
165 | SRC_URI += " \ | 168 | SRC_URI += " \ |
166 | file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ | 169 | file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ |
167 | file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ | 170 | file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ |
168 | file://chromium/0003-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ | 171 | file://chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ |
169 | file://chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ | 172 | file://chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch;patchdir=src/3rdparty \ |
170 | file://chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch;patchdir=src/3rdparty \ | 173 | file://chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \ |
171 | file://chromium/0006-chromium-aarch64-skia-build-fix.patch;patchdir=src/3rdparty \ | 174 | file://chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \ |
172 | file://chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \ | 175 | file://chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch;patchdir=src/3rdparty \ |
173 | file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \ | 176 | file://chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ |
174 | file://chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch;patchdir=src/3rdparty \ | 177 | file://chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ |
175 | file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ | 178 | file://chromium/0010-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ |
176 | file://chromium/0011-chromium-Include-cstddef-and-cstdint.patch;patchdir=src/3rdparty \ | ||
177 | file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ | ||
178 | file://chromium/0013-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ | ||
179 | file://chromium/0014-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch;patchdir=src/3rdparty \ | ||
180 | file://chromium/0015-chromium-gcc11-fixes.patch;patchdir=src/3rdparty \ | 179 | file://chromium/0015-chromium-gcc11-fixes.patch;patchdir=src/3rdparty \ |
181 | " | 180 | " |
182 | 181 | ||
183 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/83-based | 182 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based |
184 | # 83-based.meta-qt5.1 | 183 | # 87-based.meta-qt5.1 |
185 | SRC_URI_append_libc-musl = "\ | 184 | SRC_URI_append_libc-musl = "\ |
186 | file://chromium/0015-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ | 185 | file://chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ |
187 | file://chromium/0016-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ | 186 | file://chromium/0012-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ |
188 | file://chromium/0017-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ | 187 | file://chromium/0013-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ |
189 | file://chromium/0018-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ | 188 | file://chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ |
190 | file://chromium/0019-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ | 189 | file://chromium/0015-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ |
191 | file://chromium/0020-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ | 190 | file://chromium/0016-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ |
192 | file://chromium/0021-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ | 191 | file://chromium/0017-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ |
193 | file://chromium/0022-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ | 192 | file://chromium/0018-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ |
194 | file://chromium/0023-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ | 193 | file://chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ |
195 | file://chromium/0024-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch;patchdir=src/3rdparty \ | 194 | file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
196 | file://chromium/0025-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ | 195 | file://chromium/0021-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ |
197 | file://chromium/0026-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | ||
198 | file://chromium/0027-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ | ||
199 | " | 196 | " |
200 | 197 | ||
201 | SRCREV_qtwebengine = "5537ff4437ea7a5f9ea140071343f88bf48deddc" | 198 | SRCREV_qtwebengine = "f121523512ab70db7d9b1e639841c9ebc3eae9a1" |
202 | SRCREV_chromium = "f5a93d251cca15cb24a3acacd2fc0f645513c56d" | 199 | SRCREV_chromium = "9406a89a9dfe24d96089524d9da6da18e0457330" |
203 | SRCREV = "${SRCREV_qtwebengine}" | 200 | SRCREV = "${SRCREV_qtwebengine}" |
204 | 201 | ||
205 | SRCREV_FORMAT = "qtwebengine_chromium" | 202 | SRCREV_FORMAT = "qtwebengine_chromium" |