summaryrefslogtreecommitdiff
path: root/www-client
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2025-09-20 13:59:31 -0400
committerGravatar Chris Xiong <chirs241097@gmail.com> 2025-09-20 13:59:31 -0400
commit5bc0da126f103aeb562f4ce83e74e908e851528b (patch)
tree1283a31c64406855611d310d6534cf7a65db2373 /www-client
parent2ee4ae71f82e184f2e568d03eeaae59df50adbcf (diff)
downloadppo-5bc0da126f103aeb562f4ce83e74e908e851528b.tar.xz
chromium-142.0.7420.2?
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/Manifest6
-rw-r--r--www-client/chromium/chromium-142.0.7420.2.ebuild (renamed from www-client/chromium/chromium-141.0.7367.0.ebuild)12
-rw-r--r--www-client/chromium/files/chromium-142-compiler-r1.patch514
-rw-r--r--www-client/chromium/files/chromium-142-rust-1.8x-r1.patch24
4 files changed, 548 insertions, 8 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 98f981a..2edcb58 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -18,7 +18,9 @@ AUX chromium-140-rust-1.8x.patch 626 BLAKE2B 3dcd6ace2bd8e8072e0a12eb8035bfc060f
AUX chromium-141-compiler.patch 18130 BLAKE2B 371c035b27eabf9724a195e5d8d5a9472d0e6e7161484147da0e1230a30381b056bb195bdd8b0d354b0c5c0d0dc4712fbe0a75c45f8e189800181e7016dd90a5 SHA512 209c2398f646b07e2f0a742709e66db11fae169d5e10a1a360821f416c62e529b2516a1a61d05b753ade25f35956c72012d874fb94d6f8c1e7cbbff58cbabb34
AUX chromium-141-mv2-ungoogled.patch 7180 BLAKE2B 5d4c0aa6c85aa62d77691b64ef9f99054977674fd05462f7eaa5612f8372ed0c9f8a92f480bcf6a152657c21f266f1449814f070f6510773214e2b55a8a868f2 SHA512 7dd646188b4db14cba565a3a91dbb8a0c101c74d46b23d43647dde57ba1abef80196d46623f7f66049fb80ac14c3dff872cf0bb78a7a59e073701899f8b235fb
AUX chromium-142-blink-observable_array-css.patch 631 BLAKE2B 24b1cc54353bcb61da6e7986ee2d7c7e64ec53c296d3bd346287bf354465ac36928f0f989f699624a7dff18f73aa3141e3d4d2860c4044f99231bcb0c611b731 SHA512 2812e8def0186293889067b5b7a65860e9d852f3b1661c3306101b7f97a38ea9c383dab08cbaa23a00212ccd0c3af7eeb73c1e5029f4f7c9866707b14541ada8
+AUX chromium-142-compiler-r1.patch 19727 BLAKE2B dfe123c98038ffc20f9012a3267bc361a0dff59349f8c43ce62c9babba0908f15234e23603c62cc77c04a39cde0287a5c0bbe348a7bcf6ac8eddc6b9c80910ee SHA512 0b2d8a45adbfd22c4f57f73dd0bab8a2cab88a131cb1aec5ee587a6a08c30cc8d9828c133ea84d543420ea1a8fc28a36fa580b09776695f9c9ef20f1c025dadd
AUX chromium-142-compiler.patch 19923 BLAKE2B 02a8d8708291b35902019ce37f2b790f336e7e4fcfc89aabdedfc0e088cf4dde87244f93381e8a5c5b71a22f2aa6eaa92d93afdec92b22a8a0714cb54067a1e5 SHA512 af051a3691693a6cc39fa6b0f7a8084a019cb72e9b9b49d1aff48ef2c32bdcbc68144ef8ecc7375702a7d5433d443c7ae33d10bd633565cfd4b2316b93375319
+AUX chromium-142-rust-1.8x-r1.patch 891 BLAKE2B aa1a4179ef6365fdc8a8c8faecbe115fd30a08eae93a0babdbaac2ad75cab1127ea660a506fdf67c49247fc02d7deafcb45a161f3c2c2592e3789f87447ca10b SHA512 2fd0b420ee67f5481c17e6f31c2fef12d225c8cac2ef0f2a470a0d626e58bf5ec005807809a2f970194af24c6d2bfad9ba58547772e8e89c6bcc0c1301575f88
AUX chromium-142-rust-1.8x.patch 644 BLAKE2B b1d78eb9693a7b73aace188d1c6d1ef634eeb4a8c4d15f4b9be8535a00e8d30f3c5005e487870bb597633bb86413c098f588c72d70a4fc931f7123aafeb68a65 SHA512 38472810fbafd948df461ff20b0a8065bbc7cd044d1e54bf332ed92c8546524487eec929c0369957fc18046ca95687b906b3104d3c3e56ed585b44308cbeaf4f
AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
@@ -26,8 +28,8 @@ AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351
AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c
AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-141.0.7367.0.tar.xz 7401337484 BLAKE2B 901201cc8d1f2fd320367f2023feb1ee53d1305209e3462a79673ed5894b35b04a490b65ceb05d7f745983b62d05cf963db2d5b85b18b35ba009bf448e0afc85 SHA512 c6289f9d331d2419a03e202b0346e9a1cd394e1b7be4ae50d18f50e70f45afb44b2938c83d8dbd3fe37f31a3ce6c6a0d1036d1d18e77f3648d9945338bde94a1
DIST chromium-142.0.7393.6.tar.xz 7482130636 BLAKE2B 5f6c584fda683a95200bae72b7d65aab305d76ab947fc2a22b18f9f95b29443d6b8f4e634bc00c55384595b725b7212ecf92722af25bf6af1249df0e6dc8db34 SHA512 78561a9d90e69fa094f59d9e63d7efaf17717171a025b8ba9b5c43691ebd7ba657cbf79def100d3a5d0770ae01b2bdc6458d0862dd21961f205c5a8d7b7a6976
+DIST chromium-142.0.7420.2.tar.xz 7524495212 BLAKE2B 843e2adad73b2d8c63a9fb28c972cec349c8f7b616f842f71f74bd9713bc0a305ee6713d0eef13c5f21106a650e3f3b67a9c92018c7f08edc98089457bd15567 SHA512 b21fb6555cd98da102d06935b3a0f55565584a0a94a16135c8cc91c60bb6e727af88af343a4bd16528587a467c37bf15807740e3cda24953af0d80f4bcdea594
DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
-EBUILD chromium-141.0.7367.0.ebuild 40692 BLAKE2B bb1bdc0f747f5f5eb0ceaacf4d00360758877289d8552cc8b48fb7f0cc12dc21da6f973890bc22457de95f8169cb69455bd64b35904f00b5ca1e15c9743915a0 SHA512 abda5deb9db400528deb2a5b460cd96bd7cc407a96d734cde71462607072a82ec1ce8059b010b014e89ed7cad6b5649790e9eaa5a42ec6b5105ca5ada056a6fc
EBUILD chromium-142.0.7393.6.ebuild 40694 BLAKE2B 3b3d20c639ed3e604dbff478eeb486c5819915ed1177297a667d0581468a1ed992019935015e37c3e01ef57b93987402ddf6296e62078f5d6d1906084194d810 SHA512 f33c79537e9a39e1685b9d3159d860e7fdec083c8dbedccfd18dc333fa05ce8acbe619368d9ee033b439b075f58857d5e9e749fadb20db7b3679e990933660f5
+EBUILD chromium-142.0.7420.2.ebuild 40700 BLAKE2B d57dce8a04cbfa1f09e5e5bd25629c1d17880de27b4b4218e2ac4210542a6ae8907d73e551fc30cb2cc57674ae355dfa04bbc2545e7c73b8edb5e467f123b467 SHA512 77ae5edf33ddb7fb4d93d7ce1ae2cd95eea7a689fe1f38e714dc170f87aab8317ebaa13b0e6dc4275678c8c59098d066052b9169e83e669398c6c62061a9a61e
diff --git a/www-client/chromium/chromium-141.0.7367.0.ebuild b/www-client/chromium/chromium-142.0.7420.2.ebuild
index 11ff367..83df4dc 100644
--- a/www-client/chromium/chromium-141.0.7367.0.ebuild
+++ b/www-client/chromium/chromium-142.0.7420.2.ebuild
@@ -69,7 +69,7 @@ COMMON_SNAPSHOT_DEPEND="
!headless? (
dev-libs/glib:2
>=media-libs/alsa-lib-1.0.19:=
- pulseaudio? ( media-sound/pulseaudio:= )
+ pulseaudio? ( media-libs/libpulse:= )
sys-apps/pciutils:=
kerberos? ( virtual/krb5 )
vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
@@ -314,13 +314,14 @@ src_prepare() {
local PATCHES=(
"${FILESDIR}/chromium-139-protobuf-RepeatedPtrField-export.patch"
- "${FILESDIR}/chromium-141-compiler.patch"
+ "${FILESDIR}/chromium-142-compiler-r1.patch"
"${FILESDIR}/chromium-119-minizip.patch"
"${FILESDIR}/chromium-118-material-color-utils.patch"
"${FILESDIR}/chromium-126-freetype-blink.patch"
"${FILESDIR}/chromium-124-metrics-histograms-nodepotbin.patch"
"${FILESDIR}/chromium-138-gn-exec_script_allowlist.patch"
- "${FILESDIR}/chromium-140-rust-1.8x.patch"
+ "${FILESDIR}/chromium-142-rust-1.8x-r1.patch"
+ "${FILESDIR}/chromium-142-blink-observable_array-css.patch"
"${FILESDIR}/chromium-141-mv2-ungoogled.patch"
"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
@@ -448,6 +449,7 @@ src_prepare() {
third_party/fast_float
third_party/farmhash
third_party/fdlibm
+ third_party/federated_compute
third_party/fft2d
third_party/flatbuffers
third_party/fp16
@@ -506,6 +508,7 @@ src_prepare() {
third_party/nearby
third_party/neon_2_sse
third_party/node
+ third_party/oak
third_party/omnibox_proto
third_party/one_euro_filter
third_party/openh264
@@ -777,9 +780,6 @@ chromium_configure() {
# for development and debugging.
myconf_gn+=" is_component_build=$(usex component-build true false)"
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf_gn+=" enable_nacl=false"
-
# Use system-provided libraries.
# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
# TODO: use_system_hunspell (upstream changes needed).
diff --git a/www-client/chromium/files/chromium-142-compiler-r1.patch b/www-client/chromium/files/chromium-142-compiler-r1.patch
new file mode 100644
index 0000000..432fa11
--- /dev/null
+++ b/www-client/chromium/files/chromium-142-compiler-r1.patch
@@ -0,0 +1,514 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index aa8f2a96bf..5e15eb7714 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -262,15 +262,6 @@ declare_args() {
+ assert(!(llvm_force_head_revision && use_remoteexec && host_os != "linux"),
+ "rbe with locally built clang only works on linux")
+
+-# Whether or not we should pass the warning_suppression.txt file to clang
+-# compilations. This file allows us to suppress warnings that originate from
+-# specific file paths, typically third_party headers.
+-#
+-# Since this is referenced both when passing the file and when deciding which
+-# warnings to enable, store it in a separate variable here.
+-use_clang_warning_suppression_file =
+- is_clang && clang_warning_suppression_file != ""
+-
+ # default_include_dirs ---------------------------------------------------------
+ #
+ # This is a separate config so that third_party code (which would not use the
+@@ -338,12 +329,8 @@ config("compiler") {
+
+ configs += [
+ # See the definitions below.
+- ":clang_revision",
+- ":rustc_revision",
+- ":compiler_cpu_abi",
+ ":compiler_codegen",
+ ":compiler_deterministic",
+- ":clang_warning_suppression",
+ ]
+
+ # TODO(https://crbug.com/404297941): Disable clang_warning_suppression
+@@ -544,6 +531,9 @@ config("compiler") {
+ ldflags += [ "-fPIC" ]
+ rustflags += [ "-Crelocation-model=pic" ]
+
++ extra_rustflags = getenv("RUSTFLAGS")
++ rustflags += [ extra_rustflags ]
++
+ if (!is_clang) {
+ # Use pipes for communicating between sub-processes. Faster.
+ # (This flag doesn't do anything with Clang.)
+@@ -635,61 +625,6 @@ config("compiler") {
+ ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
+ }
+
+- if (is_clang) {
+- cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
+- if (save_reproducers_on_lld_crash && use_lld) {
+- ldflags += [
+- "-fcrash-diagnostics=all",
+- "-fcrash-diagnostics-dir=" + clang_diagnostic_dir,
+- ]
+- }
+-
+- # TODO(hans): Remove this once Clang generates better optimized debug info
+- # by default. https://crbug.com/765793
+- cflags += [
+- "-mllvm",
+- "-instcombine-lower-dbg-declare=0",
+- ]
+- if (!is_debug && use_thin_lto && is_a_target_toolchain) {
+- if (is_win) {
+- ldflags += [ "-mllvm:-instcombine-lower-dbg-declare=0" ]
+- } else {
+- ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ]
+- }
+- }
+-
+- # TODO(crbug.com/40283598): This causes binary size growth and potentially
+- # other problems.
+- if (default_toolchain != "//build/toolchain/cros:target") {
+- cflags += [
+- "-mllvm",
+- "-split-threshold-for-reg-with-hint=0",
+- ]
+- if (use_thin_lto && is_a_target_toolchain) {
+- if (is_win) {
+- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
+- } else {
+- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
+- }
+- }
+- }
+-
+- # TODO(crbug.com/40192287): Investigate why/if this should be needed.
+- if (is_win) {
+- cflags += [ "/clang:-ffp-contract=off" ]
+- } else {
+- cflags += [ "-ffp-contract=off" ]
+- }
+-
+- # Enable ELF CREL (see crbug.com/357878242) for all platforms that use ELF.
+- # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds.
+- # It also causes segfault on Linux s390x:
+- # https://github.com/llvm/llvm-project/issues/149511
+- if (is_linux && use_lld && current_cpu != "arm" && current_cpu != "s390x") {
+- cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
+- }
+- }
+-
+ # C11/C++11 compiler flags setup.
+ # ---------------------------
+ if (is_linux || is_chromeos || is_android || current_os == "aix") {
+@@ -1102,20 +1037,6 @@ config("compiler") {
+ # `-nodefaultlibs` from the linker invocation from Rust, which would be used
+ # to compile dylibs on Android, such as for constructing unit test APKs.
+ "-Cdefault-linker-libraries",
+-
+- # To make Rust .d files compatible with ninja
+- "-Zdep-info-omit-d-target",
+-
+- # If a macro panics during compilation, show which macro and where it is
+- # defined.
+- "-Zmacro-backtrace",
+-
+- # For deterministic builds, keep the local machine's current working
+- # directory from appearing in build outputs.
+- "-Zremap-cwd-prefix=.",
+-
+- # We use clang-rt sanitizer runtimes.
+- "-Zexternal-clangrt",
+ ]
+
+ if (!is_win || force_rustc_color_output) {
+@@ -1170,7 +1091,7 @@ config("compiler") {
+ # Don't allow unstable features to be enabled by `#![feature()]` without
+ # additional command line flags.
+ config("disallow_unstable_features") {
+- rustflags = [ "-Zallow-features=" ]
++ #rustflags = [ "-Zallow-features=" ]
+ }
+
+ config("libcxx_hardening") {
+@@ -1640,43 +1561,6 @@ config("compiler_deterministic") {
+ }
+ }
+
+- # Makes builds independent of absolute file path.
+- if (is_clang && strip_absolute_paths_from_debug_symbols) {
+- # If debug option is given, clang includes $cwd in debug info by default.
+- # For such build, this flag generates reproducible obj files even we use
+- # different build directory like "out/feature_a" and "out/feature_b" if
+- # we build same files with same compile flag.
+- # Other paths are already given in relative, no need to normalize them.
+-
+- # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+- # and -fcoverage-compilation-dir=.
+- cflags += [ "-ffile-compilation-dir=." ]
+-
+- # Convert absolute paths to relative paths. Expands to, for example:
+- # -file-prefix-map /path/to/chromium/src=../..
+- swiftflags += [
+- "-file-prefix-map",
+- rebase_path("//.", "") + "=" + rebase_path("//.", root_build_dir),
+- ]
+- if (!is_win) {
+- # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+- asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+- }
+-
+- if (is_win && use_lld) {
+- if (symbol_level == 2 || (is_clang && using_sanitizer)) {
+- # Absolutize source file paths for PDB. Pass the real build directory
+- # if the pdb contains source-level debug information and if linker
+- # reproducibility is not critical.
+- ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ]
+- } else {
+- # Use a fake fixed base directory for paths in the pdb to make the pdb
+- # output fully deterministic and independent of the build directory.
+- ldflags += [ "/PDBSourcePath:o:\fake\prefix" ]
+- }
+- }
+- }
+-
+ # 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 RBE cache entries.
+@@ -1694,114 +1578,8 @@ config("compiler_deterministic") {
+ }
+ }
+
+- if (use_clang_modules) {
+- cflags += [
+- # This removes absolute paths from .pcm files.
+- "-Xclang",
+- "-fmodule-file-home-is-cwd",
+- ]
+- }
+-}
+-
+-config("clang_revision") {
+- if (is_clang && clang_base_path == default_clang_base_path &&
+- current_os != "zos") {
+- _perform_consistency_checks = current_toolchain == default_toolchain
+- if (llvm_force_head_revision) {
+- _head_revision_stamp_path = "//third_party/llvm-build/force_head_revision"
+- _head_revision = ""
+- if (path_exists(_head_revision_stamp_path)) {
+- _head_revision = read_file(_head_revision_stamp_path, "trim string")
+- }
+- assert(
+- _head_revision != "",
+- "llvm_force_head_revision=true, but no locally built version was detected.")
+- _clang_revision = _head_revision
+- } else {
+- _clang_revision = read_file(
+- "//third_party/llvm-build/Release+Asserts/cr_build_revision",
+- "trim string")
+-
+- # Ensure that the synced clang version matches what's in git.
+- if (_perform_consistency_checks) {
+- # Parse the clang version from the Python script.
+- _clang_version_lines = filter_include(
+- read_file("//tools/clang/scripts/update.py", "list lines"),
+- [ "CLANG_*REVISION = *" ])
+- _py_revision =
+- string_replace(_clang_version_lines[0], "CLANG_REVISION = '", "")
+- _py_revision = string_replace(_py_revision, "'", "")
+- _py_subrevision =
+- string_replace(_clang_version_lines[1], "CLANG_SUB_REVISION = ", "")
+- _expected_clang_revision = "$_py_revision-$_py_subrevision"
+-
+- # TODO(agrieve): Change filter_include to _clang_revision ==
+- # _expected_clang_revision once angle & webrtc use a GCS DEPS entry
+- # rather than a update.py runhook.
+- assert(
+- filter_include([ _clang_revision ],
+- [
+- _expected_clang_revision,
+- "$_expected_clang_revision,*",
+- ]) != [],
+- "clang_revision=\"$_clang_revision\" but update.py expected \"$_expected_clang_revision\". Did you forget to gclient sync?")
+- }
+- }
+-
+- if (_perform_consistency_checks) {
+- # Ensure that the revision matches the version major expected by GN.
+- _versions_match = filter_include([ _clang_revision ],
+- [ "llvmorg-$clang_version-*" ]) != []
+- assert(
+- _versions_match,
+- "clang_revision=\"$_clang_revision\" but clang_version=\"$clang_version\". clang_version in build/toolchain/toolchain.gni is likely outdated.")
+- }
+-
+- if (toolchain_has_rust && _perform_consistency_checks &&
+- !rust_force_head_revision) {
+- # Ensure that the synced rust version matches what's in git.
+- _rust_revision_lines =
+- filter_include(read_file("//tools/rust/update_rust.py", "list lines"),
+- [ "RUST_*REVISION = *" ])
+- _py_revision =
+- string_replace(_rust_revision_lines[0], "RUST_REVISION = '", "")
+- _py_revision = string_replace(_py_revision, "'", "")
+- _py_subrevision =
+- string_replace(_rust_revision_lines[1], "RUST_SUB_REVISION = ", "")
+- _expected_rust_revision = "$_py_revision-$_py_subrevision"
+-
+- # Ensure the rust version matches the clang version.
+- assert(
+- filter_include([ rustc_revision ],
+- [ "*-$_expected_rust_revision-*" ]) != [],
+- "rustc_revision=\"$rustc_revision\" but update_rust.py expected \"$_expected_rust_revision\". Run \"gclient sync\"?")
+- }
+-
+- # This is here so that all files get recompiled after a clang roll and
+- # when turning clang on or off. (defines are passed via the command line,
+- # and build system rebuild things when their commandline changes). Nothing
+- # should ever read this define.
+- defines = [ "CR_CLANG_REVISION=\"$_clang_revision\"" ]
+- }
+-}
+-
+-# Controls the usage of a warning suppression mapping (WSM) file to suppress
+-# warnings based on the path of the file they come from. It's controlled by the
+-# `clang_warning_suppression_file` gn argument , which points to a text file
+-# defining which warnings should be suppressed where.
+-# See //build/config/warning_suppression.txt for an example file; this is the
+-# file used by Chromium.
+-#
+-# To use a different file, or to use this functionality outside of chromium,
+-# set the `clang_warning_suppression_file` argument to point to the new file,
+-# e.g. by setting in the the project's .gn file.
+-config("clang_warning_suppression") {
+- # Some build configs use older versions of clang that don't support WSMs
+- if (use_clang_warning_suppression_file) {
+- from_build_root =
+- rebase_path(clang_warning_suppression_file, root_build_dir)
+- inputs = [ clang_warning_suppression_file ]
+- cflags = [ "--warning-suppression-mappings=" + from_build_root ]
++ if (is_clang) {
++ cflags += [ "-Xclang", "-fno-cxx-modules" ]
+ }
+ }
+
+@@ -1828,18 +1606,6 @@ config("sanitize_c_array_bounds") {
+ }
+ }
+
+-config("rustc_revision") {
+- if (rustc_revision != "") {
+- # Similar to the above config, this is here so that all files get recompiled
+- # after a rustc roll. Nothing should ever read this cfg. This will not be
+- # set if a custom toolchain is used.
+- rustflags = [
+- "--cfg",
+- "cr_rustc_revision=\"$rustc_revision\"",
+- ]
+- }
+-}
+-
+ config("compiler_arm_fpu") {
+ if (current_cpu == "arm" && !is_ios) {
+ cflags = [ "-mfpu=$arm_fpu" ]
+@@ -1865,6 +1631,19 @@ config("compiler_arm") {
+ }
+
+ config("libcxx_module") {
++ cflags_cc = [
++ # TODO(crbug.com/1456385): Figure out if this can be removed.
++ "-Wno-modules-ambiguous-internal-linkage",
++
++ # TODO(crbug.com/40440396): Clean up.
++ "-Wno-modules-import-nested-redundant",
++
++ # Needed to allow using builtin modules when the headers are
++ # unnecessarily using extern "C".
++ "-Wno-module-import-in-extern-c",
++ ]
++}
++config("libcxx_modulex") {
+ if (use_clang_modules) {
+ cflags_cc = [
+ "-fmodules",
+@@ -2162,18 +1941,6 @@ config("default_warnings") {
+ ]
+ }
+
+- if (is_component_build && use_clang_warning_suppression_file) {
+- # Warn for globally unique objects which might get duplicated if built
+- # into different components, due to hidden visibility. Only applicable
+- # to component builds.
+-
+- # For details about the warning and now to fix it, see the official docs at
+- # https://clang.llvm.org/docs/DiagnosticsReference.html#wunique-object-duplication
+- # If you still have trouble resolving it, file a bug asking for advice in the
+- # Chromium > Tools > LLVM component, and cc dloehr and thakis.
+- cflags_cc += [ "-Wunique-object-duplication" ]
+- }
+-
+ if (is_wasm) {
+ # Abseil's `symbolize_emscripten.inc` file currently has macros that are
+ # not compatible with C++98, so turn off the warnings.
+@@ -2194,14 +1961,6 @@ config("default_warnings") {
+ if (cc_wrapper == "ccache" || cc_wrapper == "icecc") {
+ cflags += [ "-Wno-gnu-line-marker" ]
+ }
+-
+- if (is_wexit_time_destructors_default &&
+- use_clang_warning_suppression_file) {
+- # TODO(crbug.com/40031409): We are migrating towards making this warning
+- # enabled by default. Once that is completed, the warning
+- # should always be added for clang builds.
+- cflags += [ "-Wexit-time-destructors" ]
+- }
+ }
+
+ # TODO(crbug.com/354162568): Clean up and enable.
+@@ -2274,11 +2033,7 @@ config("chromium_code") {
+ defines = [ "_HAS_NODISCARD" ]
+ }
+ } else {
+- cflags = [ "-Wall" ]
+- if (is_clang) {
+- # Enable extra warnings for chromium_code when we control the compiler.
+- cflags += [ "-Wextra" ]
+- }
++ cflags = [ ]
+
+ # In Chromium code, we define __STDC_foo_MACROS in order to get the
+ # C99 macros on Mac and Linux.
+@@ -2287,24 +2042,6 @@ config("chromium_code") {
+ "__STDC_FORMAT_MACROS",
+ ]
+
+- if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&
+- current_cpu != "s390" && current_cpu != "ppc64" &&
+- current_cpu != "mips" && current_cpu != "mips64" &&
+- current_cpu != "riscv64" && current_cpu != "loong64") {
+- # Non-chromium code is not guaranteed to compile cleanly with
+- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+- # disabled, so only do that for Release build.
+- fortify_level = "2"
+-
+- # ChromeOS's toolchain supports a high-quality _FORTIFY_SOURCE=3
+- # implementation with a few custom glibc patches. Use that if it's
+- # available.
+- if (is_chromeos_device) {
+- fortify_level = "3"
+- }
+- defines += [ "_FORTIFY_SOURCE=" + fortify_level ]
+- }
+-
+ if (is_apple) {
+ cflags_objc = [ "-Wimplicit-retain-self" ]
+ cflags_objcc = [ "-Wimplicit-retain-self" ]
+@@ -2728,7 +2465,8 @@ config("default_stack_frames") {
+ # [0]: https://pinpoint-dot-chromeperf.appspot.com/job/147634a8be0000
+ # [1]: https://pinpoint-dot-chromeperf.appspot.com/job/132bc772be0000
+ # [2]: https://crrev.com/c/5447532
+-config("optimize") {
++config("optimize") { }
++config("xoptimize") {
+ if (is_win) {
+ # clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for
+ # consistency with the other platforms.
+@@ -2777,7 +2515,8 @@ config("optimize") {
+ }
+
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+ if (is_win) {
+ cflags = [
+ "/Od", # Disable optimization.
+@@ -2812,7 +2551,8 @@ config("no_optimize") {
+ # Turns up the optimization level. Used to explicitly enable -O2 instead of
+ # -Os for select targets on platforms that use optimize_for_size. No-op
+ # elsewhere.
+-config("optimize_max") {
++config("optimize_max") { }
++config("xoptimize_max") {
+ ldflags = common_optimize_on_ldflags
+ if (is_win) {
+ # Favor speed over size, /O2 must be before the common flags.
+@@ -2833,7 +2573,8 @@ config("optimize_max") {
+ #
+ # TODO(crbug.com/41259697) - rework how all of these configs are related
+ # so that we don't need this disclaimer.
+-config("optimize_speed") {
++config("optimize_speed") { }
++config("xoptimize_speed") {
+ ldflags = common_optimize_on_ldflags
+ if (is_win) {
+ # Favor speed over size, /O2 must be before the common flags.
+@@ -2850,7 +2591,8 @@ config("optimize_speed") {
+ rustflags = [ "-Copt-level=3" ]
+ }
+
+-config("optimize_fuzzing") {
++config("optimize_fuzzing") { }
++config("xoptimize_fuzzing") {
+ cflags = [ "-O1" ] + common_optimize_on_cflags
+ rustflags = [ "-Copt-level=1" ]
+ ldflags = common_optimize_on_ldflags
+@@ -2977,7 +2719,8 @@ config("win_pdbaltpath") {
+ }
+
+ # Full symbols.
+-config("symbols") {
++config("symbols") { }
++config("xsymbols") {
+ rustflags = []
+ configs = []
+ if (is_win) {
+@@ -3133,7 +2876,8 @@ config("symbols") {
+ # Minimal symbols.
+ # This config guarantees to hold symbol for stack trace which are shown to user
+ # when crash happens in unittests running on buildbot.
+-config("minimal_symbols") {
++config("minimal_symbols") { }
++config("xminimal_symbols") {
+ rustflags = []
+ if (is_win) {
+ # Functions, files, and line tables only.
+@@ -3209,7 +2953,8 @@ config("minimal_symbols") {
+ # This configuration contains function names only. That is, the compiler is
+ # told to not generate debug information and the linker then just puts function
+ # names in the final debug information.
+-config("no_symbols") {
++config("no_symbols") { }
++config("xno_symbols") {
+ if (is_win) {
+ ldflags = [ "/DEBUG" ]
+
+diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn
+index a659210b19..bde0e1b273 100644
+--- a/build/config/gcc/BUILD.gn
++++ b/build/config/gcc/BUILD.gn
+@@ -32,7 +32,7 @@ declare_args() {
+ # See http://gcc.gnu.org/wiki/Visibility
+ config("symbol_visibility_hidden") {
+ cflags = [ "-fvisibility=hidden" ]
+- rustflags = [ "-Zdefault-visibility=hidden" ]
++ # rustflags = [ "-Zdefault-visibility=hidden" ]
+
+ # Visibility attribute is not supported on AIX.
+ if (current_os != "aix") {
+diff --git a/build/config/rust.gni b/build/config/rust.gni
+index 55bd7b78ee..be36aef69f 100644
+--- a/build/config/rust.gni
++++ b/build/config/rust.gni
+@@ -73,7 +73,8 @@ declare_args() {
+ #
+ # TODO(crbug.com/40281834): Re-enable ThinLTO for Rust on LaCrOS
+ # TODO(b/300937673): Re-enable ThinLTO for Rust on ash-chrome
+- toolchain_supports_rust_thin_lto = !is_chromeos
++ # toolchain_supports_rust_thin_lto = !is_chromeos
++ toolchain_supports_rust_thin_lto = false
+
+ # Any extra std rlibs in your Rust toolchain, relative to the standard
+ # Rust toolchain. Typically used with 'rust_sysroot_absolute'
diff --git a/www-client/chromium/files/chromium-142-rust-1.8x-r1.patch b/www-client/chromium/files/chromium-142-rust-1.8x-r1.patch
new file mode 100644
index 0000000..16f088c
--- /dev/null
+++ b/www-client/chromium/files/chromium-142-rust-1.8x-r1.patch
@@ -0,0 +1,24 @@
+diff --git a/build/rust/allocator/lib.rs b/build/rust/allocator/lib.rs
+index b92aec8086..742688567c 100644
+--- a/build/rust/allocator/lib.rs
++++ b/build/rust/allocator/lib.rs
+@@ -96,6 +96,19 @@ mod both_allocators {
+ 0
+ }
+
++ // TODO(crbug.com/422538133) Remove after rolling past
++ // https://github.com/rust-lang/rust/pull/141061
++ #[no_mangle]
++ #[linkage = "weak"]
++ static __rust_no_alloc_shim_is_unstable: u8 = 0;
++
++ // Mangle the symbol name as rustc expects.
++ // TODO(crbug.com/440481922): Remove this after rolling past https://github.com/rust-lang/rust/pull/143387
++ #[rustc_std_internal_symbol]
++ #[allow(non_upper_case_globals)]
++ #[linkage = "weak"]
++ static __rust_alloc_error_handler_should_panic: u8 = 0;
++
+ // Mangle the symbol name as rustc expects.
+ #[rustc_std_internal_symbol]
+ #[allow(non_upper_case_globals)]