Skip to content

Commit 979d747

Browse files
adalessandrootavio
authored andcommitted
chromium: Update to 136.0.7103.113
Release notes: https://chromereleases.googleblog.com/2025/05/stable-channel-update-for-desktop_14.html Build and patch changes: ------------------------ Added patches: * 0014-Revert-Remove-libavif-based-AVIF-decoder.patch * 0015-Revert-Remove-third_party-libavif.patch * 0017-rust-Use-adler-instead-of-adler2.patch * 0018-third_party-node-update_node_binaries-Update-nodejs-.patch Updated patches: * 0016-Disable-crabbyavif-to-fix-build-errors.patch * Rebased remaining patches. Removed patches: * 0015-Revert-Connect-the-Rust-log-crate-to-the-base-loggin.patch License changes: ---------------- Added licenses: * TBD Removed licenses: * TBD Updated licenses: * TBD Test-built: ----------- * chromium-ozone-wayland * master, clang, MACHINE=qemux86-64, qemuarm, qemuarm64 * chromium-x11 * master, clang, MACHINE=qemux86-64, qemuarm, qemuarm64 Signed-off-by: Ariel D'Alessandro <[email protected]>
1 parent b6b69eb commit 979d747

23 files changed

+4456
-629
lines changed

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

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,24 @@ SRC_URI += "\
2525
file://0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch \
2626
file://0009-Adjust-the-Rust-build-to-our-needs.patch \
2727
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 \
30-
file://0013-Revert-Set-Rust-symbol-visibility-to-hidden-when-C-s.patch \
31-
file://0014-pdfium-Fix-missing-PDFiumAPIStringBufferAdapter-temp.patch \
32-
file://0015-Revert-Connect-the-Rust-log-crate-to-the-base-loggin.patch \
28+
file://0011-Revert-Allow-and-use-std-hardware_destructive_interf.patch \
29+
file://0012-Revert-Set-Rust-symbol-visibility-to-hidden-when-C-s.patch \
30+
file://0013-pdfium-Fix-missing-PDFiumAPIStringBufferAdapter-temp.patch \
31+
file://0014-Revert-Remove-libavif-based-AVIF-decoder.patch \
32+
file://0015-Revert-Remove-third_party-libavif.patch \
33+
file://0016-Disable-crabbyavif-to-fix-build-errors.patch \
34+
file://0017-rust-Use-adler-instead-of-adler2.patch \
35+
file://0018-third_party-node-update_node_binaries-Update-nodejs-.patch \
3336
"
37+
38+
# Missing third_party sources.
39+
SRC_URI += "\
40+
git://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif;protocol=https;branch=main;name=libavif;destsuffix=third_party/libavif/src \
41+
"
42+
43+
SRCREV_FORMAT .= "_libavif"
44+
SRCREV_libavif = "e7b34a1f5e9f7024d08311c7bae156061b889882"
45+
3446
# ARM/AArch64-specific patches.
3547
SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0001-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"
3648

@@ -475,6 +487,12 @@ do_copy_target_rustlibs () {
475487
}
476488
addtask copy_target_rustlibs after do_configure before do_compile
477489

