Skip to content

Commit 19c047f

Browse files
committed
chromium: Rebase patches for 132.0.6834.83
This commit rebase previous patches for chromium 132.0.6834.83. While here, the following patch is dropped as no longer required: * 0009-Adjust-the-Rust-build-to-our-needs.patch Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
1 parent d924263 commit 19c047f

13 files changed

+113
-311
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ SRC_URI += "\
2323
file://0006-Don-t-pass-unknown-LLVM-options.patch \
2424
file://0007-Fix-constexpr-variable-must-be-initialized-by-a-cons.patch \
2525
file://0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch \
26-
file://0009-Adjust-the-Rust-build-to-our-needs.patch \
27-
file://0010-Don-t-require-profiler_builtins.rlib.patch \
28-
file://0011-Disable-crabbyavif-to-fix-build-errors.patch \
29-
file://0012-Revert-Allow-and-use-std-hardware_destructive_interf.patch \
26+
file://0009-Don-t-require-profiler_builtins.rlib.patch \
27+
file://0010-Disable-crabbyavif-to-fix-build-errors.patch \
28+
file://0011-Revert-Allow-and-use-std-hardware_destructive_interf.patch \
3029
"
3130
# ARM/AArch64-specific patches.
3231
SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0001-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"

meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b49388c4ee899f7a424a1f1df52868eed1e9c83f Mon Sep 17 00:00:00 2001
1+
From 2e867ac9e97b5ae2090b4de212d9c0e50eee653b Mon Sep 17 00:00:00 2001
22
From: Max Ihlenfeldt <max@igalia.com>
33
Date: Tue, 25 Jun 2024 11:06:19 +0000
44
Subject: [PATCH] Drop GN compiler settings conflicting with OE
@@ -15,20 +15,19 @@ Upstream-Status: Inappropriate [OE-Specific]
1515
Signed-off-by: Khem Raj <raj.khem@gmail.com>
1616
Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1717
---
18-
build/config/compiler/BUILD.gn | 48 ----------------------------------
19-
1 file changed, 48 deletions(-)
18+
build/config/compiler/BUILD.gn | 46 ----------------------------------
19+
1 file changed, 46 deletions(-)
2020

