diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2020-12-10 09:03:39 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-01-22 12:00:07 +0100 |
commit | 280487f20bca829527a597d6263b0344a01917ac (patch) | |
tree | 921fe264e59fe40394e4b38d76020ccea595a0aa /recipes-qt/qt5/qtwebengine/chromium | |
parent | cad441b37681ec1c23ccf20e7cbeffdc9d7ba808 (diff) | |
download | meta-qt5-280487f20bca829527a597d6263b0344a01917ac.tar.gz |
Update to Qt 5.15.2
Signed-off-by: Jani Suonpera <jani.suonpera@qt.io>
Change-Id: I5992e74cf524f9378dab64503345111b1cc159f2
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium')
18 files changed, 82 insertions, 176 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch index 3abe38b6..8b5d41ba 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 105421c09f009b77019e60db2de22d5966a73602 Mon Sep 17 00:00:00 2001 | 1 | From 5af62581e5116b57efbe4bb7cc467efeb0aab941 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/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch index 497dd3b8..c93ba991 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 99453086770508f96eeb95635dda3f9831c485bf Mon Sep 17 00:00:00 2001 | 1 | From 8dd7987fc70fd8dab4a9f7ee32334c8d28ed34e4 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: stack pointer clobber | 4 | Subject: [PATCH] chromium: stack pointer clobber |
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
17 | 1 file changed, 3 insertions(+), 3 deletions(-) | 17 | 1 file changed, 3 insertions(+), 3 deletions(-) |
18 | 18 | ||
19 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | 19 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h |
20 | index 8e0cc385792..d2bd9df4d40 100644 | 20 | index d2baee9d243..fd8efdffea6 100644 |
21 | --- a/chromium/third_party/lss/linux_syscall_support.h | 21 | --- a/chromium/third_party/lss/linux_syscall_support.h |
22 | +++ b/chromium/third_party/lss/linux_syscall_support.h | 22 | +++ b/chromium/third_party/lss/linux_syscall_support.h |
23 | @@ -2012,7 +2012,7 @@ struct kernel_statfs { | 23 | @@ -2017,7 +2017,7 @@ struct kernel_statfs { |
24 | : "i" (__NR_##name), "ri" ((long)(arg1)), \ | 24 | : "i" (__NR_##name), "ri" ((long)(arg1)), \ |
25 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ | 25 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ |
26 | "S" ((long)(arg4)), "D" ((long)(arg5)) \ | 26 | "S" ((long)(arg4)), "D" ((long)(arg5)) \ |
@@ -29,7 +29,7 @@ index 8e0cc385792..d2bd9df4d40 100644 | |||
29 | LSS_RETURN(type,__res); \ | 29 | LSS_RETURN(type,__res); \ |
30 | } | 30 | } |
31 | #undef _syscall6 | 31 | #undef _syscall6 |
32 | @@ -2034,7 +2034,7 @@ struct kernel_statfs { | 32 | @@ -2039,7 +2039,7 @@ struct kernel_statfs { |
33 | : "i" (__NR_##name), "0" ((long)(&__s)), \ | 33 | : "i" (__NR_##name), "0" ((long)(&__s)), \ |
34 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ | 34 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ |
35 | "S" ((long)(arg4)), "D" ((long)(arg5)) \ | 35 | "S" ((long)(arg4)), "D" ((long)(arg5)) \ |
@@ -38,7 +38,7 @@ index 8e0cc385792..d2bd9df4d40 100644 | |||
38 | LSS_RETURN(type,__res); \ | 38 | LSS_RETURN(type,__res); \ |
39 | } | 39 | } |
40 | LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, | 40 | LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, |
41 | @@ -2120,7 +2120,7 @@ struct kernel_statfs { | 41 | @@ -2125,7 +2125,7 @@ struct kernel_statfs { |
42 | : "0"(-EINVAL), "i"(__NR_clone), | 42 | : "0"(-EINVAL), "i"(__NR_clone), |
43 | "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), | 43 | "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), |
44 | "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) | 44 | "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch index 253cdaf6..a3f292c3 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d3889654a28d901d345cae8fc8ec23988a085dab Mon Sep 17 00:00:00 2001 | 1 | From be18ba6e0b879fbd542f4e0d1a249f2ab5abb27c 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 fdfcf65f5ab..13d71d04030 100644 | 13 | index ca81bd8ce0f..d3c588b21e3 100644 |
14 | --- a/chromium/build/config/compiler/BUILD.gn | 14 | --- a/chromium/build/config/compiler/BUILD.gn |
15 | +++ b/chromium/build/config/compiler/BUILD.gn | 15 | +++ b/chromium/build/config/compiler/BUILD.gn |
16 | @@ -779,8 +779,6 @@ config("compiler_cpu_abi") { | 16 | @@ -776,8 +776,6 @@ config("compiler_cpu_abi") { |
17 | } | 17 | } |
18 | } else if (current_cpu == "arm") { | 18 | } else if (current_cpu == "arm") { |
19 | if (is_clang && !is_android && !is_nacl) { | 19 | if (is_clang && !is_android && !is_nacl) { |
@@ -22,7 +22,7 @@ index fdfcf65f5ab..13d71d04030 100644 | |||
22 | } | 22 | } |
23 | if (!is_nacl) { | 23 | if (!is_nacl) { |
24 | cflags += [ | 24 | cflags += [ |
25 | @@ -793,8 +791,6 @@ config("compiler_cpu_abi") { | 25 | @@ -790,8 +788,6 @@ config("compiler_cpu_abi") { |
26 | } | 26 | } |
27 | } else if (current_cpu == "arm64") { | 27 | } else if (current_cpu == "arm64") { |
28 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { | 28 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { |
@@ -31,7 +31,7 @@ index fdfcf65f5ab..13d71d04030 100644 | |||
31 | } | 31 | } |
32 | } else if (current_cpu == "mipsel" && !is_nacl) { | 32 | } else if (current_cpu == "mipsel" && !is_nacl) { |
33 | ldflags += [ "-Wl,--hash-style=sysv" ] | 33 | ldflags += [ "-Wl,--hash-style=sysv" ] |
34 | @@ -803,9 +799,6 @@ config("compiler_cpu_abi") { | 34 | @@ -800,9 +796,6 @@ config("compiler_cpu_abi") { |
35 | if (is_android) { | 35 | if (is_android) { |
36 | cflags += [ "--target=mipsel-linux-android" ] | 36 | cflags += [ "--target=mipsel-linux-android" ] |
37 | ldflags += [ "--target=mipsel-linux-android" ] | 37 | ldflags += [ "--target=mipsel-linux-android" ] |
@@ -41,7 +41,7 @@ index fdfcf65f5ab..13d71d04030 100644 | |||
41 | } | 41 | } |
42 | } else { | 42 | } else { |
43 | cflags += [ "-EL" ] | 43 | cflags += [ "-EL" ] |
44 | @@ -884,10 +877,7 @@ config("compiler_cpu_abi") { | 44 | @@ -881,10 +874,7 @@ config("compiler_cpu_abi") { |
45 | } else if (current_cpu == "mips" && !is_nacl) { | 45 | } else if (current_cpu == "mips" && !is_nacl) { |
46 | ldflags += [ "-Wl,--hash-style=sysv" ] | 46 | ldflags += [ "-Wl,--hash-style=sysv" ] |
47 | if (custom_toolchain == "") { | 47 | if (custom_toolchain == "") { |
@@ -53,7 +53,7 @@ index fdfcf65f5ab..13d71d04030 100644 | |||
53 | cflags += [ "-EB" ] | 53 | cflags += [ "-EB" ] |
54 | ldflags += [ "-EB" ] | 54 | ldflags += [ "-EB" ] |
55 | } | 55 | } |
56 | @@ -934,9 +924,6 @@ config("compiler_cpu_abi") { | 56 | @@ -931,9 +921,6 @@ config("compiler_cpu_abi") { |
57 | if (is_android) { | 57 | if (is_android) { |
58 | cflags += [ "--target=mips64el-linux-android" ] | 58 | cflags += [ "--target=mips64el-linux-android" ] |
59 | ldflags += [ "--target=mips64el-linux-android" ] | 59 | ldflags += [ "--target=mips64el-linux-android" ] |
@@ -63,7 +63,7 @@ index fdfcf65f5ab..13d71d04030 100644 | |||
63 | } | 63 | } |
64 | } else { | 64 | } else { |
65 | cflags += [ | 65 | cflags += [ |
66 | @@ -993,10 +980,7 @@ config("compiler_cpu_abi") { | 66 | @@ -990,10 +977,7 @@ config("compiler_cpu_abi") { |
67 | } else if (current_cpu == "mips64") { | 67 | } else if (current_cpu == "mips64") { |
68 | ldflags += [ "-Wl,--hash-style=sysv" ] | 68 | ldflags += [ "-Wl,--hash-style=sysv" ] |
69 | if (custom_toolchain == "") { | 69 | if (custom_toolchain == "") { |
@@ -75,7 +75,7 @@ index fdfcf65f5ab..13d71d04030 100644 | |||
75 | cflags += [ | 75 | cflags += [ |
76 | "-EB", | 76 | "-EB", |
77 | "-mabi=64", | 77 | "-mabi=64", |
78 | @@ -1165,13 +1149,6 @@ config("compiler_deterministic") { | 78 | @@ -1157,13 +1141,6 @@ config("compiler_deterministic") { |
79 | } | 79 | } |
80 | } | 80 | } |
81 | } | 81 | } |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch index 5b150b5f..c3de3cc5 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7a778d56065b041e55c60e500d5e60c71b7e345f Mon Sep 17 00:00:00 2001 | 1 | From 7eeed60fceeca490c5252e256baff08100e13259 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 4422fecc0c8..1b398ad981a 100644 | 18 | index 00d1e7c6ca3..f2c36d72dd2 100644 |
19 | --- a/chromium/third_party/zlib/BUILD.gn | 19 | --- a/chromium/third_party/zlib/BUILD.gn |
20 | +++ b/chromium/third_party/zlib/BUILD.gn | 20 | +++ b/chromium/third_party/zlib/BUILD.gn |
21 | @@ -80,8 +80,11 @@ if (use_arm_neon_optimizations) { | 21 | @@ -86,8 +86,11 @@ if (use_arm_neon_optimizations) { |
22 | # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: | 22 | # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: |
23 | # "All implementations of the ARMv8.1 architecture are required to | 23 | # "All implementations of the ARMv8.1 architecture are required to |
24 | # implement the CRC32* instructions. These are optional in ARMv8.0." | 24 | # implement the CRC32* instructions. These are optional in ARMv8.0." |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch index 00293e5f..5f3f4528 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 7cabdbd5f444dc10f4c87ed554792e97a527075b Mon Sep 17 00:00:00 2001 | 1 | From 0faac107930255380ea07aa75267153022de2248 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 |
5 | |||
5 | march/mtune/float-abi OE config machinary has computed these values already | 6 | march/mtune/float-abi OE config machinary has computed these values already |
6 | and fed it via compiler cmdline to chromium build | 7 | and fed it via compiler cmdline to chromium build |
7 | 8 | ||
@@ -12,15 +13,17 @@ Upstream-Status: Inappropriate [OE-Specific] | |||
12 | 13 | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com> | 15 | Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com> |
16 | |||
17 | %% original patch: 0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | ||
15 | --- | 18 | --- |
16 | chromium/build/config/compiler/BUILD.gn | 9 --------- | 19 | chromium/build/config/compiler/BUILD.gn | 9 --------- |
17 | 1 file changed, 9 deletions(-) | 20 | 1 file changed, 9 deletions(-) |
18 | 21 | ||
19 | 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 |
20 | index 13d71d04030..3ebcf1ddbc3 100644 | 23 | index d3c588b21e3..6d49fde33cc 100644 |
21 | --- a/chromium/build/config/compiler/BUILD.gn | 24 | --- a/chromium/build/config/compiler/BUILD.gn |
22 | +++ b/chromium/build/config/compiler/BUILD.gn | 25 | +++ b/chromium/build/config/compiler/BUILD.gn |
23 | @@ -780,15 +780,6 @@ config("compiler_cpu_abi") { | 26 | @@ -777,15 +777,6 @@ config("compiler_cpu_abi") { |
24 | } else if (current_cpu == "arm") { | 27 | } else if (current_cpu == "arm") { |
25 | if (is_clang && !is_android && !is_nacl) { | 28 | if (is_clang && !is_android && !is_nacl) { |
26 | } | 29 | } |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch index 798b5f05..f560e315 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e7e0646f07d1c0dcf6502cd1c074d50839f3d461 Mon Sep 17 00:00:00 2001 | 1 | From 69abe5acb926cef9ac771015ade3873fa9985f3b Mon Sep 17 00:00:00 2001 |
2 | From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | 2 | From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> |
3 | Date: Thu, 8 Mar 2018 15:39:55 +0100 | 3 | Date: Thu, 8 Mar 2018 15:39:55 +0100 |
4 | Subject: [PATCH] chromium: aarch64 skia build fix | 4 | Subject: [PATCH] chromium: aarch64 skia build fix |
@@ -28,7 +28,7 @@ Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | |||
28 | 1 file changed, 2 insertions(+), 15 deletions(-) | 28 | 1 file changed, 2 insertions(+), 15 deletions(-) |
29 | 29 | ||
30 | diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 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 0d610ccfe33..c1844b61168 100644 | 31 | index 831f5b3bb03..bb9377c3641 100644 |
32 | --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 32 | --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h |
33 | +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 33 | +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h |
34 | @@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) { | 34 | @@ -986,13 +986,7 @@ SI F approx_powf(F x, F y) { |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch index 307ce4d4..1c7a3b1e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-fix-build-after-y2038-changes-in-glibc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a5cdae084e84be8c847f4b0613b92e0462bbb038 Mon Sep 17 00:00:00 2001 | 1 | From 8a0cc2a6be8fb9f8c3f4976ad4b41b291e672a67 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,7 +15,7 @@ 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 ead4e57dc15..7ba975e660a 100644 | 18 | index 0cbcb8130c6..bc3dd3bddda 100644 |
19 | --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 19 | --- a/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc |
20 | +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 20 | +++ b/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc |
21 | @@ -71,6 +71,7 @@ typedef void* SockOptArg; | 21 | @@ -71,6 +71,7 @@ typedef void* SockOptArg; |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 03bdc05a..63a460cc 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c769d6be7210a2fbc866e36f87ad21bcc91e9c6e Mon Sep 17 00:00:00 2001 | 1 | From ddedffaeb9f04ac8530f87f5010e0008dc548b96 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 |
@@ -11,58 +11,37 @@ input.h [1] | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
13 | --- | 13 | --- |
14 | chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 4 ++-- | 14 | chromium/ui/events/ozone/evdev/event_converter_evdev.h | 5 +++++ |
15 | chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 6 +++--- | 15 | chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.cc | 3 +-- |
16 | chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | 5 +++++ | 16 | 2 files changed, 6 insertions(+), 2 deletions(-) |
17 | 3 files changed, 10 insertions(+), 5 deletions(-) | ||
18 | 17 | ||
19 | diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 18 | diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h |
20 | index 9f27d39e209..f565dd2ce5c 100644 | 19 | index 717410f2ebc..a4cd55ca20e 100644 |
21 | --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 20 | --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h |
22 | +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.cc | 21 | +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h |
23 | @@ -176,8 +176,8 @@ void EventConverterEvdev::SetPalmSuppressionCallback( | 22 | @@ -20,6 +20,11 @@ |
24 | base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent( | 23 | #include "ui/events/ozone/evdev/event_dispatch_callback.h" |
25 | const input_event& event) { | 24 | #include "ui/gfx/geometry/size.h" |
26 | base::TimeTicks timestamp = | 25 | |
27 | - ui::EventTimeStampFromSeconds(event.time.tv_sec) + | 26 | +#ifndef input_event_sec |
28 | - base::TimeDelta::FromMicroseconds(event.time.tv_usec); | 27 | +#define input_event_sec time.tv_sec |
29 | + ui::EventTimeStampFromSeconds(event.input_event_sec) + | 28 | +#define input_event_usec time.tv_usec |
30 | + base::TimeDelta::FromMicroseconds(event.input_event_usec); | 29 | +#endif |
31 | ValidateEventTimeClock(×tamp); | 30 | + |
32 | return timestamp; | 31 | struct input_event; |
33 | } | 32 | |
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 363c3183e05..4fccfd62f84 100644 | 35 | index 01e49b7bbfd..4fccfd62f84 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 | @@ -59,11 +59,11 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { | 38 | @@ -63,8 +63,7 @@ void TouchEventLogEvdev::DumpLog(const char* filename) { |
39 | for (int i = 0; i < kDebugBufferSize; ++i) { | ||
40 | struct TouchEvent* te = | ||
41 | &logged_events_[(debug_buffer_tail_ + i) % kDebugBufferSize]; | ||
42 | - if (te->ev.time.tv_sec == 0 && te->ev.time.tv_usec == 0) | ||
43 | + if (te->ev.input_event_sec == 0 && te->ev.input_event_usec == 0) | ||
44 | continue; | 39 | continue; |
45 | std::string event_string = base::StringPrintf( | 40 | std::string event_string = base::StringPrintf( |
46 | - "E: %ld.%06ld %04x %04x %d %d\n", te->ev.time.tv_sec, | 41 | "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, |
47 | - te->ev.time.tv_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); | 42 | - te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, |
48 | + "E: %ld.%06ld %04x %04x %d %d\n", te->ev.input_event_sec, | 43 | - te->slot); |
49 | + te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); | 44 | + te->ev.input_event_usec, te->ev.type, te->ev.code, te->ev.value, te->slot); |
50 | report_content += event_string; | 45 | report_content += event_string; |
51 | } | 46 | } |
52 | file.Write(0, report_content.c_str(), report_content.length()); | 47 | file.Write(0, report_content.c_str(), report_content.length()); |
53 | diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | ||
54 | index 0d5b83148f6..1f17608e94d 100644 | ||
55 | --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | ||
56 | +++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h | ||
57 | @@ -14,6 +14,11 @@ | ||
58 | |||
59 | #include "base/component_export.h" | ||
60 | |||
61 | +#ifndef input_event_sec | ||
62 | +#define input_event_sec time.tv_sec | ||
63 | +#define input_event_usec time.tv_usec | ||
64 | +#endif | ||
65 | + | ||
66 | namespace ui { | ||
67 | |||
68 | class EventDeviceInfo; | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch index 3659f586..41a8ce36 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 58783bf8f46657200643543f765f405a91699440 Mon Sep 17 00:00:00 2001 | 1 | From 022100d701dca71ecfe237e133712398bc1c59a7 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 |
@@ -22,10 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
22 | 1 file changed, 1 insertion(+) | 22 | 1 file changed, 1 insertion(+) |
23 | 23 | ||
24 | diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h | 24 | diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h |
25 | index b87fb2d0345..b3faffcfc79 100644 | 25 | index ec972949d89..2a76775cfb6 100644 |
26 | --- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h | 26 | --- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h |
27 | +++ b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h | 27 | +++ b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h |
28 | @@ -14,6 +14,7 @@ | 28 | @@ -15,6 +15,7 @@ |
29 | #include <map> | 29 | #include <map> |
30 | #include <set> | 30 | #include <set> |
31 | #include <vector> | 31 | #include <vector> |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch index 965ecd72..abe1e16d 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From faff740bb831e1a25c7acb1754df9bbd028330b9 Mon Sep 17 00:00:00 2001 | 1 | From 9d9db26e626e1c8d4d10eab1522daf0efc8cb11c 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 |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch index a6abd037..464f952b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 33005dfa49d65170fb006cd4ca4dbb8c6cf901e5 Mon Sep 17 00:00:00 2001 | 1 | From 1b8d57ba6595bbd743f6570d834f6a08600fb117 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, 15 Jan 2020 16:53:46 -0800 | 3 | Date: Wed, 15 Jan 2020 16:53:46 -0800 |
4 | Subject: [PATCH] chromium: Include <cstddef> and <cstdint> | 4 | Subject: [PATCH] chromium: Include <cstddef> and <cstdint> |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch index 169b4c9b..eaff07e0 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 910fe61d3ee439b26a6a33cc9f65e1f7a52f332d Mon Sep 17 00:00:00 2001 | 1 | From e60314a1257964bbebc0e7633d9799fd7c7ec35b 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 9107b302476..12d8171d238 100644 | 17 | index ab20142de9a..4ef4aa80cc0 100644 |
18 | --- a/chromium/v8/BUILD.gn | 18 | --- a/chromium/v8/BUILD.gn |
19 | +++ b/chromium/v8/BUILD.gn | 19 | +++ b/chromium/v8/BUILD.gn |
20 | @@ -3324,7 +3324,8 @@ v8_source_set("v8_base_without_compiler") { | 20 | @@ -3543,7 +3543,8 @@ v8_source_set("v8_base_without_compiler") { |
21 | if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || | 21 | if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || |
22 | v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || | 22 | v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || |
23 | v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || | 23 | v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch deleted file mode 100644 index 3272b727..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-Fix-bison-3.7.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From 3ccc10f378ca26c35104e39e08771c053ae5b19e Mon Sep 17 00:00:00 2001 | ||
2 | From: Allan Sandfeld Jensen <allan.jensen@qt.io> | ||
3 | Date: Fri, 14 Aug 2020 16:38:48 +0200 | ||
4 | Subject: [PATCH] chromium: Fix bison 3.7 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Do a replace run inspired by newer versions of the script. | ||
10 | |||
11 | Fixes: QTBUG-86018 | ||
12 | Change-Id: Ib1dc771e22a662aff0fae842d135ad58fad08bc1 | ||
13 | Reviewed-by: Michael Brüning <michael.bruning@qt.io> | ||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
15 | --- | ||
16 | .../renderer/build/scripts/rule_bison.py | 19 +++++++++++++++++++ | ||
17 | 1 file changed, 19 insertions(+) | ||
18 | |||
19 | diff --git a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py | ||
20 | index f75e25fd23f..7e0767e951a 100755 | ||
21 | --- a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py | ||
22 | +++ b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py | ||
23 | @@ -45,6 +45,19 @@ from utilities import abs | ||
24 | |||
25 | from blinkbuild.name_style_converter import NameStyleConverter | ||
26 | |||
27 | +def modify_file(path, prefix_lines, suffix_lines, replace_list=[]): | ||
28 | + prefix_lines = map(lambda s: s + '\n', prefix_lines) | ||
29 | + suffix_lines = map(lambda s: s + '\n', suffix_lines) | ||
30 | + with open(path, 'r') as f: | ||
31 | + old_lines = f.readlines() | ||
32 | + for i in range(len(old_lines)): | ||
33 | + for src, dest in replace_list: | ||
34 | + old_lines[i] = old_lines[i].replace(src, dest) | ||
35 | + new_lines = prefix_lines + old_lines + suffix_lines | ||
36 | + with open(path, 'w') as f: | ||
37 | + f.writelines(new_lines) | ||
38 | + | ||
39 | + | ||
40 | assert len(sys.argv) == 4 or len(sys.argv) == 5 | ||
41 | |||
42 | inputFile = abs(sys.argv[1]) | ||
43 | @@ -115,3 +128,9 @@ print >>outputHFile, '#define %s' % headerGuard | ||
44 | print >>outputHFile, outputHContents | ||
45 | print >>outputHFile, '#endif // %s' % headerGuard | ||
46 | outputHFile.close() | ||
47 | + | ||
48 | +common_replace_list = [(inputRoot + '.hh', | ||
49 | + inputRoot + '.h')] | ||
50 | +modify_file( | ||
51 | + outputCpp, [], [], | ||
52 | + replace_list=common_replace_list) | ||
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 index 52607983..8a6660ff 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8c9a4027426b0a2c56cc834da0dbad5b8378c2c6 Mon Sep 17 00:00:00 2001 | 1 | From 344e8a3945a29239dd2f27ea4969e3d64d5d8911 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,7 +20,7 @@ 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 023d6e13a2c..312f34d6186 100644 | 23 | index 73673fa20ac..a656692c7bf 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 | @@ -7,9 +7,13 @@ import("//build/config/host_byteorder.gni") |
@@ -37,9 +37,9 @@ index 023d6e13a2c..312f34d6186 100644 | |||
37 | } | 37 | } |
38 | 38 | ||
39 | if (is_android) { | 39 | if (is_android) { |
40 | @@ -20,6 +24,12 @@ if (is_mac) { | 40 | @@ -23,6 +27,12 @@ if (is_mac) { |
41 | import("//build/config/sanitizers/sanitizers.gni") | 41 | assert(!icu_disable_thin_archive || !is_component_build, |
42 | } | 42 | "icu_disable_thin_archive only works in static library builds") |
43 | 43 | ||
44 | +if (use_system_icu) { | 44 | +if (use_system_icu) { |
45 | + # Use system library only for target, otherwise use bundled | 45 | + # Use system library only for target, otherwise use bundled |
@@ -50,7 +50,7 @@ index 023d6e13a2c..312f34d6186 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 | @@ -1207,7 +1217,7 @@ config("system_icu_config") { | 53 | @@ -1222,7 +1232,7 @@ config("system_icu_config") { |
54 | } | 54 | } |
55 | } | 55 | } |
56 | 56 | ||
@@ -59,7 +59,7 @@ index 023d6e13a2c..312f34d6186 100644 | |||
59 | pkg_config("system_icui18n") { | 59 | pkg_config("system_icui18n") { |
60 | packages = [ "icu-i18n" ] | 60 | packages = [ "icu-i18n" ] |
61 | } | 61 | } |
62 | @@ -1420,7 +1430,7 @@ shim_headers("icuuc_shim") { | 62 | @@ -1435,7 +1445,7 @@ shim_headers("icuuc_shim") { |
63 | } | 63 | } |
64 | 64 | ||
65 | config("icu_config") { | 65 | config("icu_config") { |
@@ -68,7 +68,7 @@ index 023d6e13a2c..312f34d6186 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 | @@ -1428,7 +1438,7 @@ config("icu_config") { | 71 | @@ -1443,7 +1453,7 @@ config("icu_config") { |
72 | } | 72 | } |
73 | 73 | ||
74 | group("icuuc") { | 74 | group("icuuc") { |
@@ -77,7 +77,7 @@ index 023d6e13a2c..312f34d6186 100644 | |||
77 | deps = [ ":icuuc_shim" ] | 77 | deps = [ ":icuuc_shim" ] |
78 | public_configs = [ | 78 | public_configs = [ |
79 | ":system_icu_config", | 79 | ":system_icu_config", |
80 | @@ -1440,7 +1450,7 @@ group("icuuc") { | 80 | @@ -1455,7 +1465,7 @@ group("icuuc") { |
81 | } | 81 | } |
82 | 82 | ||
83 | group("icui18n") { | 83 | group("icui18n") { |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch deleted file mode 100644 index 2da3e09d..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | From 1902fc967d6f900a4e918e56f21bc856a0462e4c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 15:12:39 -0700 | ||
4 | Subject: [PATCH] chromium: musl: Use correct member name __si_fields from | ||
5 | LinuxSigInfo | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | chromium/sandbox/linux/seccomp-bpf/trap.cc | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc | ||
13 | index 003708d2c89..0fef3148f9d 100644 | ||
14 | --- a/chromium/sandbox/linux/seccomp-bpf/trap.cc | ||
15 | +++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc | ||
16 | @@ -168,7 +168,7 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { | ||
17 | // most versions of glibc don't include this information in siginfo_t. So, | ||
18 | // we need to explicitly copy it into a arch_sigsys structure. | ||
19 | struct arch_sigsys sigsys; | ||
20 | - memcpy(&sigsys, &info->_sifields, sizeof(sigsys)); | ||
21 | + memcpy(&sigsys, &info->__si_fields, sizeof(sigsys)); | ||
22 | |||
23 | #if defined(__mips__) | ||
24 | // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch index 04bf89e4..50d17413 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0025-chromium-musl-Adjust-default-pthread-stack-size.patch | |||
@@ -5,15 +5,15 @@ Subject: [PATCH] chromium: musl: Adjust default pthread stack size | |||
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | --- | 7 | --- |
8 | chromium/base/threading/platform_thread_linux.cc | 3 ++- | 8 | chromium/base/threading/platform_thread_linux.cc | 3 ++- |
9 | .../third_party/blink/renderer/platform/wtf/stack_util.cc | 4 ++-- | 9 | chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 2 +- |
10 | 2 files changed, 4 insertions(+), 3 deletions(-) | 10 | 2 files changed, 3 insertions(+), 2 deletions(-) |
11 | 11 | ||
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 74a01ad5af5..dab5773d73b 100644 |
14 | --- a/chromium/base/threading/platform_thread_linux.cc | 14 | --- a/chromium/base/threading/platform_thread_linux.cc |
15 | +++ b/chromium/base/threading/platform_thread_linux.cc | 15 | +++ b/chromium/base/threading/platform_thread_linux.cc |
16 | @@ -186,7 +186,8 @@ void TerminateOnThread() {} | 16 | @@ -377,7 +377,8 @@ void TerminateOnThread() {} |
17 | 17 | ||
18 | size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { | 18 | size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { |
19 | #if !defined(THREAD_SANITIZER) | 19 | #if !defined(THREAD_SANITIZER) |
@@ -24,15 +24,15 @@ index 095c49b8dc0..d1479b54d48 100644 | |||
24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the | 24 | // ThreadSanitizer bloats the stack heavily. Evidence has been that the |
25 | // default stack size isn't enough for some browser tests. | 25 | // default stack size isn't enough for some browser tests. |
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 b2421649ff3..a31b96e90e6 100644 | 27 | index ab1dff4167e..b0763b0bd9a 100644 |
28 | --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 28 | --- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc |
29 | +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc | 29 | +++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc |
30 | @@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() { | 30 | @@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() { |
31 | // FIXME: On Mac OSX and Linux, this method cannot estimate stack size | 31 | // FIXME: On Mac OSX and Linux, this method cannot estimate stack size |
32 | // correctly for the main thread. | 32 | // correctly for the main thread. |
33 | 33 | ||
34 | -#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ | 34 | -#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ |
35 | +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ | 35 | +#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ |
36 | defined(OS_FUCHSIA) | 36 | defined(OS_FUCHSIA) |
37 | // pthread_getattr_np() can fail if the thread is not invoked by | 37 | // pthread_getattr_np() can fail if the thread is not invoked by |
38 | // pthread_create() (e.g., the main thread of blink_unittests). | 38 | // pthread_create() (e.g., the main thread of blink_unittests). |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch index e6fa0887..edeb3272 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0028-chromium-musl-pread-pwrite.patch | |||
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 5 insertions(+) | 14 | 1 file changed, 5 insertions(+) |
15 | 15 | ||
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 d2bd9df4d40..88ea7f508aa 100644 | 17 | index fd8efdffea6..22a8863031c 100644 |
18 | --- a/chromium/third_party/lss/linux_syscall_support.h | 18 | --- a/chromium/third_party/lss/linux_syscall_support.h |
19 | +++ b/chromium/third_party/lss/linux_syscall_support.h | 19 | +++ b/chromium/third_party/lss/linux_syscall_support.h |
20 | @@ -1239,6 +1239,11 @@ struct kernel_statfs { | 20 | @@ -1244,6 +1244,11 @@ struct kernel_statfs { |
21 | #ifndef __NR_fallocate | 21 | #ifndef __NR_fallocate |
22 | #define __NR_fallocate 285 | 22 | #define __NR_fallocate 285 |
23 | #endif | 23 | #endif |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0029-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 8db39395..72adf1cb 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0029-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 | |||
@@ -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 572472a6993..504fdb5d5c6 100644 | 28 | index 7df6892d67e..030ff8896e4 100644 |
29 | --- a/chromium/net/socket/udp_socket_posix.cc | 29 | --- a/chromium/net/socket/udp_socket_posix.cc |
30 | +++ b/chromium/net/socket/udp_socket_posix.cc | 30 | +++ b/chromium/net/socket/udp_socket_posix.cc |
31 | @@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( | 31 | @@ -1199,8 +1199,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( |
32 | for (auto& buffer : buffers) | 32 | for (auto& buffer : buffers) |
33 | msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); | 33 | msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); |
34 | msgvec->reserve(buffers.size()); | 34 | msgvec->reserve(buffers.size()); |