Skip to content

Commit 0dad36d

Browse files
MaxIhlenfeldtMaxIhlenfeldt
authored
chromium: Update to 131.0.6778.85 (#852)
chromium: Update to 131.0.6778.85 Fixes #848. Release notes: https://chromereleases.googleblog.com/2024/11/stable-channel-update-for-desktop_12.html https://chromereleases.googleblog.com/2024/11/stable-channel-update-for-desktop_19.html Build and patch changes: ------------------------ Add a patch to remporarily revert an upstream change that increases the minimum supported Rust version to 1.78, as Scarthgap currently only has 1.75. Once meta-lts-mixins has a scarthgap/rust branch, we can drop that patch again. Rebase remaining patches. License changes: ---------------- Added licenses: * third_party/android_deps/libs/org_jspecify_jspecify/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5898977 * third_party/devtools-frontend/src/front_end/third_party/json5/LICENSE - https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5920841 * third_party/ink/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5530802 * third_party/ink_stroke_modeler/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5530867 Removed licenses: * third_party/catapult/third_party/httplib2/LICENSE - https://chromium-review.googlesource.com/c/catapult/+/5858365 Updated licenses: None. Test-built (big thanks to @SoumyaWind): --------------------------------------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64 - styhead, clang, MACHINE=raspberrypi4-64 - scarthgap, clang, MACHINE=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 <max@igalia.com>
1 parent 68e8cbf commit 0dad36d

16 files changed

+140
-36
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ SRC_URI += "\
2727
file://0010-Don-t-require-profiler_builtins.rlib.patch \
2828
file://0011-Disable-crabbyavif-to-fix-build-errors.patch \
2929
file://0012-Revert-Allow-and-use-std-hardware_destructive_interf.patch \
30+
file://0013-Revert-Tell-rustc-that-we-will-always-be-providing-c.patch \
3031
"
3132
# ARM/AArch64-specific patches.
3233
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/chromium-ozone-wayland_130.0.6723.91.bb‎ renamed to ‎meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_131.0.6778.85.bb‎

File renamed without changes.

‎meta-chromium/recipes-browser/chromium/chromium-x11_130.0.6723.91.bb‎ renamed to ‎meta-chromium/recipes-browser/chromium/chromium-x11_131.0.6778.85.bb‎

File renamed without changes.

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

Lines changed: 5 additions & 2 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] = "c2f13de70f2dcf61c930dcfe54ee118e584962afd03ecde19e3be48b3d86bec0"
7+
SRC_URI[sha256sum] = "a1ebe952c8709148b032a218fd671afb9bb4fa83fd0249895bd36bf32b194ecd"
88

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

@@ -160,6 +160,7 @@ LIC_FILES_CHKSUM = "\
160160
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
161161
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
162162
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
163+
file://${S}/third_party/android_deps/libs/org_jspecify_jspecify/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
163164
file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
164165
file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
165166
file://${S}/third_party/android_provider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -203,7 +204,6 @@ LIC_FILES_CHKSUM = "\
203204
file://${S}/third_party/catapult/third_party/flot/LICENSE.txt;md5=5bc600a435aadbd7dcde045ccb3208bf \
204205
file://${S}/third_party/catapult/third_party/google-auth/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
205206
file://${S}/third_party/catapult/third_party/gsutil/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
206-
file://${S}/third_party/catapult/third_party/httplib2/LICENSE;md5=56e5e931172b6164b62dc7c4aba6c8cf \
207207
file://${S}/third_party/catapult/third_party/ijson/LICENSE.txt;md5=2809bd5857eee6be054555222fd89712 \
208208
file://${S}/third_party/catapult/third_party/oauth2client/LICENSE;md5=88f599f710b9d48dad0929ebd090fc1a \
209209
file://${S}/third_party/catapult/third_party/pipeline/LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c \
@@ -255,6 +255,7 @@ LIC_FILES_CHKSUM = "\
255255
file://${S}/third_party/devtools-frontend/src/front_end/third_party/diff/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
256256
file://${S}/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
257257
file://${S}/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE;md5=913015c0e75ff89ef9461fadca555f65 \
258+
file://${S}/third_party/devtools-frontend/src/front_end/third_party/json5/LICENSE;md5=d80f2808a405d641840b50a06f80e93c \
258259
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
259260
file://${S}/third_party/devtools-frontend/src/front_end/third_party/lit/LICENSE;md5=4b390b7b932ca7872d1de2c834797cad \
260261
file://${S}/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE;md5=449f8b1cf0bfef1e5ec7824a4179ac6f \
@@ -300,6 +301,8 @@ LIC_FILES_CHKSUM = "\
300301
file://${S}/third_party/iaccessible2/LICENSE;md5=43bbd0bfb581347ec10def720000a645 \
301302
file://${S}/third_party/iccjpeg/LICENSE;md5=26834d132689a03abf860f4572705494 \
302303
file://${S}/third_party/icu/LICENSE;md5=08dc3852df8fffa807301902ad899ff8 \
304+
file://${S}/third_party/ink/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
305+
file://${S}/third_party/ink_stroke_modeler/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
303306
file://${S}/third_party/inspector_protocol/LICENSE;md5=db90dcb101891a7285d25f2fbceca752 \
304307
file://${S}/third_party/ipcz/LICENSE;md5=1649e1dc663940b442197bd7f99cd228 \
305308
file://${S}/third_party/isimpledom/LICENSE;md5=822502c0e010ccdbb6a3e681dd47888e \

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1919
1 file changed, 48 deletions(-)
2020

