Skip to content

Commit 718c798

Browse files
chromium: Update to 125.0.6422.141 (#824)
Fixes #818. Release notes: https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop_15.html https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop_21.html https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop_23.html https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop_30.html Build and patch changes: ------------------------ Drop one backported patch that is included in upstream now. Rebase remaining patches. License changes: ---------------- Added licenses: * third_party/bidimapper/licenses/LICENSE.mitt, third_party/bidimapper/licenses/LICENSE.urlpattern_polyfill, third_party/bidimapper/licenses/LICENSE.zod - https://chromium-review.googlesource.com/c/chromium/src/+/5374914 * third_party/lens_server_proto/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5394109 Removed licenses: * third_party/selenium-atoms/LICENSE.closure - https://chromium-review.googlesource.com/c/chromium/src/+/5424804 Updated licenses: * third_party/icu/LICENSE - https://chromium-review.googlesource.com/c/chromium/deps/icu/+/5397901 Test-built (big thanks to @rjanani-p): -------------------------------------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64 - scarthgap, clang, MACHINE=qemuarm64, qemux86-64 * chromium-x11: - master, clang, MACHINE=qemuarm, qemuarm64, qemux86-64, raspberrypi4-64 - scarthgap, clang, MACHINE=qemuarm, qemuarm64, qemux86-64, raspberrypi4-64 Signed-off-by: Max Ihlenfeldt <[email protected]>
1 parent 40ef1d0 commit 718c798

17 files changed

+53
-78
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ B = "${S}/${OUTPUT_DIR}"
1313
# Backported patches.
1414
SRC_URI += "\
1515
file://backport/Add-missing-components-enterprise-buildflag.patch \
16-
file://backport/NewTabPage-Add-missing-dep-to-cr_components.patch \
1716
"
1817

1918
# Non-specific patches.

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home"
44
CVE_PRODUCT = "chromium:chromium google:chrome"
55

66
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
7-
SRC_URI[sha256sum] = "6d6dc8b943012573a244ddb013b281ecbc97f77fe1fc6f55a4118241d107eba5"
7+
SRC_URI[sha256sum] = "9966b50279d0cfaaf4b58570387f0d526388f8d5f6dd990e3f083a55d8d8e603"
88

99
S = "${WORKDIR}/chromium-${PV}"
1010

@@ -214,6 +214,9 @@ LIC_FILES_CHKSUM = "\
214214
file://${S}/third_party/axe-core/LICENSE;md5=f27a50d2e878867827842f2c60e30bfc \
215215
file://${S}/third_party/beto-core/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \
216216
file://${S}/third_party/bidimapper/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \
217+
file://${S}/third_party/bidimapper/licenses/LICENSE.mitt;md5=4ed316158806c1e39b6b6e457c85b10f \
218+
file://${S}/third_party/bidimapper/licenses/LICENSE.urlpattern_polyfill;md5=ea10d22371bd2e01c25f274ce6b4e072 \
219+
file://${S}/third_party/bidimapper/licenses/LICENSE.zod;md5=7aa01d261c2ac4ca667875e22474c798 \
217220
file://${S}/third_party/blink/LICENSE_FOR_ABOUT_CREDITS;md5=11e90d553b211de885f245900c4ccf89 \
218221
file://${S}/third_party/boringssl/src/LICENSE;md5=2ca501bc96ce9ed0814e2c592c3f9593 \
219222
file://${S}/third_party/boringssl/src/third_party/fiat/LICENSE;md5=8eb8c1cdeb53faab99e4673182bed9f7 \
@@ -323,7 +326,7 @@ LIC_FILES_CHKSUM = "\
323326
file://${S}/third_party/hyphenation-patterns/LICENSE;md5=23d9bd4878e6f3669ed39b2095b01c13 \
324327
file://${S}/third_party/iaccessible2/LICENSE;md5=43bbd0bfb581347ec10def720000a645 \
325328
file://${S}/third_party/iccjpeg/LICENSE;md5=26834d132689a03abf860f4572705494 \
326-
file://${S}/third_party/icu/LICENSE;md5=80c2cf39ad8ae12b9b9482a1737c6650 \
329+
file://${S}/third_party/icu/LICENSE;md5=08dc3852df8fffa807301902ad899ff8 \
327330
file://${S}/third_party/inspector_protocol/LICENSE;md5=db90dcb101891a7285d25f2fbceca752 \
328331
file://${S}/third_party/ipcz/LICENSE;md5=1649e1dc663940b442197bd7f99cd228 \
329332
file://${S}/third_party/isimpledom/LICENSE;md5=822502c0e010ccdbb6a3e681dd47888e \
@@ -332,6 +335,7 @@ LIC_FILES_CHKSUM = "\
332335
file://${S}/third_party/jstemplate/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 \
333336
file://${S}/third_party/jszip/LICENSE;md5=401d270383d75b05d76fc13fc1750765 \
334337
file://${S}/third_party/khronos/LICENSE;md5=1d2ef853a9ae7ace4e16fda0d48f597b \
338+
file://${S}/third_party/lens_server_proto/LICENSE;md5=57b69a83c4a9b2401aa4de147cb22bd4 \
335339
file://${S}/third_party/leveldatabase/src/LICENSE;md5=92d1b128950b11ba8495b64938fc164d \
336340
file://${S}/third_party/libaddressinput/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
337341
file://${S}/third_party/libaom/source/libaom/LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \
@@ -412,7 +416,6 @@ LIC_FILES_CHKSUM = "\
412416
file://${S}/third_party/ruy/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
413417
file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
414418
file://${S}/third_party/selenium-atoms/LICENSE;md5=5cd827bdaf8605a596a7ac9dcf808ea1 \
415-
file://${S}/third_party/selenium-atoms/LICENSE.closure;md5=e23fadd6ceef8c618fc1c65191d846fa \
416419
file://${S}/third_party/selenium-atoms/LICENSE.sizzle;md5=7a9495742f21b7624515e120b720cc65 \
417420
file://${S}/third_party/selenium-atoms/LICENSE.wgxpath;md5=73a4131394317651a4370c0507a9ccb5 \
418421
file://${S}/third_party/sentencepiece/LICENSE;md5=5cb9ee2840d20280145e929f30f32060 \

meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod <[email protected]>
2121
1 file changed, 38 deletions(-)
2222

2323
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
24-
index bd7dd25..83d2298 100644
24+
index 973d8bc..8165472 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
27-
@@ -1180,11 +1180,6 @@ config("compiler_cpu_abi") {
27+
@@ -1198,11 +1198,6 @@ config("compiler_cpu_abi") {
2828
]
2929
}
3030
} else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index bd7dd25..83d2298 100644
3636
if (!is_nacl) {
3737
cflags += [
3838
"-march=$arm_arch",
39-
@@ -1194,12 +1189,6 @@ config("compiler_cpu_abi") {
39+
@@ -1212,12 +1207,6 @@ config("compiler_cpu_abi") {
4040
if (arm_tune != "") {
4141
cflags += [ "-mtune=$arm_tune" ]
4242
}
@@ -49,7 +49,7 @@ index bd7dd25..83d2298 100644
4949
} else if (current_cpu == "mipsel" && !is_nacl) {
5050
ldflags += [ "-Wl,--hash-style=sysv" ]
5151
if (custom_toolchain == "") {
52-
@@ -1207,9 +1196,6 @@ config("compiler_cpu_abi") {
52+
@@ -1225,9 +1214,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 bd7dd25..83d2298 100644
5959
}
6060
} else {
6161
cflags += [ "-EL" ]
62-
@@ -1289,8 +1275,6 @@ config("compiler_cpu_abi") {
62+
@@ -1307,8 +1293,6 @@ config("compiler_cpu_abi") {
6363
ldflags += [ "-Wl,--hash-style=sysv" ]
6464
if (custom_toolchain == "") {
6565
if (is_clang) {
@@ -68,7 +68,7 @@ index bd7dd25..83d2298 100644
6868
} else {
6969
cflags += [ "-EB" ]
7070
ldflags += [ "-EB" ]
71-
@@ -1338,9 +1322,6 @@ config("compiler_cpu_abi") {
71+
@@ -1356,9 +1340,6 @@ config("compiler_cpu_abi") {
7272
if (is_android) {
7373
cflags += [ "--target=mips64el-linux-android" ]
7474
ldflags += [ "--target=mips64el-linux-android" ]
@@ -78,7 +78,7 @@ index bd7dd25..83d2298 100644
7878
}
7979
} else {
8080
cflags += [
81-
@@ -1398,8 +1379,6 @@ config("compiler_cpu_abi") {
81+
@@ -1416,8 +1397,6 @@ config("compiler_cpu_abi") {
8282
ldflags += [ "-Wl,--hash-style=sysv" ]
8383
if (custom_toolchain == "") {
8484
if (is_clang) {
@@ -87,22 +87,22 @@ index bd7dd25..83d2298 100644
8787
} else {
8888
cflags += [
8989
"-EB",
90-
@@ -1562,23 +1541,6 @@ config("compiler_deterministic") {
90+
@@ -1580,23 +1559,6 @@ config("compiler_deterministic") {
9191
}
9292
}
9393
}
9494
-
9595
- # Tells the compiler not to use absolute paths when passing the default
9696
- # paths to the tools it invokes. We don't want this because we don't
97-
- # really need it and it can mess up the goma cache entries.
97+
- # really need it and it can mess up the RBE cache entries.
9898
- if (is_clang && (!is_nacl || is_nacl_saigo)) {
9999
- cflags += [ "-no-canonical-prefixes" ]
100100
-
101101
- # Same for links: Let the compiler driver invoke the linker
102102
- # with a relative path and pass relative paths to built-in
103103
- # libraries. Not needed on Windows because we call the linker
104104
- # directly there, not through the compiler driver.
105-
- # We don't link on goma, so this change is just for cleaner
105+
- # We don't link on RBE, so this change is just for cleaner
106106
- # internal linker invocations, for people who work on the build.
107107
- if (!is_win) {
108108
- ldflags += [ "-no-canonical-prefixes" ]

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,34 @@ index 6b38d3f..7771a69 100644
2929
"root_out_dir") +
3030
"/v8_context_snapshot_generator",
3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index a25b6f2..abc441f 100644
32+
index 79b95fb..1e9862d 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2200,6 +2200,7 @@ template("run_torque") {
35+
@@ -2214,6 +2214,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-
@@ -2357,6 +2358,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2371,6 +2372,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-
@@ -2396,6 +2398,7 @@ template("run_mksnapshot") {
51+
@@ -2410,6 +2412,7 @@ template("run_mksnapshot") {
5252
data = []
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-
@@ -7221,6 +7224,7 @@ if (v8_enable_i18n_support) {
59+
@@ -7251,6 +7254,7 @@ if (v8_enable_i18n_support) {
6060
outputs = [ output_file ]
6161

6262
args = [

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <[email protected]>
1313
1 file changed, 5 insertions(+)
1414

1515
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
16-
index bd7dd25..c1183ff 100644
16+
index 973d8bc..0f2b8f6 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1872,6 +1872,11 @@ config("default_warnings") {
19+
@@ -1893,6 +1893,11 @@ config("default_warnings") {
2020
}
2121

2222
cflags += [
@@ -25,6 +25,6 @@ index bd7dd25..c1183ff 100644
2525
+ # chromium uses.
2626
+ "-Wno-unknown-warning-option",
2727
+
28-
# Ignore warnings about MSVC optimization pragmas.
29-
# TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
30-
"-Wno-ignored-pragma-optimize",
28+
# TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now.
29+
"-Wno-cast-function-type",
30+

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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 25356ec..b19314f 100644
21+
index 5dc15da..2b83e1c 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1131,7 +1131,9 @@ component("base") {
24+
@@ -1141,7 +1141,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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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 83d2298..00894fe 100644
20+
index 973d8bc..c0f6a49 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -613,24 +613,6 @@ config("compiler") {
23+
@@ -610,24 +610,6 @@ config("compiler") {
2424
}
2525
}
2626

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
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 e639905..62279fc 100644
24+
index 498b3eb..421c1d7 100644
2525
--- a/build/config/clang/BUILD.gn
2626
+++ b/build/config/clang/BUILD.gn
27-
@@ -156,14 +156,15 @@ template("clang_lib") {
27+
@@ -165,14 +165,15 @@ template("clang_lib") {
2828
} else if (is_apple) {
2929
_dir = "darwin"
3030
} else if (is_linux || is_chromeos) {

0 commit comments

Comments
 (0)