Skip to content

Commit d3a5f63

Browse files
chromium: Update to 122.0.6261.128 (#803)
Fixes #795. Release notes: https://chromereleases.googleblog.com/2024/02/stable-channel-update-for-desktop_20.html https://chromereleases.googleblog.com/2024/02/stable-channel-update-for-desktop_22.html https://chromereleases.googleblog.com/2024/02/stable-channel-update-for-desktop_27.html https://chromereleases.googleblog.com/2024/03/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2024/03/stable-channel-update-for-desktop_12.html Build and patch changes: ------------------------ Drop six backported patches that are included upstream now. Drop arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch as it was only needed to fix a build error with clang < 17, which we don't support any more. Rebase remaining patches and renumber remaining ARM patches. License changes: ---------------- Added licenses: * third_party/coremltools/mlmodel/format/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5108678 * third_party/node/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5136956 * third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/etc_decoder/LICENSE, third_party/angle/src/third_party/libXNVCtrl/LICENSE, third_party/angle/src/third_party/volk/LICENSE.md, third_party/angle/third_party/android_system_sdk/LICENSE, third_party/angle/third_party/flatbuffers/LICENSE, third_party/catapult/experimental/trace_on_tap/third_party/pako/LICENSE, third_party/catapult/third_party/Paste/docs/license.txt, third_party/catapult/third_party/WebOb/docs/license.txt, third_party/catapult/third_party/apiclient/LICENSE, third_party/catapult/third_party/cachetools/LICENSE, third_party/catapult/third_party/chardet/LICENSE, third_party/catapult/third_party/cloudstorage/COPYING, third_party/catapult/third_party/coverage/LICENSE.txt, third_party/catapult/third_party/flot/LICENSE.txt, third_party/catapult/third_party/google-auth/LICENSE, third_party/catapult/third_party/gsutil/LICENSE, third_party/catapult/third_party/html5lib-python/LICENSE, third_party/catapult/third_party/httplib2/LICENSE, third_party/catapult/third_party/ijson/LICENSE.txt, third_party/catapult/third_party/oauth2client/LICENSE, third_party/catapult/third_party/polymer/LICENSE.polymer, third_party/catapult/third_party/polymer2/LICENSE.polymer, third_party/catapult/third_party/polymer3/LICENSE.polymer, third_party/catapult/third_party/pyfakefs/COPYING, third_party/catapult/third_party/pyparsing/LICENSE, third_party/catapult/third_party/python_gflags/COPYING, third_party/catapult/third_party/redux/LICENSE.md, third_party/catapult/third_party/requests_toolbelt/LICENSE, third_party/catapult/third_party/six/LICENSE, third_party/catapult/third_party/typ/LICENSE, third_party/catapult/third_party/vinn/third_party/v8/LICENSE, third_party/catapult/third_party/vinn/third_party/v8/LICENSE.strongtalk, third_party/catapult/third_party/vinn/third_party/v8/LICENSE.v8, third_party/catapult/third_party/vinn/third_party/v8/LICENSE.valgrind, third_party/catapult/third_party/webapp2/LICENSE, third_party/catapult/tracing/third_party/jpeg-js/LICENSE, third_party/catapult/tracing/third_party/oboe/LICENCE, third_party/catapult/tracing/third_party/pako/LICENSE, third_party/chromevox/third_party/closure-library/LICENSE, third_party/chromevox/third_party/sre/LICENSE, third_party/crashpad/crashpad/third_party/getopt/LICENSE, third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE, third_party/dawn/third_party/khronos/LICENSE, third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE, third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE, third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data/package/LICENSE.md, third_party/google_input_tools/third_party/closure_library/LICENSE, third_party/openscreen/src/third_party/protobuf/LICENSE, third_party/openscreen/src/third_party/tinycbor/src/LICENSE, third_party/openscreen/src/third_party/zlib/LICENSE, third_party/pdfium/third_party/fp16/LICENSE, third_party/pdfium/third_party/freetype/FTL.TXT, third_party/screen-ai/LICENSE, third_party/selenium-atoms/LICENSE.closure, third_party/selenium-atoms/LICENSE.sizzle, third_party/selenium-atoms/LICENSE.wgxpath, third_party/swiftshader/third_party/SPIRV-Headers/LICENSE, third_party/swiftshader/third_party/SPIRV-Tools/LICENSE, third_party/webrtc/common_audio/third_party/ooura/LICENSE, third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE, third_party/webrtc/modules/third_party/portaudio/LICENSE, third_party/webrtc/rtc_base/third_party/sigslot/LICENSE, - https://chromium-review.googlesource.com/c/chromium/src/+/5061468 Removed licenses: * third_party/gvr-android-sdk/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5128757 * third_party/nasm/LICENSE - Removed due to being marked as not shipped. Updated licenses: * chrome/installer/mac/third_party/xz/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5289735 * third_party/libxml/src/Copyright - https://chromium-review.googlesource.com/c/chromium/src/+/5140988 Test-built (big thanks to @rjanani-p): -------------------------------------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64, raspberrypi4-64 - nanbield, clang, MACHINE=qemuarm64, qemux86-64 * chromium-x11: - master, clang, MACHINE=qemuarm, qemuarm64, qemux86-64 - nanbield, clang, MACHINE=qemuarm, qemuarm64, qemux86-64, raspberrypi4-64 Signed-off-by: Max Ihlenfeldt <[email protected]>
1 parent 81d037b commit d3a5f63

25 files changed

+121
-520
lines changed

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,7 @@ B = "${S}/${OUTPUT_DIR}"
1212

1313
# Backported patches.
1414
SRC_URI += "\
15-
file://backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch \
16-
file://backport/IWYU-for-content-browser-generic_sensor-fra.patch \
17-
file://backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch \
1815
file://backport/Make-toolchain_supports_rust_thin_lto-configurable.patch \
19-
file://backport/six-Update-vendored-copy-of-six-to-1.16.0.patch \
20-
file://backport/ToTLinux-Fix-some-narrowing-errors.patch \
21-
file://backport/Update-LegacyStatsCollector-to-conform-with.patch \
2216
"
2317
# Non-specific patches.
2418
SRC_URI += "\
@@ -36,9 +30,8 @@ SRC_URI += "\
3630
# ARM/AArch64-specific patches.
3731
SRC_URI:append:arm = "\
3832
file://arm/0001-BUILD-do-not-specify-march-on-arm.patch \
39-
file://arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch \
4033
"
41-
SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0003-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"
34+
SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"
4235

4336
# musl-specific patches.
4437
SRC_URI:append:libc-musl = "\

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

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

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 de1cd6e..38b8167 100644
24+
index 89b4755..f7ba313 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
27-
@@ -1175,11 +1175,6 @@ config("compiler_cpu_abi") {
27+
@@ -1174,11 +1174,6 @@ config("compiler_cpu_abi") {
2828
]
2929
}
3030
} else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index de1cd6e..38b8167 100644
3636
if (!is_nacl) {
3737
cflags += [
3838
"-march=$arm_arch",
39-
@@ -1189,12 +1184,6 @@ config("compiler_cpu_abi") {
39+
@@ -1188,12 +1183,6 @@ config("compiler_cpu_abi") {
4040
if (arm_tune != "") {
4141
cflags += [ "-mtune=$arm_tune" ]
4242
}
@@ -49,7 +49,7 @@ index de1cd6e..38b8167 100644
4949
} else if (current_cpu == "mipsel" && !is_nacl) {
5050
ldflags += [ "-Wl,--hash-style=sysv" ]
5151
if (custom_toolchain == "") {
52-
@@ -1202,9 +1191,6 @@ config("compiler_cpu_abi") {
52+
@@ -1201,9 +1190,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 de1cd6e..38b8167 100644
5959
}
6060
} else {
6161
cflags += [ "-EL" ]
62-
@@ -1284,8 +1270,6 @@ config("compiler_cpu_abi") {
62+
@@ -1283,8 +1269,6 @@ config("compiler_cpu_abi") {
6363
ldflags += [ "-Wl,--hash-style=sysv" ]
6464
if (custom_toolchain == "") {
6565
if (is_clang) {
@@ -68,7 +68,7 @@ index de1cd6e..38b8167 100644
6868
} else {
6969
cflags += [ "-EB" ]
7070
ldflags += [ "-EB" ]
71-
@@ -1333,9 +1317,6 @@ config("compiler_cpu_abi") {
71+
@@ -1332,9 +1316,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 de1cd6e..38b8167 100644
7878
}
7979
} else {
8080
cflags += [
81-
@@ -1393,8 +1374,6 @@ config("compiler_cpu_abi") {
81+
@@ -1392,8 +1373,6 @@ config("compiler_cpu_abi") {
8282
ldflags += [ "-Wl,--hash-style=sysv" ]
8383
if (custom_toolchain == "") {
8484
if (is_clang) {
@@ -87,7 +87,7 @@ index de1cd6e..38b8167 100644
8787
} else {
8888
cflags += [
8989
"-EB",
90-
@@ -1557,23 +1536,6 @@ config("compiler_deterministic") {
90+
@@ -1556,23 +1535,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 52504f4..40425d6 100644
2929
"root_out_dir") +
3030
"/v8_context_snapshot_generator",
3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index f0976f9..99304bb 100644
32+
index bc087fd..f5b0f48 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2162,6 +2162,7 @@ template("run_torque") {
35+
@@ -2169,6 +2169,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-
@@ -2319,6 +2320,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2326,6 +2327,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-
@@ -2358,6 +2360,7 @@ template("run_mksnapshot") {
51+
@@ -2365,6 +2367,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-
@@ -7097,6 +7100,7 @@ if (v8_enable_i18n_support) {
59+
@@ -7134,6 +7137,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: 2 additions & 2 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 38b8167..93c9bfc 100644
16+
index f7ba313..ce7b6dd 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1819,6 +1819,11 @@ config("default_warnings") {
19+
@@ -1818,6 +1818,11 @@ config("default_warnings") {
2020
cflags += [
2121
"-Wenum-compare-conditional",
2222

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 3d538b3..a7f353b 100644
21+
index c00c41b..7d32eb4 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1098,7 +1098,9 @@ component("base") {
24+
@@ -1118,7 +1118,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 93c9bfc..94e40fa 100644
20+
index ce7b6dd..028ba52 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -616,24 +616,6 @@ config("compiler") {
23+
@@ -618,24 +618,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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
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 fa577620509c8..f2bd0d075b846 100644
17+
index fa57762..f2bd0d0 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: 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 d4de2e0..0dd4d3b 100644
24+
index d3054d1..bdc13fb 100644
2525
--- a/build/config/clang/BUILD.gn
2626
+++ b/build/config/clang/BUILD.gn
27-
@@ -128,14 +128,15 @@ template("clang_lib") {
27+
@@ -121,14 +121,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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
2323
4 files changed, 54 insertions(+), 17 deletions(-)
2424

2525
diff --git a/build/config/rust.gni b/build/config/rust.gni
26-
index 814c455..c6b675d 100644
26+
index e98d913..6213b72 100644
2727
--- a/build/config/rust.gni
2828
+++ b/build/config/rust.gni
29-
@@ -76,6 +76,11 @@ declare_args() {
29+
@@ -87,6 +87,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
@@ -38,7 +38,7 @@ index 814c455..c6b675d 100644
3838
}
3939

4040
# Use a separate declare_args so these variables' defaults can depend on the
41-
@@ -185,12 +190,19 @@ if (enable_rust) {
41+
@@ -196,12 +201,19 @@ if (enable_rust) {
4242
# other toolchains.
4343
rust_abi_target = ""
4444
if (is_linux || is_chromeos) {
@@ -61,7 +61,7 @@ index 814c455..c6b675d 100644
6161
} else if (current_cpu == "arm") {
6262
if (arm_float_abi == "hard") {
6363
float_suffix = "hf"
64-
@@ -199,13 +211,13 @@ if (is_linux || is_chromeos) {
64+
@@ -210,13 +222,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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
1414
1 file changed, 1 deletion(-)
1515

1616
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
17-
index 77f4b8c..3078de8 100644
17+
index 8a25798..2d284e6 100644
1818
--- a/build/rust/std/BUILD.gn
1919
+++ b/build/rust/std/BUILD.gn
2020
@@ -100,7 +100,6 @@ if (toolchain_has_rust) {

meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <[email protected]>
1919
1 file changed, 10 deletions(-)
2020

2121
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index 94e40fa..72088cf 100644
22+
index 028ba52..f18ea0a 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -1149,16 +1149,6 @@ config("compiler_cpu_abi") {
25+
@@ -1155,16 +1155,6 @@ config("compiler_cpu_abi") {
2626
"-msse3",
2727
]
2828
}

meta-chromium/recipes-browser/chromium/files/arm/0003-Fix-AES-crypto-SIGILL-on-rpi4-64.patch renamed to meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <[email protected]>
1515
1 file changed, 1 insertion(+), 1 deletion(-)
1616

1717
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
18-
index bd39797..2bc84d6 100644
18+
index e342a39..1410489 100644
1919
--- a/third_party/boringssl/BUILD.gn
2020
+++ b/third_party/boringssl/BUILD.gn
21-
@@ -120,7 +120,7 @@ if (enable_rust_boringssl) {
21+
@@ -113,7 +113,7 @@ if (enable_rust_boringssl) {
2222
}
2323
}
2424

meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch

Lines changed: 0 additions & 45 deletions
This file was deleted.

meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch

Lines changed: 0 additions & 27 deletions
This file was deleted.

meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-content-browser-generic_sensor-fra.patch

Lines changed: 0 additions & 28 deletions
This file was deleted.

meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)