2121
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index f162751..356a8d4 100644
22+
index f58320b88f..309c3078a2 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -1219,27 +1219,6 @@ config("compiler_cpu_abi") {
25+
@@ -1240,26 +1240,6 @@ config("compiler_cpu_abi") {
2626
"-msse3",
2727
]
2828
}
2929
- } else if (current_cpu == "arm") {
30-
- if (is_clang && !is_android && !is_nacl &&
31-
- !(is_chromeos_lacros && is_chromeos_device)) {
30+
- if (is_clang && !is_android && !is_nacl && !is_chromeos_device) {
3231
- cflags += [ "--target=arm-linux-gnueabihf" ]
3332
- ldflags += [ "--target=arm-linux-gnueabihf" ]
3433
- }
@@ -43,14 +42,14 @@ index f162751..356a8d4 100644
4342
- }
4443
- } else if (current_cpu == "arm64") {
4544
- if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
46-
- !(is_chromeos_lacros && is_chromeos_device)) {
45+
- !is_chromeos_device) {
4746
- cflags += [ "--target=aarch64-linux-gnu" ]
4847
- ldflags += [ "--target=aarch64-linux-gnu" ]
4948
- }
5049
} else if (current_cpu == "mipsel" && !is_nacl) {
5150
ldflags += [ "-Wl,--hash-style=sysv" ]
5251
if (custom_toolchain == "") {
53-
@@ -1247,9 +1226,6 @@ config("compiler_cpu_abi") {
52+
@@ -1267,9 +1247,6 @@ config("compiler_cpu_abi") {
5453
if (is_android) {
5554
cflags += [ "--target=mipsel-linux-android" ]
5655
ldflags += [ "--target=mipsel-linux-android" ]
@@ -60,7 +59,7 @@ index f162751..356a8d4 100644
6059
}
6160
} else {
6261
cflags += [ "-EL" ]
63-
@@ -1329,8 +1305,6 @@ config("compiler_cpu_abi") {
62+
@@ -1349,8 +1326,6 @@ config("compiler_cpu_abi") {
6463
ldflags += [ "-Wl,--hash-style=sysv" ]
6564
if (custom_toolchain == "") {
6665
if (is_clang) {
@@ -69,17 +68,16 @@ index f162751..356a8d4 100644
6968
} else {
7069
cflags += [ "-EB" ]
7170
ldflags += [ "-EB" ]
72-
@@ -1378,9 +1352,6 @@ config("compiler_cpu_abi") {
73-
if (is_android) {
71+
@@ -1399,8 +1374,6 @@ config("compiler_cpu_abi") {
7472
cflags += [ "--target=mips64el-linux-android" ]
7573
ldflags += [ "--target=mips64el-linux-android" ]
76-
- } else {
74+
} else {
7775
- cflags += [ "--target=mips64el-linux-gnuabi64" ]
7876
- ldflags += [ "--target=mips64el-linux-gnuabi64" ]
7977
}
8078
} else {
8179
cflags += [
82-
@@ -1438,8 +1409,6 @@ config("compiler_cpu_abi") {
80+
@@ -1458,8 +1431,6 @@ config("compiler_cpu_abi") {
8381
ldflags += [ "-Wl,--hash-style=sysv" ]
8482
if (custom_toolchain == "") {
8583
if (is_clang) {
@@ -88,7 +86,7 @@ index f162751..356a8d4 100644
8886
} else {
8987
cflags += [
9088
"-EB",
91-
@@ -1608,23 +1577,6 @@ config("compiler_deterministic") {
89+
@@ -1628,23 +1599,6 @@ config("compiler_deterministic") {
9290
}
9391
}
9492
}
@@ -110,5 +108,8 @@ index f162751..356a8d4 100644
110108
- }
111109
- }
112110
}
113-
111+
114112
config("clang_revision") {
113+
--
114+
2.47.1
115+
Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 733559e6f2c26ccbce97354a2341b14c63563dab Mon Sep 17 00:00:00 2001
1+
From 60233d0570b4c9c9a9827616b224c9c93cbf6254 Mon Sep 17 00:00:00 2001
22
From: Raphael Kubo da Costa <kubo@igalia.com>
33
Date: Tue, 7 Nov 2017 15:24:32 +0100
44
Subject: [PATCH] v8: qemu wrapper
@@ -10,57 +10,59 @@ Upstream-Status: Inappropriate [embedder specific]
1010

1111
Signed-off-by: Raphael Kubo da Costa <kubo@igalia.com>
1212
Signed-off-by: Maksim Sisov <msisov@igalia.com>
13-
1413
---
1514
tools/v8_context_snapshot/BUILD.gn | 1 +
1615
v8/BUILD.gn | 4 ++++
1716
2 files changed, 5 insertions(+)
1817

1918
diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
20-
index f46bec2..5438365 100644
19+
index f46bec2eb5..54383655c0 100644
2120
--- a/tools/v8_context_snapshot/BUILD.gn
2221
+++ b/tools/v8_context_snapshot/BUILD.gn
2322
@@ -45,6 +45,7 @@ if (use_v8_context_snapshot) {
2423
output_path = rebase_path(output_file, root_build_dir)
25-
24+
2625
args = [
2726
+ "./v8-qemu-wrapper.sh",
2827
"./" + rebase_path(get_label_info(":v8_context_snapshot_generator",
2928
"root_out_dir") +
3029
"/v8_context_snapshot_generator",
3130
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index 38a9a9a..367c354 100644
31+
index 0c559713ea..c8c95eb3a9 100644
3332
--- a/v8/BUILD.gn
3433
+++ b/v8/BUILD.gn
35-
@@ -2265,6 +2265,7 @@ template("run_torque") {
34+
@@ -2274,6 +2274,7 @@ template("run_torque") {
3635
}
37-
36+
3837
args = [
3938
+ "./v8-qemu-wrapper.sh",
4039
"./" + rebase_path(
4140
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
4241
root_build_dir),
43-
@@ -2428,6 +2429,7 @@ action("generate_bytecode_builtins_list") {
42+
@@ -2437,6 +2438,7 @@ action("generate_bytecode_builtins_list") {
4443
outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
4544
deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
4645
args = [
4746
+ "./v8-qemu-wrapper.sh",
4847
"./" + rebase_path(
4948
get_label_info(
5049
":bytecode_builtins_list_generator($v8_generator_toolchain)",
51-
@@ -2500,6 +2502,7 @@ template("run_mksnapshot") {
50+
@@ -2509,6 +2511,7 @@ template("run_mksnapshot") {
5251
}
53-
52+
5453
args += [
5554
+ "./v8-qemu-wrapper.sh",
5655
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
5756
"root_out_dir") + "/mksnapshot",
5857
root_build_dir),
59-
@@ -7446,6 +7449,7 @@ if (v8_enable_i18n_support) {
58+
@@ -7451,6 +7454,7 @@ if (v8_enable_i18n_support) {
6059
outputs = [ output_file ]
61-
60+
6261
args = [
6362
+ "./v8-qemu-wrapper.sh",
6463
"./" + rebase_path(
6564
get_label_info(
6665
":gen-regexp-special-case($v8_generator_toolchain)",
66+
--
67+
2.47.1
68+
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1d75677445177bc9c16bb7d0fae607d0c5e82c0a Mon Sep 17 00:00:00 2001
1+
From 71eca88e5d42d4732dfe53ea8fadf2199db519a2 Mon Sep 17 00:00:00 2001
22
From: Raphael Kubo da Costa <kubo@igalia.com>
33
Date: Wed, 8 Nov 2017 16:43:47 +0100
44
Subject: [PATCH] wrapper: extra flags
@@ -9,21 +9,23 @@ extra flags to it by default.
99
Upstream-Status: Inappropriate [embedder specific]
1010

1111
Signed-off-by: Raphael Kubo da Costa <kubo@igalia.com>
12-
1312
---
1413
chrome/installer/linux/common/wrapper | 4 +++-
1514
1 file changed, 3 insertions(+), 1 deletion(-)
1615

1716
diff --git a/chrome/installer/linux/common/wrapper b/chrome/installer/linux/common/wrapper
18-
index aaa46bf..7d8c8dd 100755
17+
index aaa46bf71f..7d8c8dd5fb 100755
1918
--- a/chrome/installer/linux/common/wrapper
2019
+++ b/chrome/installer/linux/common/wrapper
2120
@@ -36,5 +36,7 @@ exec < /dev/null
2221
exec > >(exec cat)
2322
exec 2> >(exec cat >&2)
24-
23+
2524
+CHROME_EXTRA_ARGS=""
2625
+
2726
# Note: exec -a below is a bashism.
2827
-exec -a "$0" "$HERE/@@PROGNAME@@" "$@"
2928
+exec -a "$0" "$HERE/@@PROGNAME@@" ${CHROME_EXTRA_ARGS} "$@"
29+
--
30+
2.47.1
31+
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2b487585ebe8986ada07afb9c917564c9b0dfd16 Mon Sep 17 00:00:00 2001
1+
From 75b620ad19491a1f8b8e9ec891d242d017016972 Mon Sep 17 00:00:00 2001
22
From: Khem Raj <raj.khem@gmail.com>
33
Date: Wed, 4 Dec 2019 19:06:54 -0800
44
Subject: [PATCH] Delete compiler options not available in release versions of
@@ -7,18 +7,17 @@ Subject: [PATCH] Delete compiler options not available in release versions of
77
Upstream-Status: Inappropriate [ clang/master already supports them ]
88
Signed-off-by: Khem Raj <raj.khem@gmail.com>
99
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
10-
1110
---
1211
build/config/compiler/BUILD.gn | 5 +++++
1312
1 file changed, 5 insertions(+)
1413

1514
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
16-
index 356a8d4..e348888 100644
15+
index 309c3078a2..8951f6006c 100644
1716
--- a/build/config/compiler/BUILD.gn
1817
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1902,6 +1902,11 @@ config("default_warnings") {
18+
@@ -1924,6 +1924,11 @@ config("default_warnings") {
2019
}
21-
20+
2221
cflags += [
2322
+ # Disable unknown warnings, since system clang may not have
2423
+ # backported newer warning yet unlike internal clang that
@@ -27,4 +26,7 @@ index 356a8d4..e348888 100644
2726
+
2827
# TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now.
2928
"-Wno-cast-function-type",
29+
30+
--
31+
2.47.1
3032

meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0dcae7668b878b7db5da83643a8dfd7709865d3b Mon Sep 17 00:00:00 2001
1+
From c68f4f68490005e1576ca2339b1124dca5f83867 Mon Sep 17 00:00:00 2001
22
From: Hongxu Jia <hongxu.jia@windriver.com>
33
Date: Fri, 22 Jan 2021 00:02:25 +0800
44
Subject: [PATCH] avoid link latomic failure on CentOS 8 host
@@ -11,17 +11,16 @@ Upstream-Status: Inappropriate [oe specific]
1111

1212
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1313
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
14-
1514
---
1615
base/BUILD.gn | 2 ++
1716
build/config/linux/BUILD.gn | 2 ++
1817
2 files changed, 4 insertions(+)
1918

2019
diff --git a/base/BUILD.gn b/base/BUILD.gn
21-
index 4c0e464..1cf04ea 100644
20+
index 5dee8a9226..bc3e57164a 100644
2221
--- a/base/BUILD.gn
2322
+++ b/base/BUILD.gn
24-
@@ -1097,7 +1097,9 @@ component("base") {
23+
@@ -1077,7 +1077,9 @@ component("base") {
2524
# Needed for <atomic> if using newer C++ library than sysroot, except if
2625
# building inside the cros_sdk environment - use host_toolchain as a
2726
# more robust check for this.
@@ -32,16 +31,19 @@ index 4c0e464..1cf04ea 100644
3231
libs += [ "atomic" ]
3332
}
3433
diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn
35-
index 131bb71..20f918a 100644
34+
index 131bb71d1d..20f918ab82 100644
3635
--- a/build/config/linux/BUILD.gn
3736
+++ b/build/config/linux/BUILD.gn
3837
@@ -40,7 +40,9 @@ config("runtime_library") {
3938
defines = [ "OS_CHROMEOS" ]
4039
}
41-
40+
4241
+ # Only target requires <atomic>
4342
if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") &&
4443
+ (current_toolchain != host_toolchain) &&
4544
(!use_custom_libcxx || current_cpu == "mipsel")) {
4645
libs = [ "atomic" ]
4746
}
47+
--
48+
2.47.1
49+

meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e7bfb246447a1c2a6249c20f0a006ad1578def01 Mon Sep 17 00:00:00 2001
1+
From 651736ea42939ae67169d3429489ae9f304eae3c Mon Sep 17 00:00:00 2001
22
From: Max Ihlenfeldt <max@igalia.com>
33
Date: Fri, 8 Dec 2023 11:47:43 +0000
44
Subject: [PATCH] Don't pass unknown LLVM options
@@ -17,13 +17,13 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1717
1 file changed, 18 deletions(-)
1818

1919
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
20-
index e348888..a47fbdb 100644
20+
index 8951f6006c..cc300e7122 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -584,24 +584,6 @@ config("compiler") {
23+
@@ -591,24 +591,6 @@ config("compiler") {
2424
}
2525
}
26-
26+
2727
- # TODO(crbug.com/40283598): This causes binary size growth and potentially
2828
- # other problems.
2929
- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version.
@@ -45,3 +45,6 @@ index e348888..a47fbdb 100644
4545
# TODO(crbug.com/40192287): Investigate why/if this should be needed.
4646
if (is_win) {
4747
cflags += [ "/clang:-ffp-contract=off" ]
48+
--
49+
2.47.1
50+

meta-chromium/recipes-browser/chromium/files/0007-Fix-constexpr-variable-must-be-initialized-by-a-cons.patch

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4316b426cf10afb28ce42c250fbde66266ac5114 Mon Sep 17 00:00:00 2001
1+
From 5a28cb783a33391476839a5b904f0eab7fb9b13d Mon Sep 17 00:00:00 2001
22
From: Max Ihlenfeldt <max@igalia.com>
33
Date: Fri, 22 Mar 2024 10:43:47 +0000
44
Subject: [PATCH] Fix "constexpr variable must be initialized by a constant
@@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1414
1 file changed, 2 insertions(+), 2 deletions(-)
1515

1616
diff --git a/components/autofill/core/browser/data_model/autofill_i18n_api.h b/components/autofill/core/browser/data_model/autofill_i18n_api.h
17-
index fa1a06b..8e1fe01 100644
17+
index fa1a06bdad..8e1fe01bfc 100644
1818
--- a/components/autofill/core/browser/data_model/autofill_i18n_api.h
1919
+++ b/components/autofill/core/browser/data_model/autofill_i18n_api.h
2020
@@ -16,8 +16,8 @@ namespace autofill::i18n_model_definition {
@@ -26,5 +26,8 @@ index fa1a06b..8e1fe01 100644
2626
+const inline std::string kLegacyHierarchyCountryCodeString{"XX"};
2727
+const AddressCountryCode kLegacyHierarchyCountryCode =
2828
AddressCountryCode(kLegacyHierarchyCountryCodeString);
29-
29+
3030
// Creates an instance of the address hierarchy model corresponding to the
31+
--
32+
2.47.1
33+

meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 334f64aafb062324a9124a13855128dfe733c0c2 Mon Sep 17 00:00:00 2001
1+
From b9b4dffd99fd57dc3acbce7304284c26a10e695e Mon Sep 17 00:00:00 2001
22
From: Max Ihlenfeldt <max@igalia.com>
33
Date: Tue, 19 Dec 2023 12:14:05 +0000
44
Subject: [PATCH] Use the correct path to libclang_rt.builtins.a
@@ -21,10 +21,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
2121
1 file changed, 5 insertions(+), 4 deletions(-)
2222

2323
diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
24-
index 890bf91..ed90f6e 100644
24+
index 44bd202d2b..6789beccdc 100644
2525
--- a/build/config/clang/BUILD.gn
2626
+++ b/build/config/clang/BUILD.gn
27-
@@ -163,14 +163,15 @@ template("clang_lib") {
27+
@@ -166,14 +166,15 @@ template("clang_lib") {
2828
} else if (is_apple) {
2929
_dir = "darwin"
3030
} else if (is_linux || is_chromeos) {
@@ -44,3 +44,6 @@ index 890bf91..ed90f6e 100644
4444
} else {
4545
assert(false) # Unhandled cpu type
4646
}
47+
--
48+
2.47.1
49+

0 commit comments

Comments
 (0)