Skip to content

Commit 40ef1d0

Browse files
chromium: Update to 124.0.6367.207 (#819)
Fixes #817. Release notes: https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop_16.html https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop_24.html https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop_30.html https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop_7.html https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop_9.html https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop_13.html Build and patch changes: ------------------------ Rebase patches. License changes: ---------------- Added licenses: * third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/mitt/LICENSE, third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/rxjs/LICENSE - https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5349136 * third_party/protobuf-javascript/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5365789 Removed licenses: * third_party/catapult/third_party/WebOb/docs/license.txt - https://chromium-review.googlesource.com/c/catapult/+/5324206 * v8/LICENSE.fdlibm, v8/LICENSE.strongtalk - Most likely wrongly removed due to https://crrev.com/c/5375144. See https://crbug.com/342197912. Updated licenses: * third_party/ffmpeg/CREDITS.chromium - https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/5315059 * third_party/selenium-atoms/LICENSE.sizzle - https://chromium-review.googlesource.com/c/chromium/src/+/5339957 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 1ed2254 commit 40ef1d0

16 files changed

+42
-42
lines changed

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

Lines changed: 6 additions & 6 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] = "c883f192af7cb76cf46de4044349645b0fb0b5c42a1c0f7950a24c825c17f885"
7+
SRC_URI[sha256sum] = "6d6dc8b943012573a244ddb013b281ecbc97f77fe1fc6f55a4118241d107eba5"
88

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

@@ -222,7 +222,6 @@ LIC_FILES_CHKSUM = "\
222222
file://${S}/third_party/cardboard/LICENSE;md5=3446ed11f63049b8f1e60e833dcdc5b7 \
223223
file://${S}/third_party/cast_core/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
224224
file://${S}/third_party/catapult/experimental/trace_on_tap/third_party/pako/LICENSE;md5=6b8c8aad0a85200097ec8f989636baf0 \
225-
file://${S}/third_party/catapult/third_party/WebOb/docs/license.txt;md5=8ed3584bcc78c16da363747ccabc5af5 \
226225
file://${S}/third_party/catapult/third_party/apiclient/LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3 \
227226
file://${S}/third_party/catapult/third_party/cachetools/LICENSE;md5=27f7518eb6f7dc686d0f953b2f28dae5 \
228227
file://${S}/third_party/catapult/third_party/chardet/LICENSE;md5=a6f89e2100d9b6cdffcea4f398e37343 \
@@ -288,6 +287,8 @@ LIC_FILES_CHKSUM = "\
288287
file://${S}/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE;md5=449f8b1cf0bfef1e5ec7824a4179ac6f \
289288
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay/package/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
290289
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/LICENSE;md5=b8f1fc4a170646d6f75d9572a3bd1339 \
290+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/mitt/LICENSE;md5=dd3fad292d640766ce5bcb6cb97c109e \
291+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/rxjs/LICENSE;md5=ddcbb07c54c85eff62e3e6ebab2fa6dd \
291292
file://${S}/third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data/package/LICENSE.md;md5=d4a904ca135bb7bc912156fee12726f0 \
292293
file://${S}/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93 \
293294
file://${S}/third_party/distributed_point_functions/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -298,7 +299,7 @@ LIC_FILES_CHKSUM = "\
298299
file://${S}/third_party/expat/src/expat/COPYING;md5=7b3b078238d0901d3b339289117cb7fb \
299300
file://${S}/third_party/farmhash/LICENSE;md5=7dfaa79e2b070897e495fec386e3acfc \
300301
file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \
301-
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=c1235892a92f75dfbc599772072869cd \
302+
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=a1624152b484ce949c0db957a428ac07 \
302303
file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \
303304
file://${S}/third_party/flac/COPYING.Xiph;md5=3d6da238b5b57a0965d6730291119f65 \
304305
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
@@ -400,6 +401,7 @@ LIC_FILES_CHKSUM = "\
400401
file://${S}/third_party/polymer/LICENSE.polymer;md5=324f45ce459ffd97e41d175a4e95a4be \
401402
file://${S}/third_party/private-join-and-compute/src/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
402403
file://${S}/third_party/private_membership/LICENSE;md5=9d44acd6df6b90cbbabbd467d67e74c7 \
404+
file://${S}/third_party/protobuf-javascript/LICENSE;md5=d7cb3a2a94c3207cec955e5f8a3149db \
403405
file://${S}/third_party/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
404406
file://${S}/third_party/pthreadpool/src/LICENSE;md5=1609499688b503850848d795dce4da2d \
405407
file://${S}/third_party/puffin/LICENSE;md5=b1ed361f9fc790c1054d81a7ef041a34 \
@@ -411,7 +413,7 @@ LIC_FILES_CHKSUM = "\
411413
file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
412414
file://${S}/third_party/selenium-atoms/LICENSE;md5=5cd827bdaf8605a596a7ac9dcf808ea1 \
413415
file://${S}/third_party/selenium-atoms/LICENSE.closure;md5=e23fadd6ceef8c618fc1c65191d846fa \
414-
file://${S}/third_party/selenium-atoms/LICENSE.sizzle;md5=418d0239a1435dae6b5c2e919a75f8c9 \
416+
file://${S}/third_party/selenium-atoms/LICENSE.sizzle;md5=7a9495742f21b7624515e120b720cc65 \
415417
file://${S}/third_party/selenium-atoms/LICENSE.wgxpath;md5=73a4131394317651a4370c0507a9ccb5 \
416418
file://${S}/third_party/sentencepiece/LICENSE;md5=5cb9ee2840d20280145e929f30f32060 \
417419
file://${S}/third_party/setupdesign/LICENSE;md5=302a09339e8de37ba06c121279be1707 \
@@ -465,6 +467,4 @@ LIC_FILES_CHKSUM = "\
465467
file://${S}/tools/mac/power/protos/third_party/pprof/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
466468
file://${S}/url/third_party/mozilla/LICENSE.txt;md5=437ced1e9b232651b0912a9594da43b2 \
467469
file://${S}/v8/LICENSE;md5=f38a2942edcfe4abb45e9a83a1ad2f82 \
468-
file://${S}/v8/LICENSE.fdlibm;md5=b17367d6c97e638599071d99a3049dfe \
469-
file://${S}/v8/LICENSE.strongtalk;md5=956a43818dd13f2e93088fc2c93589d2 \
470470
"

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

