From 2c4777ba13ca39382cc59316360f0a6a5bdc8e54 Mon Sep 17 00:00:00 2001 From: Max Ihlenfeldt Date: Mon, 17 Jun 2024 11:40:23 +0000 Subject: [PATCH] chromium: Update to 125.0.6422.141 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 --- .../recipes-browser/chromium/chromium-gn.inc | 1 - ... chromium-ozone-wayland_125.0.6422.141.bb} | 0 ....207.bb => chromium-x11_125.0.6422.141.bb} | 0 .../recipes-browser/chromium/chromium.inc | 9 ++++--- ...ttings-done-for-clang-that-conflict-.patch | 20 +++++++------- .../chromium/files/0002-v8-qemu-wrapper.patch | 10 +++---- ...options-not-available-in-release-ver.patch | 10 +++---- ...ink-latomic-failure-on-CentOS-8-host.patch | 4 +-- ...0006-Don-t-pass-unknown-LLVM-options.patch | 4 +-- ...rrect-path-to-libclang_rt.builtins.a.patch | 4 +-- ...9-Adjust-the-Rust-build-to-our-needs.patch | 18 ++++++------- ...Don-t-require-profiler_builtins.rlib.patch | 2 +- ...01-BUILD-do-not-specify-march-on-arm.patch | 4 +-- ...002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch | 4 +-- ...sing-components-enterprise-buildflag.patch | 14 +++++----- ...age-Add-missing-dep-to-cr_components.patch | 27 ------------------- ...367.207.bb => gn-native_125.0.6422.141.bb} | 0 17 files changed, 53 insertions(+), 78 deletions(-) rename meta-chromium/recipes-browser/chromium/{chromium-ozone-wayland_124.0.6367.207.bb => chromium-ozone-wayland_125.0.6422.141.bb} (100%) rename meta-chromium/recipes-browser/chromium/{chromium-x11_124.0.6367.207.bb => chromium-x11_125.0.6422.141.bb} (100%) delete mode 100644 meta-chromium/recipes-browser/chromium/files/backport/NewTabPage-Add-missing-dep-to-cr_components.patch rename meta-chromium/recipes-browser/chromium/{gn-native_124.0.6367.207.bb => gn-native_125.0.6422.141.bb} (100%) diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc index 0ca91f5f1..64ff5609f 100644 --- a/meta-chromium/recipes-browser/chromium/chromium-gn.inc +++ b/meta-chromium/recipes-browser/chromium/chromium-gn.inc @@ -13,7 +13,6 @@ B = "${S}/${OUTPUT_DIR}" # Backported patches. SRC_URI += "\ file://backport/Add-missing-components-enterprise-buildflag.patch \ - file://backport/NewTabPage-Add-missing-dep-to-cr_components.patch \ " # Non-specific patches. diff --git a/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_124.0.6367.207.bb b/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_125.0.6422.141.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_124.0.6367.207.bb rename to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_125.0.6422.141.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium-x11_124.0.6367.207.bb b/meta-chromium/recipes-browser/chromium/chromium-x11_125.0.6422.141.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-x11_124.0.6367.207.bb rename to meta-chromium/recipes-browser/chromium/chromium-x11_125.0.6422.141.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc index e515f3fd0..bc00036c5 100644 --- a/meta-chromium/recipes-browser/chromium/chromium.inc +++ b/meta-chromium/recipes-browser/chromium/chromium.inc @@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home" CVE_PRODUCT = "chromium:chromium google:chrome" SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz" -SRC_URI[sha256sum] = "6d6dc8b943012573a244ddb013b281ecbc97f77fe1fc6f55a4118241d107eba5" +SRC_URI[sha256sum] = "9966b50279d0cfaaf4b58570387f0d526388f8d5f6dd990e3f083a55d8d8e603" S = "${WORKDIR}/chromium-${PV}" @@ -214,6 +214,9 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/axe-core/LICENSE;md5=f27a50d2e878867827842f2c60e30bfc \ file://${S}/third_party/beto-core/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \ file://${S}/third_party/bidimapper/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \ + file://${S}/third_party/bidimapper/licenses/LICENSE.mitt;md5=4ed316158806c1e39b6b6e457c85b10f \ + file://${S}/third_party/bidimapper/licenses/LICENSE.urlpattern_polyfill;md5=ea10d22371bd2e01c25f274ce6b4e072 \ + file://${S}/third_party/bidimapper/licenses/LICENSE.zod;md5=7aa01d261c2ac4ca667875e22474c798 \ file://${S}/third_party/blink/LICENSE_FOR_ABOUT_CREDITS;md5=11e90d553b211de885f245900c4ccf89 \ file://${S}/third_party/boringssl/src/LICENSE;md5=2ca501bc96ce9ed0814e2c592c3f9593 \ file://${S}/third_party/boringssl/src/third_party/fiat/LICENSE;md5=8eb8c1cdeb53faab99e4673182bed9f7 \ @@ -323,7 +326,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/hyphenation-patterns/LICENSE;md5=23d9bd4878e6f3669ed39b2095b01c13 \ file://${S}/third_party/iaccessible2/LICENSE;md5=43bbd0bfb581347ec10def720000a645 \ file://${S}/third_party/iccjpeg/LICENSE;md5=26834d132689a03abf860f4572705494 \ - file://${S}/third_party/icu/LICENSE;md5=80c2cf39ad8ae12b9b9482a1737c6650 \ + file://${S}/third_party/icu/LICENSE;md5=08dc3852df8fffa807301902ad899ff8 \ file://${S}/third_party/inspector_protocol/LICENSE;md5=db90dcb101891a7285d25f2fbceca752 \ file://${S}/third_party/ipcz/LICENSE;md5=1649e1dc663940b442197bd7f99cd228 \ file://${S}/third_party/isimpledom/LICENSE;md5=822502c0e010ccdbb6a3e681dd47888e \ @@ -332,6 +335,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/jstemplate/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/jszip/LICENSE;md5=401d270383d75b05d76fc13fc1750765 \ file://${S}/third_party/khronos/LICENSE;md5=1d2ef853a9ae7ace4e16fda0d48f597b \ + file://${S}/third_party/lens_server_proto/LICENSE;md5=57b69a83c4a9b2401aa4de147cb22bd4 \ file://${S}/third_party/leveldatabase/src/LICENSE;md5=92d1b128950b11ba8495b64938fc164d \ file://${S}/third_party/libaddressinput/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/libaom/source/libaom/LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \ @@ -412,7 +416,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/ruy/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/selenium-atoms/LICENSE;md5=5cd827bdaf8605a596a7ac9dcf808ea1 \ - file://${S}/third_party/selenium-atoms/LICENSE.closure;md5=e23fadd6ceef8c618fc1c65191d846fa \ file://${S}/third_party/selenium-atoms/LICENSE.sizzle;md5=7a9495742f21b7624515e120b720cc65 \ file://${S}/third_party/selenium-atoms/LICENSE.wgxpath;md5=73a4131394317651a4370c0507a9ccb5 \ file://${S}/third_party/sentencepiece/LICENSE;md5=5cb9ee2840d20280145e929f30f32060 \ diff --git a/meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch b/meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch index 95ba1ad4a..b27d358a5 100644 --- a/meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch +++ b/meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch @@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod 1 file changed, 38 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index bd7dd25..83d2298 100644 +index 973d8bc..8165472 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1180,11 +1180,6 @@ config("compiler_cpu_abi") { +@@ -1198,11 +1198,6 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -36,7 +36,7 @@ index bd7dd25..83d2298 100644 if (!is_nacl) { cflags += [ "-march=$arm_arch", -@@ -1194,12 +1189,6 @@ config("compiler_cpu_abi") { +@@ -1212,12 +1207,6 @@ config("compiler_cpu_abi") { if (arm_tune != "") { cflags += [ "-mtune=$arm_tune" ] } @@ -49,7 +49,7 @@ index bd7dd25..83d2298 100644 } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { -@@ -1207,9 +1196,6 @@ config("compiler_cpu_abi") { +@@ -1225,9 +1214,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -59,7 +59,7 @@ index bd7dd25..83d2298 100644 } } else { cflags += [ "-EL" ] -@@ -1289,8 +1275,6 @@ config("compiler_cpu_abi") { +@@ -1307,8 +1293,6 @@ config("compiler_cpu_abi") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) { @@ -68,7 +68,7 @@ index bd7dd25..83d2298 100644 } else { cflags += [ "-EB" ] ldflags += [ "-EB" ] -@@ -1338,9 +1322,6 @@ config("compiler_cpu_abi") { +@@ -1356,9 +1340,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -78,7 +78,7 @@ index bd7dd25..83d2298 100644 } } else { cflags += [ -@@ -1398,8 +1379,6 @@ config("compiler_cpu_abi") { +@@ -1416,8 +1397,6 @@ config("compiler_cpu_abi") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) { @@ -87,14 +87,14 @@ index bd7dd25..83d2298 100644 } else { cflags += [ "-EB", -@@ -1562,23 +1541,6 @@ config("compiler_deterministic") { +@@ -1580,23 +1559,6 @@ config("compiler_deterministic") { } } } - - # Tells the compiler not to use absolute paths when passing the default - # paths to the tools it invokes. We don't want this because we don't -- # really need it and it can mess up the goma cache entries. +- # really need it and it can mess up the RBE cache entries. - if (is_clang && (!is_nacl || is_nacl_saigo)) { - cflags += [ "-no-canonical-prefixes" ] - @@ -102,7 +102,7 @@ index bd7dd25..83d2298 100644 - # with a relative path and pass relative paths to built-in - # libraries. Not needed on Windows because we call the linker - # directly there, not through the compiler driver. -- # We don't link on goma, so this change is just for cleaner +- # We don't link on RBE, so this change is just for cleaner - # internal linker invocations, for people who work on the build. - if (!is_win) { - ldflags += [ "-no-canonical-prefixes" ] diff --git a/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch b/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch index 93a14c877..355d5573c 100644 --- a/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch +++ b/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch @@ -29,10 +29,10 @@ index 6b38d3f..7771a69 100644 "root_out_dir") + "/v8_context_snapshot_generator", diff --git a/v8/BUILD.gn b/v8/BUILD.gn -index a25b6f2..abc441f 100644 +index 79b95fb..1e9862d 100644 --- a/v8/BUILD.gn +++ b/v8/BUILD.gn -@@ -2200,6 +2200,7 @@ template("run_torque") { +@@ -2214,6 +2214,7 @@ template("run_torque") { } args = [ @@ -40,7 +40,7 @@ index a25b6f2..abc441f 100644 "./" + rebase_path( get_label_info(":torque($toolchain)", "root_out_dir") + "/torque", root_build_dir), -@@ -2357,6 +2358,7 @@ action("generate_bytecode_builtins_list") { +@@ -2371,6 +2372,7 @@ action("generate_bytecode_builtins_list") { outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ] deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ] args = [ @@ -48,7 +48,7 @@ index a25b6f2..abc441f 100644 "./" + rebase_path( get_label_info( ":bytecode_builtins_list_generator($v8_generator_toolchain)", -@@ -2396,6 +2398,7 @@ template("run_mksnapshot") { +@@ -2410,6 +2412,7 @@ template("run_mksnapshot") { data = [] args = [ @@ -56,7 +56,7 @@ index a25b6f2..abc441f 100644 "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", "root_out_dir") + "/mksnapshot", root_build_dir), -@@ -7221,6 +7224,7 @@ if (v8_enable_i18n_support) { +@@ -7251,6 +7254,7 @@ if (v8_enable_i18n_support) { outputs = [ output_file ] args = [ diff --git a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch index 83192db5b..ca5e4a59c 100644 --- a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch +++ b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch @@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod 1 file changed, 5 insertions(+) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index bd7dd25..c1183ff 100644 +index 973d8bc..0f2b8f6 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1872,6 +1872,11 @@ config("default_warnings") { +@@ -1893,6 +1893,11 @@ config("default_warnings") { } cflags += [ @@ -25,6 +25,6 @@ index bd7dd25..c1183ff 100644 + # chromium uses. + "-Wno-unknown-warning-option", + - # Ignore warnings about MSVC optimization pragmas. - # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662 - "-Wno-ignored-pragma-optimize", + # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now. + "-Wno-cast-function-type", + diff --git a/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch b/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch index 97ce58105..371c3c270 100644 --- a/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch +++ b/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch @@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod 2 files changed, 4 insertions(+) diff --git a/base/BUILD.gn b/base/BUILD.gn -index 25356ec..b19314f 100644 +index 5dc15da..2b83e1c 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1131,7 +1131,9 @@ component("base") { +@@ -1141,7 +1141,9 @@ component("base") { # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. diff --git a/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch b/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch index e80e56460..afbf525ec 100644 --- a/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch +++ b/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch @@ -17,10 +17,10 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 18 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 83d2298..00894fe 100644 +index 973d8bc..c0f6a49 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -613,24 +613,6 @@ config("compiler") { +@@ -610,24 +610,6 @@ config("compiler") { } } diff --git a/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch b/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch index 248c5785e..d1a939909 100644 --- a/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch +++ b/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch @@ -21,10 +21,10 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn -index e639905..62279fc 100644 +index 498b3eb..421c1d7 100644 --- a/build/config/clang/BUILD.gn +++ b/build/config/clang/BUILD.gn -@@ -156,14 +156,15 @@ template("clang_lib") { +@@ -165,14 +165,15 @@ template("clang_lib") { } else if (is_apple) { _dir = "darwin" } else if (is_linux || is_chromeos) { diff --git a/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch b/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch index e331102d0..6521bed4d 100644 --- a/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch +++ b/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch @@ -23,10 +23,10 @@ Signed-off-by: Max Ihlenfeldt 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/build/config/rust.gni b/build/config/rust.gni -index 23d713b..7a10f5b 100644 +index 59fa144..a6131a6 100644 --- a/build/config/rust.gni +++ b/build/config/rust.gni -@@ -98,6 +98,11 @@ declare_args() { +@@ -93,6 +93,11 @@ declare_args() { # a platform. Mostly applicable to Windows, where new versions can handle ANSI # escape sequences but it's not reliable in general. force_rustc_color_output = false @@ -38,7 +38,7 @@ index 23d713b..7a10f5b 100644 } # Use a separate declare_args so these variables' defaults can depend on the -@@ -193,12 +198,19 @@ if (enable_rust) { +@@ -188,12 +193,19 @@ if (enable_rust) { # other toolchains. rust_abi_target = "" if (is_linux || is_chromeos) { @@ -61,7 +61,7 @@ index 23d713b..7a10f5b 100644 } else if (current_cpu == "arm") { if (arm_float_abi == "hard") { float_suffix = "hf" -@@ -207,13 +219,13 @@ if (is_linux || is_chromeos) { +@@ -202,13 +214,13 @@ if (is_linux || is_chromeos) { } if (arm_arch == "armv7-a" || arm_arch == "armv7") { # No way to inform Rust about the -a suffix. @@ -91,10 +91,10 @@ index b8e490d..d22cf08 100755 abs_build_root = os.getcwd().replace('\\', '/') + '/' is_windows = sys.platform == 'win32' or args.target_windows diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn -index 9c3db1e..6d9b684 100644 +index b6d570d..7b7b213 100644 --- a/build/rust/std/BUILD.gn +++ b/build/rust/std/BUILD.gn -@@ -178,7 +178,8 @@ if (toolchain_has_rust) { +@@ -179,7 +179,8 @@ if (toolchain_has_rust) { # our locally-built std. Both reside in root_out_dir: we must only have one of # each per GN toolchain anyway. @@ -104,7 +104,7 @@ index 9c3db1e..6d9b684 100644 if (!rust_prebuilt_stdlib) { local_rustc_sysroot = "$root_out_dir/local_rustc_sysroot" -@@ -358,12 +359,12 @@ if (toolchain_has_rust) { +@@ -359,12 +360,12 @@ if (toolchain_has_rust) { rust_abi_target, ] @@ -120,7 +120,7 @@ index 9c3db1e..6d9b684 100644 } visibility = [ ":*" ] -@@ -376,8 +377,18 @@ if (toolchain_has_rust) { +@@ -377,8 +378,18 @@ if (toolchain_has_rust) { "enable_rust=false") deps = [ ":find_stdlib" ] sources = get_target_outputs(":find_stdlib") @@ -141,7 +141,7 @@ index 9c3db1e..6d9b684 100644 visibility = [ ":*" ] } -@@ -417,7 +428,10 @@ if (toolchain_has_rust) { +@@ -418,7 +429,10 @@ if (toolchain_has_rust) { ":prebuilt_stdlib_libs", ":stdlib_public_dependent_libs", ] diff --git a/meta-chromium/recipes-browser/chromium/files/0010-Don-t-require-profiler_builtins.rlib.patch b/meta-chromium/recipes-browser/chromium/files/0010-Don-t-require-profiler_builtins.rlib.patch index 334b3aa24..9c4b2effa 100644 --- a/meta-chromium/recipes-browser/chromium/files/0010-Don-t-require-profiler_builtins.rlib.patch +++ b/meta-chromium/recipes-browser/chromium/files/0010-Don-t-require-profiler_builtins.rlib.patch @@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 1 deletion(-) diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn -index 6d9b684..66206f5 100644 +index 7b7b213..e1f9e01 100644 --- a/build/rust/std/BUILD.gn +++ b/build/rust/std/BUILD.gn @@ -90,7 +90,6 @@ if (toolchain_has_rust) { diff --git a/meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch b/meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch index 17b471301..1b324bb93 100644 --- a/meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch +++ b/meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch @@ -19,10 +19,10 @@ Signed-off-by: Khem Raj 1 file changed, 10 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 00894fe..8b9b381 100644 +index 8165472..f0ffab2 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1161,16 +1161,6 @@ config("compiler_cpu_abi") { +@@ -1197,16 +1197,6 @@ config("compiler_cpu_abi") { "-msse3", ] } diff --git a/meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch b/meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch index 81c357f9a..eef195a1d 100644 --- a/meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch +++ b/meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-AES-crypto-SIGILL-on-rpi4-64.patch @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn -index feaef4b..a68973e 100644 +index f1b4a1a..7c972fe 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn -@@ -110,7 +110,7 @@ if (enable_rust) { +@@ -106,7 +106,7 @@ if (enable_rust) { } } diff --git a/meta-chromium/recipes-browser/chromium/files/backport/Add-missing-components-enterprise-buildflag.patch b/meta-chromium/recipes-browser/chromium/files/backport/Add-missing-components-enterprise-buildflag.patch index a787da67c..9d0807779 100644 --- a/meta-chromium/recipes-browser/chromium/files/backport/Add-missing-components-enterprise-buildflag.patch +++ b/meta-chromium/recipes-browser/chromium/files/backport/Add-missing-components-enterprise-buildflag.patch @@ -17,22 +17,22 @@ Signed-off-by: Max Ihlenfeldt 3 files changed, 3 insertions(+) diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn -index bf03e44..a85a30f 100644 +index 3f4e18b..3aa6e2f 100644 --- a/chrome/browser/devtools/BUILD.gn +++ b/chrome/browser/devtools/BUILD.gn -@@ -113,6 +113,7 @@ static_library("devtools") { +@@ -115,6 +115,7 @@ static_library("devtools") { "//chrome/browser/autofill:autofill", "//components/autofill/content/browser:browser", "//components/autofill/core/browser:browser", + "//components/enterprise/buildflags", "//components/paint_preview/buildflags:buildflags", - "//content/public/browser", - "//net", + "//components/variations/service:service", + "//components/webapps/common:common", diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index e488b14..32d0981 100644 +index 436fef5..b284112 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -862,6 +862,7 @@ static_library("extensions") { +@@ -865,6 +865,7 @@ static_library("extensions") { "//components/embedder_support", "//components/embedder_support:browser_util", "//components/enterprise", @@ -41,7 +41,7 @@ index e488b14..32d0981 100644 "//components/feedback", "//components/gcm_driver", diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn -index 3c300d1..66e8f05 100644 +index 9bb9b15..dce12e0 100644 --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn @@ -31,6 +31,7 @@ static_library("safe_browsing") { diff --git a/meta-chromium/recipes-browser/chromium/files/backport/NewTabPage-Add-missing-dep-to-cr_components.patch b/meta-chromium/recipes-browser/chromium/files/backport/NewTabPage-Add-missing-dep-to-cr_components.patch deleted file mode 100644 index 933a43116..000000000 --- a/meta-chromium/recipes-browser/chromium/files/backport/NewTabPage-Add-missing-dep-to-cr_components.patch +++ /dev/null @@ -1,27 +0,0 @@ -From bd53e2fcd2ff2ab5f9726753b827e7f958ad1041 Mon Sep 17 00:00:00 2001 -From: dpapad -Date: Wed, 27 Mar 2024 23:05:52 +0000 -Subject: [PATCH] Backport "NewTabPage: Add missing dep to - cr_components/history_clusters/." - -This fixes transient build error caused by missing dependency. -The patch will be included in upstream's 125 release. - -Upstream-Status: Backport [https://crrev.com/c/5402989] -Signed-off-by: Daniel Semkowicz ---- - chrome/browser/resources/new_tab_page/BUILD.gn | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/chrome/browser/resources/new_tab_page/BUILD.gn b/chrome/browser/resources/new_tab_page/BUILD.gn -index c7949e8..369e078 100644 ---- a/chrome/browser/resources/new_tab_page/BUILD.gn -+++ b/chrome/browser/resources/new_tab_page/BUILD.gn -@@ -101,6 +101,7 @@ build_webui("build") { - "//ui/webui/resources/cr_components/color_change_listener:build_ts", - "//ui/webui/resources/cr_components/customize_themes:build_ts", - "//ui/webui/resources/cr_components/help_bubble:build_ts", -+ "//ui/webui/resources/cr_components/history_clusters:build_ts", - "//ui/webui/resources/cr_components/most_visited:build_ts", - "//ui/webui/resources/cr_components/omnibox:build_ts", - "//ui/webui/resources/cr_components/page_image_service:build_ts", diff --git a/meta-chromium/recipes-browser/chromium/gn-native_124.0.6367.207.bb b/meta-chromium/recipes-browser/chromium/gn-native_125.0.6422.141.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/gn-native_124.0.6367.207.bb rename to meta-chromium/recipes-browser/chromium/gn-native_125.0.6422.141.bb