diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2020-11-25 15:38:29 +0200 |
---|---|---|
committer | Jani Suonpera <jani.suonpera@qt.io> | 2020-12-04 09:43:52 +0200 |
commit | 19d99b10df41b7875b3c788bc7a9d1a88734e644 (patch) | |
tree | dc987a79b9ad1810bedfa8221533b550cf1662cc /recipes-qt/qt5/qtwebengine/chromium | |
parent | 545be38961a2e287c64f2ae607569e88da4bfa8b (diff) | |
parent | 7a9f639fbd632dbe23af95c7b8123a0b907c6179 (diff) | |
download | meta-qt5-19d99b10df41b7875b3c788bc7a9d1a88734e644.tar.gz |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
Task-number: QTBUG-88755
Change-Id: I7adf9d6bb5fb8a2b0893d1c4b142db73996f20b9
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch | 88 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch | 139 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-include-fcntl.h-for-loff_t.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch) | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch (renamed from recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch) | 2 |
15 files changed, 241 insertions, 14 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch new file mode 100644 index 00000000..8a6660ff --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch | |||
@@ -0,0 +1,88 @@ | |||
1 | From 344e8a3945a29239dd2f27ea4969e3d64d5d8911 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrej Valek <andrej.valek@siemens.com> | ||
3 | Date: Fri, 17 Apr 2020 09:43:32 +0200 | ||
4 | Subject: [PATCH] chromium: icu: use system library only targets | ||
5 | |||
6 | - use bundled one for native/v8 internal builds | ||
7 | |||
8 | Complete system ICU library using requires ICU dev package | ||
9 | be installed on host. Enabling dependency on native package | ||
10 | is not enough due to V8 hosttools toolchain. V8 toolchain | ||
11 | is not using native sysroot, only a host packages. | ||
12 | On the other hand webenegine does not produce external | ||
13 | native artifacts. So external system ICU linking is not | ||
14 | needed. | ||
15 | |||
16 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | ||
17 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
18 | --- | ||
19 | chromium/third_party/icu/BUILD.gn | 18 ++++++++++++++---- | ||
20 | 1 file changed, 14 insertions(+), 4 deletions(-) | ||
21 | |||
22 | diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn | ||
23 | index 73673fa20ac..a656692c7bf 100644 | ||
24 | --- a/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") | ||
27 | import("//build/config/linux/pkg_config.gni") | ||
28 | import("//build/shim_headers.gni") | ||
29 | import("//third_party/icu/config.gni") | ||
30 | +import("//v8/gni/snapshot_toolchain.gni") | ||
31 | |||
32 | declare_args() { | ||
33 | use_system_icu = false | ||
34 | + | ||
35 | + # Use only target icu library, when system using is enabled | ||
36 | + use_system_icu_target_only = false | ||
37 | } | ||
38 | |||
39 | if (is_android) { | ||
40 | @@ -23,6 +27,12 @@ if (is_mac) { | ||
41 | assert(!icu_disable_thin_archive || !is_component_build, | ||
42 | "icu_disable_thin_archive only works in static library builds") | ||
43 | |||
44 | +if (use_system_icu) { | ||
45 | + # Use system library only for target, otherwise use bundled | ||
46 | + if ((current_toolchain != host_toolchain) && (current_toolchain != v8_snapshot_toolchain)) { | ||
47 | + use_system_icu_target_only = true | ||
48 | + } | ||
49 | +} | ||
50 | # Meta target that includes both icuuc and icui18n. Most targets want both. | ||
51 | # You can depend on the individually if you need to. | ||
52 | group("icu") { | ||
53 | @@ -1222,7 +1232,7 @@ config("system_icu_config") { | ||
54 | } | ||
55 | } | ||
56 | |||
57 | -if (use_system_icu) { | ||
58 | +if (use_system_icu_target_only) { | ||
59 | pkg_config("system_icui18n") { | ||
60 | packages = [ "icu-i18n" ] | ||
61 | } | ||
62 | @@ -1435,7 +1445,7 @@ shim_headers("icuuc_shim") { | ||
63 | } | ||
64 | |||
65 | config("icu_config") { | ||
66 | - if (use_system_icu) { | ||
67 | + if (use_system_icu_target_only) { | ||
68 | configs = [ ":system_icu_config"] | ||
69 | } else { | ||
70 | configs = [ ":bundled_icu_config"] | ||
71 | @@ -1443,7 +1453,7 @@ config("icu_config") { | ||
72 | } | ||
73 | |||
74 | group("icuuc") { | ||
75 | - if (use_system_icu) { | ||
76 | + if (use_system_icu_target_only) { | ||
77 | deps = [ ":icuuc_shim" ] | ||
78 | public_configs = [ | ||
79 | ":system_icu_config", | ||
80 | @@ -1455,7 +1465,7 @@ group("icuuc") { | ||
81 | } | ||
82 | |||
83 | group("icui18n") { | ||
84 | - if (use_system_icu) { | ||
85 | + if (use_system_icu_target_only) { | ||
86 | deps = [ ":icui18n_shim" ] | ||
87 | public_configs = [ | ||
88 | ":system_icu_config", | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch new file mode 100644 index 00000000..1b43fcbb --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-Fix-sandbox-Aw-snap-for-syscalls-403-and-40.patch | |||
@@ -0,0 +1,139 @@ | |||
1 | From 5aa69767be0fbbc7a3a5075c6c94366a535c99a8 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 768025ce192..87025d91785 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 76193b62c9f..7731c697002 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/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index f654424e..01c46c05 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 69570c2f3c88c31cca71f87996ed4ab7ab2bc66c Mon Sep 17 00:00:00 2001 | 1 | From 0dbcdee3ccc23d3a6c9e66b5abc3fb3d1ccbc297 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/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index 19fbca5d..03226154 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5b501d5335008e32bd5a62e48a675c8fc61194a9 Mon Sep 17 00:00:00 2001 | 1 | From bbb23eb876e1f4500e7c8fd716a73351ad660725 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 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-include-fcntl.h-for-loff_t.patch index 91bd4057..869ac113 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-include-fcntl.h-for-loff_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1180600c21260188fd2d3def0f536b4243175fc0 Mon Sep 17 00:00:00 2001 | 1 | From d1d6bd4260eb847c1493a8ce4a974bb8d8ee0218 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/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index c6c3571c..638c7312 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f2ff87552f0f2f576bda05f7ccf5855c005ed7b0 Mon Sep 17 00:00:00 2001 | 1 | From 7cf2404330f7888f3cc8a25becfe944cc2fc421e 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/0017-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch index 9cc6744d..55939ddd 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-linux-glibc-make-the-distinction.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From efa10960aa9ec6b573a9c34cabab90ad2c31c5a3 Mon Sep 17 00:00:00 2001 | 1 | From 350b57a5cad7c655ccb68a8b4b91e7d32021a1d7 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 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch index 15e38eb0..37276844 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c799e56ed6c073782c9215aa7d9302003b61a395 Mon Sep 17 00:00:00 2001 | 1 | From 68decc5d87b4eb013f1455fc4f81f67f926fa3b2 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 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index 033780d8..aea690d9 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a49d5e2c256d18853c0e00e698759f763eaddf04 Mon Sep 17 00:00:00 2001 | 1 | From fea443adcea6e081cfee94a19c75e7b0516e1bce 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 eaa5336c339..18b40d7d005 100644 | 16 | index 2e0f06b0c1e..aaafef77d79 100644 |
17 | --- a/chromium/net/dns/dns_config_service_posix.cc | 17 | --- a/chromium/net/dns/dns_config_service_posix.cc |
18 | +++ b/chromium/net/dns/dns_config_service_posix.cc | 18 | +++ b/chromium/net/dns/dns_config_service_posix.cc |
19 | @@ -29,6 +29,10 @@ | 19 | @@ -29,6 +29,10 @@ |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch index 97fce663..cd1059e3 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-Do-not-define-__sbrk-on-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6e44772c5aa78c39d52910aaf4cc2db3bcf0ba7e Mon Sep 17 00:00:00 2001 | 1 | From 64e79d346a2038b976f5bafe2b0b2032b1628229 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/0022-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch index 53ecedd4..50d17413 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 31b50a484935d1a610da74fa5a06489f8309fd6d Mon Sep 17 00:00:00 2001 | 1 | From cecdf34d89110115948cfde44c04a43c9925b24a 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 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch index 750d0d5e..07a1e3d6 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d687194f970d5ed19d21916eba4f597625d20dfc Mon Sep 17 00:00:00 2001 | 1 | From ae4187267b4d0d2ff13a6593b69ca06cee321eea 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] chromium: musl: Use _fpstate instead of _libc_fpstate on | 4 | Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch index 4ed957ee..63f93873 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0024-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0027-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 976ee610f4bb87d1b5f57756c04f13b06f3ebf26 Mon Sep 17 00:00:00 2001 | 1 | From f12f5d2dc91548ca77b296a0be3705aacc9fca33 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 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch index 61a1137c..edeb3272 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-pread-pwrite.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4cb584454ab1537c1e1e5ae8453f57a98aa9a928 Mon Sep 17 00:00:00 2001 | 1 | From 3269ffba733ed7eeb7c2c36912dd19ca1ef35f8b 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 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch index 0d73e07c..72adf1cb 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From acc3b1b674a2568dd19418ec5b3c58330a29521a Mon Sep 17 00:00:00 2001 | 1 | From 0b04cbd5b93908bad4dfc6d829048fe90a09b868 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 |