490+
do_copy_missing_third_party_sources () {
491+
rm -rf ${S}/third_party/libavif/src
492+
cp -r ${UNPACKDIR}/third_party/libavif/src/ ${S}/third_party/libavif/
493+
}
494+
addtask copy_missing_third_party_sources after do_patch before do_configure
495+
478496
do_configure() {
479497
cd ${S}
480498
python3 ./build/linux/unbundle/replace_gn_files.py --system-libraries ${GN_UNBUNDLE_LIBS}

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

Lines changed: 219 additions & 67 deletions
Large diffs are not rendered by default.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2e867ac9e97b5ae2090b4de212d9c0e50eee653b Mon Sep 17 00:00:00 2001
1+
From feb3b8299f312e4074fc76fe7b6dfa236a5823d8 Mon Sep 17 00:00:00 2001
22
From: Max Ihlenfeldt <[email protected]>
33
Date: Tue, 25 Jun 2024 11:06:19 +0000
44
Subject: [PATCH] Drop GN compiler settings conflicting with OE
@@ -19,10 +19,10 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
1919
1 file changed, 46 deletions(-)
2020

2121
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index f58320b88f..309c3078a2 100644
22+
index e7a60d56b5..b0e9e04bf3 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -1240,26 +1240,6 @@ config("compiler_cpu_abi") {
25+
@@ -1211,26 +1211,6 @@ config("compiler_cpu_abi") {
2626
"-msse3",
2727
]
2828
}
@@ -49,7 +49,7 @@ index f58320b88f..309c3078a2 100644
4949
} else if (current_cpu == "mipsel" && !is_nacl) {
5050
ldflags += [ "-Wl,--hash-style=sysv" ]
5151
if (custom_toolchain == "") {
52-
@@ -1267,9 +1247,6 @@ config("compiler_cpu_abi") {
52+
@@ -1238,9 +1218,6 @@ config("compiler_cpu_abi") {
5353
if (is_android) {
5454
cflags += [ "--target=mipsel-linux-android" ]
5555
ldflags += [ "--target=mipsel-linux-android" ]
@@ -59,7 +59,7 @@ index f58320b88f..309c3078a2 100644
5959
}
6060
} else {
6161
cflags += [ "-EL" ]
62-
@@ -1349,8 +1326,6 @@ config("compiler_cpu_abi") {
62+
@@ -1320,8 +1297,6 @@ config("compiler_cpu_abi") {
6363
ldflags += [ "-Wl,--hash-style=sysv" ]
6464
if (custom_toolchain == "") {
6565
if (is_clang) {
@@ -68,7 +68,7 @@ index f58320b88f..309c3078a2 100644
6868
} else {
6969
cflags += [ "-EB" ]
7070
ldflags += [ "-EB" ]
71-
@@ -1399,8 +1374,6 @@ config("compiler_cpu_abi") {
71+
@@ -1370,8 +1345,6 @@ config("compiler_cpu_abi") {
7272
cflags += [ "--target=mips64el-linux-android" ]
7373
ldflags += [ "--target=mips64el-linux-android" ]
7474
} else {
@@ -77,7 +77,7 @@ index f58320b88f..309c3078a2 100644
7777
}
7878
} else {
7979
cflags += [
80-
@@ -1458,8 +1431,6 @@ config("compiler_cpu_abi") {
80+
@@ -1429,8 +1402,6 @@ config("compiler_cpu_abi") {
8181
ldflags += [ "-Wl,--hash-style=sysv" ]
8282
if (custom_toolchain == "") {
8383
if (is_clang) {
@@ -86,7 +86,7 @@ index f58320b88f..309c3078a2 100644
8686
} else {
8787
cflags += [
8888
"-EB",
89-
@@ -1628,23 +1599,6 @@ config("compiler_deterministic") {
89+
@@ -1599,23 +1570,6 @@ config("compiler_deterministic") {
9090
}
9191
}
9292
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 60233d0570b4c9c9a9827616b224c9c93cbf6254 Mon Sep 17 00:00:00 2001
1+
From d326bbe195c6853c600d01b9d438b5ee430b55c2 Mon Sep 17 00:00:00 2001
22
From: Raphael Kubo da Costa <[email protected]>
33
Date: Tue, 7 Nov 2017 15:24:32 +0100
44
Subject: [PATCH] v8: qemu wrapper
@@ -17,46 +17,46 @@ Signed-off-by: Maksim Sisov <[email protected]>
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 f46bec2eb5..54383655c0 100644
20+
index 70c32b2fc9..88497d1436 100644
2121
--- a/tools/v8_context_snapshot/BUILD.gn
2222
+++ b/tools/v8_context_snapshot/BUILD.gn
23-
@@ -45,6 +45,7 @@ if (use_v8_context_snapshot) {
24-
output_path = rebase_path(output_file, root_build_dir)
23+
@@ -49,6 +49,7 @@ if (use_v8_context_snapshot) {
24+
output_path = rebase_path(output_file, root_build_dir)
2525

26-
args = [
27-
+ "./v8-qemu-wrapper.sh",
28-
"./" + rebase_path(get_label_info(":v8_context_snapshot_generator",
29-
"root_out_dir") +
30-
"/v8_context_snapshot_generator",
26+
args = [
27+
+ "./v8-qemu-wrapper.sh",
28+
"./" + rebase_path(
29+
get_label_info(
30+
":v8_context_snapshot_generator($v8_snapshot_toolchain)",
3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index 0c559713ea..c8c95eb3a9 100644
32+
index 9a2b2cdd94..8c217b57c9 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2274,6 +2274,7 @@ template("run_torque") {
35+
@@ -2228,6 +2228,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-
@@ -2437,6 +2438,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2391,6 +2392,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-
@@ -2509,6 +2511,7 @@ template("run_mksnapshot") {
51+
@@ -2470,6 +2472,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-
@@ -7451,6 +7454,7 @@ if (v8_enable_i18n_support) {
59+
@@ -7427,6 +7430,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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 71eca88e5d42d4732dfe53ea8fadf2199db519a2 Mon Sep 17 00:00:00 2001
1+
From a8c669d57bd409ba07255bd52fe3c9f0817de2ac Mon Sep 17 00:00:00 2001
22
From: Raphael Kubo da Costa <[email protected]>
33
Date: Wed, 8 Nov 2017 16:43:47 +0100
44
Subject: [PATCH] wrapper: extra flags

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From fc3a1af7d8d6ed6bc54d096e72cbf3d35ff4fa97 Mon Sep 17 00:00:00 2001
1+
From 0a052a88bf96542e0bb7585ccbfd39e681a32e3d Mon Sep 17 00:00:00 2001
22
From: Khem Raj <[email protected]>
33
Date: Wed, 4 Dec 2019 19:06:54 -0800
44
Subject: [PATCH] Delete compiler options not available in release versions of
@@ -17,29 +17,28 @@ Signed-off-by: Randy MacLeod <[email protected]>
1717
Signed-off-by: Ariel D'Alessandro <[email protected]>
1818

1919
---
20-
build/config/compiler/BUILD.gn | 13 +++++--------
21-
1 file changed, 5 insertions(+), 8 deletions(-)
20+
build/config/compiler/BUILD.gn | 12 +++++-------
21+
1 file changed, 5 insertions(+), 7 deletions(-)
2222

2323
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
24-
index 309c3078a2647..5eeb241fc9038 100644
24+
index b0e9e04bf3..46ed84d73c 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
27-
@@ -615,14 +615,6 @@ config("compiler") {
27+
@@ -614,13 +614,6 @@ config("compiler") {
2828
} else {
2929
cflags += [ "-ffp-contract=off" ]
3030
}
3131
-
3232
- # Enable ELF CREL (see crbug.com/357878242) for all platforms that use ELF
3333
- # (excluding toolchains that use an older version of LLVM).
34-
- # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds.
35-
- if (is_linux && !llvm_android_mainline && current_cpu != "arm" &&
34+
- if (is_linux && !llvm_android_mainline &&
3635
- default_toolchain != "//build/toolchain/cros:target") {
3736
- cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
3837
- }
3938
}
4039

4140
# C11/C++11 compiler flags setup.
42-
@@ -1924,6 +1916,11 @@ config("default_warnings") {
41+
@@ -1934,6 +1927,11 @@ config("default_warnings") {
4342
}
4443

4544
cflags += [

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c68f4f68490005e1576ca2339b1124dca5f83867 Mon Sep 17 00:00:00 2001
1+
From be9a610454f3a90e2610443a424efcb34b4903e5 Mon Sep 17 00:00:00 2001
22
From: Hongxu Jia <[email protected]>
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 <[email protected]>
1818
2 files changed, 4 insertions(+)
1919

2020
diff --git a/base/BUILD.gn b/base/BUILD.gn
21-
index 5dee8a9226..bc3e57164a 100644
21+
index 57a6af0061..2703e81421 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1077,7 +1077,9 @@ component("base") {
24+
@@ -1104,7 +1104,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.

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 651736ea42939ae67169d3429489ae9f304eae3c Mon Sep 17 00:00:00 2001
1+
From 8e9bf93215630604eed49476d6e848ad3ec3bdba Mon Sep 17 00:00:00 2001
22
From: Max Ihlenfeldt <[email protected]>
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 <[email protected]>
1717
1 file changed, 18 deletions(-)
1818

1919
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
20-
index 8951f6006c..cc300e7122 100644
20+
index 46ed84d73c..5f7cfb69e9 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -591,24 +591,6 @@ config("compiler") {
23+
@@ -590,24 +590,6 @@ config("compiler") {
2424
}
2525
}
2626

0 commit comments

Comments
 (0)