2121
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index 765345a..19b7912 100644
22+
index f162751..356a8d4 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -1216,27 +1216,6 @@ config("compiler_cpu_abi") {
25+
@@ -1219,27 +1219,6 @@ config("compiler_cpu_abi") {
2626
"-msse3",
2727
]
2828
}
@@ -50,7 +50,7 @@ index 765345a..19b7912 100644
5050
} else if (current_cpu == "mipsel" && !is_nacl) {
5151
ldflags += [ "-Wl,--hash-style=sysv" ]
5252
if (custom_toolchain == "") {
53-
@@ -1244,9 +1223,6 @@ config("compiler_cpu_abi") {
53+
@@ -1247,9 +1226,6 @@ config("compiler_cpu_abi") {
5454
if (is_android) {
5555
cflags += [ "--target=mipsel-linux-android" ]
5656
ldflags += [ "--target=mipsel-linux-android" ]
@@ -60,7 +60,7 @@ index 765345a..19b7912 100644
6060
}
6161
} else {
6262
cflags += [ "-EL" ]
63-
@@ -1326,8 +1302,6 @@ config("compiler_cpu_abi") {
63+
@@ -1329,8 +1305,6 @@ config("compiler_cpu_abi") {
6464
ldflags += [ "-Wl,--hash-style=sysv" ]
6565
if (custom_toolchain == "") {
6666
if (is_clang) {
@@ -69,7 +69,7 @@ index 765345a..19b7912 100644
6969
} else {
7070
cflags += [ "-EB" ]
7171
ldflags += [ "-EB" ]
72-
@@ -1375,9 +1349,6 @@ config("compiler_cpu_abi") {
72+
@@ -1378,9 +1352,6 @@ config("compiler_cpu_abi") {
7373
if (is_android) {
7474
cflags += [ "--target=mips64el-linux-android" ]
7575
ldflags += [ "--target=mips64el-linux-android" ]
@@ -79,7 +79,7 @@ index 765345a..19b7912 100644
7979
}
8080
} else {
8181
cflags += [
82-
@@ -1435,8 +1406,6 @@ config("compiler_cpu_abi") {
82+
@@ -1438,8 +1409,6 @@ config("compiler_cpu_abi") {
8383
ldflags += [ "-Wl,--hash-style=sysv" ]
8484
if (custom_toolchain == "") {
8585
if (is_clang) {
@@ -88,7 +88,7 @@ index 765345a..19b7912 100644
8888
} else {
8989
cflags += [
9090
"-EB",
91-
@@ -1605,23 +1574,6 @@ config("compiler_deterministic") {
91+
@@ -1608,23 +1577,6 @@ config("compiler_deterministic") {
9292
}
9393
}
9494
}

‎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 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 87b2129..384ca1c 100644
32+
index 38a9a9a..367c354 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2237,6 +2237,7 @@ template("run_torque") {
35+
@@ -2265,6 +2265,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-
@@ -2400,6 +2401,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2428,6 +2429,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-
@@ -2472,6 +2474,7 @@ template("run_mksnapshot") {
51+
@@ -2500,6 +2502,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-
@@ -7436,6 +7439,7 @@ if (v8_enable_i18n_support) {
59+
@@ -7446,6 +7449,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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ 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 19b7912..6b15c5b 100644
16+
index 356a8d4..e348888 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
1919
@@ -1902,6 +1902,11 @@ config("default_warnings") {

‎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 <Randy.MacLeod@windriver.com>
1818
2 files changed, 4 insertions(+)
1919

2020
diff --git a/base/BUILD.gn b/base/BUILD.gn
21-
index 9247e9b..7b01f13 100644
21+
index 4c0e464..1cf04ea 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1101,7 +1101,9 @@ component("base") {
24+
@@ -1097,7 +1097,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 <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 6b15c5b..5448810 100644
20+
index e348888..a47fbdb 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
2323
@@ -584,24 +584,6 @@ config("compiler") {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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 cc7d0d3..01dcf44 100644
17+
index fa1a06b..8e1fe01 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 {

0 commit comments

Comments
 (0)