Skip to content

Commit ee892f7

Browse files
committed
chromium: Rebase patches for 132.0.6834.83
This commit rebase previous patches for chromium 132.0.6834.83. Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
1 parent e11ccae commit ee892f7

12 files changed

+69
-71
lines changed

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

Lines changed: 13 additions & 15 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
}

meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch

Lines changed: 7 additions & 7 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
@@ -17,7 +17,7 @@ Signed-off-by: Maksim Sisov <msisov@igalia.com>
1717
2 files changed, 5 insertions(+)
1818

1919
diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
20-
index f46bec2..5438365 100644
20+
index f46bec2eb5..54383655c0 100644
2121
--- a/tools/v8_context_snapshot/BUILD.gn
2222
+++ b/tools/v8_context_snapshot/BUILD.gn
2323
@@ -45,6 +45,7 @@ if (use_v8_context_snapshot) {
@@ -29,34 +29,34 @@ index f46bec2..5438365 100644
2929
"root_out_dir") +
3030
"/v8_context_snapshot_generator",
3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index 38a9a9a..367c354 100644
32+
index 0c559713ea..c8c95eb3a9 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2265,6 +2265,7 @@ template("run_torque") {
35+
@@ -2274,6 +2274,7 @@ template("run_torque") {
3636
}
3737

3838
args = [
3939
+ "./v8-qemu-wrapper.sh",
4040
"./" + rebase_path(
4141
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
4242
root_build_dir),
43-
@@ -2428,6 +2429,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2437,6 +2438,7 @@ action("generate_bytecode_builtins_list") {
4444
outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
4545
deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
4646
args = [
4747
+ "./v8-qemu-wrapper.sh",
4848
"./" + rebase_path(
4949
get_label_info(
5050
":bytecode_builtins_list_generator($v8_generator_toolchain)",
51-
@@ -2500,6 +2502,7 @@ template("run_mksnapshot") {
51+
@@ -2509,6 +2511,7 @@ template("run_mksnapshot") {
5252
}
5353

5454
args += [
5555
+ "./v8-qemu-wrapper.sh",
5656
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
5757
"root_out_dir") + "/mksnapshot",
5858
root_build_dir),
59-
@@ -7446,6 +7449,7 @@ if (v8_enable_i18n_support) {
59+
@@ -7451,6 +7454,7 @@ if (v8_enable_i18n_support) {
6060
outputs = [ output_file ]
6161

6262
args = [

meta-chromium/recipes-browser/chromium/files/0003-wrapper-extra-flags.patch

Lines changed: 2 additions & 2 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
@@ -15,7 +15,7 @@ Signed-off-by: Raphael Kubo da Costa <kubo@igalia.com>
1515
1 file changed, 3 insertions(+), 1 deletion(-)
1616

1717
diff --git a/chrome/installer/linux/common/wrapper b/chrome/installer/linux/common/wrapper
18-
index aaa46bf..7d8c8dd 100755
18+
index aaa46bf71f..7d8c8dd5fb 100755
1919
--- a/chrome/installer/linux/common/wrapper
2020
+++ b/chrome/installer/linux/common/wrapper
2121
@@ -36,5 +36,7 @@ exec < /dev/null

meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch

Lines changed: 3 additions & 3 deletions
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
@@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
1313
1 file changed, 5 insertions(+)
1414

1515
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
16-
index 356a8d4..e348888 100644
16+
index 309c3078a2..8951f6006c 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1902,6 +1902,11 @@ config("default_warnings") {
19+
@@ -1924,6 +1924,11 @@ config("default_warnings") {
2020
}
2121

2222
cflags += [

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

Lines changed: 4 additions & 4 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
@@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
1818
2 files changed, 4 insertions(+)
1919

2020
diff --git a/base/BUILD.gn b/base/BUILD.gn
21-
index 4c0e464..1cf04ea 100644
21+
index 5dee8a9226..bc3e57164a 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1097,7 +1097,9 @@ component("base") {
24+
@@ -1077,7 +1077,9 @@ component("base") {
2525
# Needed for <atomic> if using newer C++ library than sysroot, except if
2626
# building inside the cros_sdk environment - use host_toolchain as a
2727
# more robust check for this.
@@ -32,7 +32,7 @@ index 4c0e464..1cf04ea 100644
3232
libs += [ "atomic" ]
3333
}
3434
diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn
35-
index 131bb71..20f918a 100644
35+
index 131bb71d1d..20f918ab82 100644
3636
--- a/build/config/linux/BUILD.gn
3737
+++ b/build/config/linux/BUILD.gn
3838
@@ -40,7 +40,9 @@ config("runtime_library") {

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

Lines changed: 3 additions & 3 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,10 +17,10 @@ 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
}
2626

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

Lines changed: 2 additions & 2 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 {

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

Lines changed: 3 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) {

meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
2323
4 files changed, 52 insertions(+), 19 deletions(-)
2424

2525
diff --git a/build/config/rust.gni b/build/config/rust.gni
26-
index 5b7807a..2a7802f 100644
26+
index 60856e609d..4baeaecb9c 100644
2727
--- a/build/config/rust.gni
2828
+++ b/build/config/rust.gni
29-
@@ -97,6 +97,11 @@ declare_args() {
29+
@@ -102,6 +102,11 @@ declare_args() {
3030
# a platform. Mostly applicable to Windows, where new versions can handle ANSI
3131
# escape sequences but it's not reliable in general.
3232
force_rustc_color_output = false
@@ -37,8 +37,8 @@ index 5b7807a..2a7802f 100644
3737
+ rust_target_triple_vendor_for_target = ""
3838
}
3939

40-
# Use a separate declare_args so these variables' defaults can depend on the
41-
@@ -197,14 +202,21 @@ if (enable_rust) {
40+
# Use the Rust toolchain built in-tree. When false, we use the prebuilt Rust
41+
@@ -174,14 +179,21 @@ if (enable_rust) {
4242
# https://issues.chromium.org/u/1/issues/372512092#comment5 for an example.
4343
rust_abi_target = ""
4444
if (is_linux || is_chromeos) {
@@ -63,7 +63,7 @@ index 5b7807a..2a7802f 100644
6363
cargo_target_abi = ""
6464
} else if (current_cpu == "arm") {
6565
if (arm_float_abi == "hard") {
66-
@@ -214,18 +226,18 @@ if (is_linux || is_chromeos) {
66+
@@ -191,18 +203,18 @@ if (is_linux || is_chromeos) {
6767
}
6868
if (arm_arch == "armv7-a" || arm_arch == "armv7") {
6969
# No way to inform Rust about the -a suffix.
@@ -87,7 +87,7 @@ index 5b7807a..2a7802f 100644
8787
}
8888
} else if (is_android) {
8989
diff --git a/build/rust/rustc_wrapper.py b/build/rust/rustc_wrapper.py
90-
index 8f2096d..de43d44 100755
90+
index 8f2096dfe5..de43d44eed 100755
9191
--- a/build/rust/rustc_wrapper.py
9292
+++ b/build/rust/rustc_wrapper.py
9393
@@ -160,6 +160,7 @@ def main():
@@ -99,10 +99,10 @@ index 8f2096d..de43d44 100755
9999
abs_build_root = os.getcwd().replace('\\', '/') + '/'
100100
is_windows = sys.platform == 'win32' or args.target_windows
101101
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
102-
index 38e5ab7..136d06b 100644
102+
index b5f5291283..9619dccc45 100644
103103
--- a/build/rust/std/BUILD.gn
104104
+++ b/build/rust/std/BUILD.gn
105-
@@ -192,7 +192,8 @@ if (toolchain_has_rust) {
105+
@@ -191,7 +191,8 @@ if (toolchain_has_rust) {
106106
# our locally-built std. Both reside in root_out_dir: we must only have one of
107107
# each per GN toolchain anyway.
108108

@@ -112,7 +112,7 @@ index 38e5ab7..136d06b 100644
112112

113113
if (!rust_prebuilt_stdlib) {
114114
local_rustc_sysroot = "$root_out_dir/local_rustc_sysroot"
115-
@@ -321,12 +322,12 @@ if (toolchain_has_rust) {
115+
@@ -320,12 +321,12 @@ if (toolchain_has_rust) {
116116
rust_abi_target,
117117
]
118118

@@ -128,7 +128,7 @@ index 38e5ab7..136d06b 100644
128128
}
129129

130130
visibility = [ ":*" ]
131-
@@ -339,8 +340,18 @@ if (toolchain_has_rust) {
131+
@@ -338,8 +339,18 @@ if (toolchain_has_rust) {
132132
"enable_rust=false")
133133
deps = [ ":find_stdlib" ]
134134
sources = get_target_outputs(":find_stdlib")
@@ -149,7 +149,7 @@ index 38e5ab7..136d06b 100644
149149

150150
visibility = [ ":*" ]
151151
}
152-
@@ -380,7 +391,10 @@ if (toolchain_has_rust) {
152+
@@ -379,7 +390,10 @@ if (toolchain_has_rust) {
153153
":prebuilt_stdlib_libs",
154154
":stdlib_public_dependent_libs",
155155
]
@@ -162,7 +162,7 @@ index 38e5ab7..136d06b 100644
162162
# The host builds tools toolchain supports Rust only and does not use
163163
# the allocator remapping to point it to PartitionAlloc.
164164
diff --git a/build/rust/std/find_std_rlibs.py b/build/rust/std/find_std_rlibs.py
165-
index 386258f..e8fdaa9 100755
165+
index 386258f890..e8fdaa904a 100755
166166
--- a/build/rust/std/find_std_rlibs.py
167167
+++ b/build/rust/std/find_std_rlibs.py
168168
@@ -17,7 +17,7 @@ import re

meta-chromium/recipes-browser/chromium/files/0010-Don-t-require-profiler_builtins.rlib.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7f9a0877029aa3492fd381313886d9c80efbb752 Mon Sep 17 00:00:00 2001
1+
From d6862d22d64ddb3e1b85c086eb8c14e69450ceb0 Mon Sep 17 00:00:00 2001
22
From: Max Ihlenfeldt <max@igalia.com>
33
Date: Wed, 7 Feb 2024 11:58:30 +0000
44
Subject: [PATCH] Don't require profiler_builtins.rlib
@@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1414
1 file changed, 1 deletion(-)
1515

1616
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
17-
index 38e5ab7..b5f5291 100644
17+
index 38e5ab7645..b5f5291283 100644
1818
--- a/build/rust/std/BUILD.gn
1919
+++ b/build/rust/std/BUILD.gn
2020
@@ -100,7 +100,6 @@ if (toolchain_has_rust) {

0 commit comments

Comments
 (0)