Lines changed: 8 additions & 8 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 3c7b4d8..19ea87a 100644
24+
index bd7dd25..83d2298 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
27-
@@ -1174,11 +1174,6 @@ config("compiler_cpu_abi") {
27+
@@ -1180,11 +1180,6 @@ config("compiler_cpu_abi") {
2828
]
2929
}
3030
} else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index 3c7b4d8..19ea87a 100644
3636
if (!is_nacl) {
3737
cflags += [
3838
"-march=$arm_arch",
39-
@@ -1188,12 +1183,6 @@ config("compiler_cpu_abi") {
39+
@@ -1194,12 +1189,6 @@ config("compiler_cpu_abi") {
4040
if (arm_tune != "") {
4141
cflags += [ "-mtune=$arm_tune" ]
4242
}
@@ -49,7 +49,7 @@ index 3c7b4d8..19ea87a 100644
4949
} else if (current_cpu == "mipsel" && !is_nacl) {
5050
ldflags += [ "-Wl,--hash-style=sysv" ]
5151
if (custom_toolchain == "") {
52-
@@ -1201,9 +1190,6 @@ config("compiler_cpu_abi") {
52+
@@ -1207,9 +1196,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 3c7b4d8..19ea87a 100644
5959
}
6060
} else {
6161
cflags += [ "-EL" ]
62-
@@ -1283,8 +1269,6 @@ config("compiler_cpu_abi") {
62+
@@ -1289,8 +1275,6 @@ config("compiler_cpu_abi") {
6363
ldflags += [ "-Wl,--hash-style=sysv" ]
6464
if (custom_toolchain == "") {
6565
if (is_clang) {
@@ -68,7 +68,7 @@ index 3c7b4d8..19ea87a 100644
6868
} else {
6969
cflags += [ "-EB" ]
7070
ldflags += [ "-EB" ]
71-
@@ -1332,9 +1316,6 @@ config("compiler_cpu_abi") {
71+
@@ -1338,9 +1322,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 3c7b4d8..19ea87a 100644
7878
}
7979
} else {
8080
cflags += [
81-
@@ -1392,8 +1373,6 @@ config("compiler_cpu_abi") {
81+
@@ -1398,8 +1379,6 @@ config("compiler_cpu_abi") {
8282
ldflags += [ "-Wl,--hash-style=sysv" ]
8383
if (custom_toolchain == "") {
8484
if (is_clang) {
@@ -87,7 +87,7 @@ index 3c7b4d8..19ea87a 100644
8787
} else {
8888
cflags += [
8989
"-EB",
90-
@@ -1556,23 +1535,6 @@ config("compiler_deterministic") {
90+
@@ -1562,23 +1541,6 @@ config("compiler_deterministic") {
9191
}
9292
}
9393
}

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 a28da02..c32fd9e 100644
32+
index a25b6f2..abc441f 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2181,6 +2181,7 @@ template("run_torque") {
35+
@@ -2200,6 +2200,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-
@@ -2338,6 +2339,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2357,6 +2358,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-
@@ -2377,6 +2379,7 @@ template("run_mksnapshot") {
51+
@@ -2396,6 +2398,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-
@@ -7165,6 +7168,7 @@ if (v8_enable_i18n_support) {
59+
@@ -7221,6 +7224,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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ 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 19ea87a..e923392 100644
16+
index bd7dd25..c1183ff 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1821,6 +1821,11 @@ config("default_warnings") {
20-
cflags += [
21-
"-Wenum-compare-conditional",
19+
@@ -1872,6 +1872,11 @@ config("default_warnings") {
20+
}
2221

22+
cflags += [
2323
+ # Disable unknown warnings, since system clang may not have
2424
+ # backported newer warning yet unlike internal clang that
2525
+ # chromium uses.

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 a989a35..a94c7de 100644
21+
index 25356ec..b19314f 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1126,7 +1126,9 @@ component("base") {
24+
@@ -1131,7 +1131,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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ 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 e923392..41b5a94 100644
20+
index 83d2298..00894fe 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
2323
@@ -613,24 +613,6 @@ config("compiler") {

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 5f17171..d90a7e0 100644
24+
index e639905..62279fc 100644
2525
--- a/build/config/clang/BUILD.gn
2626
+++ b/build/config/clang/BUILD.gn
27-
@@ -147,14 +147,15 @@ template("clang_lib") {
27+
@@ -156,14 +156,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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
2323
4 files changed, 51 insertions(+), 18 deletions(-)
2424

2525
diff --git a/build/config/rust.gni b/build/config/rust.gni
26-
index 9b0ee75..b2866b3 100644
26+
index 23d713b..7a10f5b 100644
2727
--- a/build/config/rust.gni
2828
+++ b/build/config/rust.gni
2929
@@ -98,6 +98,11 @@ declare_args() {
@@ -38,7 +38,7 @@ index 9b0ee75..b2866b3 100644
3838
}
3939

4040
# Use a separate declare_args so these variables' defaults can depend on the
41-
@@ -196,12 +201,19 @@ if (enable_rust) {
41+
@@ -193,12 +198,19 @@ if (enable_rust) {
4242
# other toolchains.
4343
rust_abi_target = ""
4444
if (is_linux || is_chromeos) {
@@ -61,7 +61,7 @@ index 9b0ee75..b2866b3 100644
6161
} else if (current_cpu == "arm") {
6262
if (arm_float_abi == "hard") {
6363
float_suffix = "hf"
64-
@@ -210,13 +222,13 @@ if (is_linux || is_chromeos) {
64+
@@ -207,13 +219,13 @@ if (is_linux || is_chromeos) {
6565
}
6666
if (arm_arch == "armv7-a" || arm_arch == "armv7") {
6767
# No way to inform Rust about the -a suffix.

0 commit comments

Comments
 (0)