summaryrefslogtreecommitdiff
path: root/www-client
diff options
context:
space:
mode:
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/Manifest6
-rw-r--r--www-client/chromium/chromium-141.0.7367.0.ebuild (renamed from www-client/chromium/chromium-140.0.7299.0.ebuild)4
-rw-r--r--www-client/chromium/files/chromium-141-compiler.patch454
-rw-r--r--www-client/chromium/files/chromium-141-mv2-ungoogled.patch158
4 files changed, 618 insertions, 4 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 07c376f..c73d366 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -15,14 +15,16 @@ AUX chromium-140-compiler-r1.patch 17997 BLAKE2B b116858756b692550bb087497a5c349
AUX chromium-140-compiler.patch 17875 BLAKE2B 92f700b2c0b40c382e588eb41a965947b2e45f2893c7991a2749057c39b2aa16b9a88ad086d06ef89b11705ff2b0eb356f307910d196fe39decd7f327347f8fa SHA512 58e1240cdea826b0679db67f70a34b1c3e7e667415e0a98b8d33ce6f3125cdc1c0e2a60ae8a363964e0407e12e03fd4b3dc652f45da0f3a70dc959d53355ad19
AUX chromium-140-gni-lf.patch 1242 BLAKE2B 3686048909b6f4417951c1709b3d757ec6e732b1ed12e757e7004948169af06f6c747d44cc6b29e56e41d495b64d8ca9e4b4d9211b824f6794d70eb23c972a88 SHA512 8ad0b2c0184c86081e8693ac4c533e962707409b77256a222dab7116dd38dfec55a813c52ff294aca8c81334579dbf463e0355a2addb5323a896946f5069f403
AUX chromium-140-rust-1.8x.patch 626 BLAKE2B 3dcd6ace2bd8e8072e0a12eb8035bfc060f59fe55b20e623ff16897bf79596991773eab4f1e7a1d1b8334a2b3193f208524f4397ba1ff10e78a70f94c7ff7723 SHA512 ecc8cdef7409f6fc2a0af5ea8f9909d30b267457120e0a87702726a213446607c9473b521420d6738d1113c6697bd0a0716d9a2097d70b9d396b3dc35d7c7660
+AUX chromium-141-compiler.patch 17791 BLAKE2B 06da934a65fd3ce4e33870901c5ac603ad055dcaadcf60cbf3b565b8c076e3a939800020e496ff009d151f11a16f07ade4ea0de343aa53086ff484f74d4ab6b7 SHA512 6bd369abadf0bc2eddcedd00c3c1ed127b9fddfaab4fa0de36dfdd84c814d1338967d1ea1004fe8f6dde107311c88fe9cb30902562c92847beb0e72b381cf48d
+AUX chromium-141-mv2-ungoogled.patch 7180 BLAKE2B 5d4c0aa6c85aa62d77691b64ef9f99054977674fd05462f7eaa5612f8372ed0c9f8a92f480bcf6a152657c21f266f1449814f070f6510773214e2b55a8a868f2 SHA512 7dd646188b4db14cba565a3a91dbb8a0c101c74d46b23d43647dde57ba1abef80196d46623f7f66049fb80ac14c3dff872cf0bb78a7a59e073701899f8b235fb
AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954
AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0
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-140.0.7299.0.tar.xz 7321153548 BLAKE2B 653f6c8f4bc42d31c91191ebdb5191d59172d9a0193b9bc69769f5d7b618e7dcda53777f22fe073b9a6186f9998c73a3e5232ad21aacf205902beeaeaacb4f72 SHA512 bb4439965041b8a8169516c74cc77106c990e3d324a577bf343c6b7f77c9c1b0862624dfecc2f2bc363b92c69a8723934fbc22a630438a57876cd340d86bf236
DIST chromium-140.0.7327.6.tar.xz 7362455388 BLAKE2B edf732e6395f765bc02883078741ca2e7300bad7f8602e42fd37a8d5875a30cbdf0034b55881281d03198af6697f2c24e457a25c08173632e332b27bc18f1552 SHA512 b9e40cd1613ccd7680202866e35b5446d883d9e5f5620ff48ba30eef0c657799f7f047b0ccb535888e1d705bdf63075ae4c771ad46f7c58efcd996e8993633c2
+DIST chromium-141.0.7367.0.tar.xz 7401337484 BLAKE2B 901201cc8d1f2fd320367f2023feb1ee53d1305209e3462a79673ed5894b35b04a490b65ceb05d7f745983b62d05cf963db2d5b85b18b35ba009bf448e0afc85 SHA512 c6289f9d331d2419a03e202b0346e9a1cd394e1b7be4ae50d18f50e70f45afb44b2938c83d8dbd3fe37f31a3ce6c6a0d1036d1d18e77f3648d9945338bde94a1
DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
-EBUILD chromium-140.0.7299.0.ebuild 40695 BLAKE2B 3e05aeb987c2d21aa8e89c98bf932eb537d2b85386e6a7aeb917100cb8d842654c9e3951d58f17440bebfac6741d31ccd111231a7e564ff8cbc03d466b9552cc SHA512 17d4e2ae546fd43ea4ed280d690520412b4fddac6aa9104c0dbc92c9252ea63a3a982208ea2760eb5177f3a33b2d02ed1218a950915c4ef7bc6b0c8af9c4d3d6
EBUILD chromium-140.0.7327.6.ebuild 40740 BLAKE2B 343cffa7f0232fb3f09dca595359da3ac76f4650eb7431b1b25222ca2d350f895471914cf9282d85845f3c4f4c3273ffcb606d1cdbb65e893aef946cb4b58cd9 SHA512 cc6a3b8a9b92f81906b56ffd2e185f067ea4740d3b6872ba42af10e9c276efcb0c392bcfa3f3ce6d388d8ca231141b7419b09d50daf7768fcc339855f1d0f75a
+EBUILD chromium-141.0.7367.0.ebuild 40692 BLAKE2B bb1bdc0f747f5f5eb0ceaacf4d00360758877289d8552cc8b48fb7f0cc12dc21da6f973890bc22457de95f8169cb69455bd64b35904f00b5ca1e15c9743915a0 SHA512 abda5deb9db400528deb2a5b460cd96bd7cc407a96d734cde71462607072a82ec1ce8059b010b014e89ed7cad6b5649790e9eaa5a42ec6b5105ca5ada056a6fc
diff --git a/www-client/chromium/chromium-140.0.7299.0.ebuild b/www-client/chromium/chromium-141.0.7367.0.ebuild
index 7f1b04a..11ff367 100644
--- a/www-client/chromium/chromium-140.0.7299.0.ebuild
+++ b/www-client/chromium/chromium-141.0.7367.0.ebuild
@@ -314,14 +314,14 @@ src_prepare() {
local PATCHES=(
"${FILESDIR}/chromium-139-protobuf-RepeatedPtrField-export.patch"
- "${FILESDIR}/chromium-140-compiler.patch"
+ "${FILESDIR}/chromium-141-compiler.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-139-mv2-ungoogled-r1.patch"
+ "${FILESDIR}/chromium-141-mv2-ungoogled.patch"
"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
"${FILESDIR}/chromium-134-EnumTable-crash.patch"
diff --git a/www-client/chromium/files/chromium-141-compiler.patch b/www-client/chromium/files/chromium-141-compiler.patch
new file mode 100644
index 0000000..6627b1f
--- /dev/null
+++ b/www-client/chromium/files/chromium-141-compiler.patch
@@ -0,0 +1,454 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 298e37f832..f6f2b0a345 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -265,15 +265,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 =
+- !llvm_android_mainline && is_clang && clang_warning_suppression_file != ""
+-
+ # default_include_dirs ---------------------------------------------------------
+ #
+ # This is a separate config so that third_party code (which would not use the
+@@ -341,12 +332,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
+@@ -547,6 +534,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.)
+@@ -638,64 +628,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.
+- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version.
+- if (default_toolchain != "//build/toolchain/cros:target" &&
+- !llvm_android_mainline) {
+- 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 && !llvm_android_mainline && 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") {
+@@ -1108,20 +1040,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) {
+@@ -1176,7 +1094,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") {
+@@ -1646,43 +1564,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.
+@@ -1709,107 +1590,6 @@ config("compiler_deterministic") {
+ }
+ }
+
+-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) {
+- # 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 ]
+- }
+-}
+-
+ # Enable bounds checks when indexing directly (i.e. not via a pointer)
+ # into C arrays. This aligns with libc++ hardening for
+ # `std::array::operator[]`.
+@@ -1833,18 +1613,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" ]
+@@ -2288,11 +2056,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.
+@@ -2301,24 +2065,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" ]
+@@ -2734,7 +2480,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.
+@@ -2783,7 +2530,8 @@ config("optimize") {
+ }
+
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+ if (is_win) {
+ cflags = [
+ "/Od", # Disable optimization.
+@@ -2818,7 +2566,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.
+@@ -2839,7 +2588,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.
+@@ -2856,7 +2606,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
+@@ -2983,7 +2734,8 @@ config("win_pdbaltpath") {
+ }
+
+ # Full symbols.
+-config("symbols") {
++config("symbols") { }
++config("xsymbols") {
+ rustflags = []
+ configs = []
+ if (is_win) {
+@@ -3139,7 +2891,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.
+@@ -3215,7 +2968,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-141-mv2-ungoogled.patch b/www-client/chromium/files/chromium-141-mv2-ungoogled.patch
new file mode 100644
index 0000000..2eea81c
--- /dev/null
+++ b/www-client/chromium/files/chromium-141-mv2-ungoogled.patch
@@ -0,0 +1,158 @@
+diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
+index 4780e2b3db..32691cb88c 100644
+--- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
++++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
+@@ -594,17 +594,6 @@ void ExtensionInfoGenerator::FillExtensionInfo(const Extension& extension,
+ info.controlled_info.emplace();
+ info.controlled_info->text =
+ l10n_util::GetStringUTF8(IDS_EXTENSIONS_INSTALL_LOCATION_ENTERPRISE);
+- } else {
+- // Create Safety Hub information for any non-enterprise extension.
+- developer::SafetyCheckWarningReason warning_reason =
+- ExtensionSafetyCheckUtils::GetSafetyCheckWarningReason(extension,
+- profile);
+- if (warning_reason != developer::SafetyCheckWarningReason::kNone) {
+- info.safety_check_warning_reason = warning_reason;
+- info.safety_check_text =
+- ExtensionSafetyCheckUtils::GetSafetyCheckWarningStrings(
+- warning_reason, state);
+- }
+ }
+
+ bool is_enabled = state == developer::ExtensionState::kEnabled;
+diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
+index b35d69a7a9..d2bb1f364e 100644
+--- a/chrome/browser/extensions/extension_management.cc
++++ b/chrome/browser/extensions/extension_management.cc
+@@ -348,31 +348,7 @@ bool ExtensionManagement::IsAllowedManifestVersion(
+ int manifest_version,
+ const std::string& extension_id,
+ Manifest::Type manifest_type) {
+- bool enabled_by_default =
+- !base::FeatureList::IsEnabled(
+- extensions_features::kExtensionsManifestV3Only) ||
+- manifest_version >= 3;
+-
+- // Manifest version policy only supports normal extensions and Chrome OS login
+- // screen extension.
+- if (manifest_type != Manifest::Type::TYPE_EXTENSION &&
+- manifest_type != Manifest::Type::TYPE_LOGIN_SCREEN_EXTENSION) {
+- return enabled_by_default;
+- }
+- switch (global_settings_->manifest_v2_setting) {
+- case internal::GlobalSettings::ManifestV2Setting::kDefault:
+- return enabled_by_default;
+- case internal::GlobalSettings::ManifestV2Setting::kDisabled:
+- return manifest_version >= 3;
+- case internal::GlobalSettings::ManifestV2Setting::kEnabled:
+ return true;
+- case internal::GlobalSettings::ManifestV2Setting::kEnabledForForceInstalled:
+- auto installation_mode =
+- GetInstallationMode(extension_id, /*update_url=*/std::string());
+- return manifest_version >= 3 ||
+- installation_mode == ManagedInstallationMode::kForced ||
+- installation_mode == ManagedInstallationMode::kRecommended;
+- }
+ }
+
+ bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) {
+@@ -393,26 +369,8 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
+ return false;
+ }
+
+- switch (global_settings_->manifest_v2_setting) {
+- case internal::GlobalSettings::ManifestV2Setting::kDefault:
+- // Default browser behavior. Not exempt.
+- return false;
+- case internal::GlobalSettings::ManifestV2Setting::kDisabled:
+- // All MV2 extensions are disallowed. Not exempt.
+- return false;
+- case internal::GlobalSettings::ManifestV2Setting::kEnabled:
+ // All MV2 extensions are allowed. Exempt.
+ return true;
+- case internal::GlobalSettings::ManifestV2Setting::kEnabledForForceInstalled:
+- // Force-installed MV2 extensions are allowed. Exempt if it's a force-
+- // installed extension only.
+- auto installation_mode =
+- GetInstallationMode(extension_id, /*update_url=*/std::string());
+- return installation_mode == ManagedInstallationMode::kForced ||
+- installation_mode == ManagedInstallationMode::kRecommended;
+- }
+-
+- return false;
+ }
+
+ bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
+diff --git a/chrome/browser/extensions/manifest_v2_experiment_manager.cc b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
+index a5cfb94f79..2d2eb52319 100644
+--- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc
++++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
+@@ -145,17 +145,6 @@ bool ManifestV2ExperimentManagerFactory::ServiceIsCreatedWithBrowserContext()
+
+ // Determines the current stage of the MV2 deprecation experiments.
+ MV2ExperimentStage CalculateCurrentExperimentStage() {
+- // Return the "highest" stage that is currently active for the user.
+- if (base::FeatureList::IsEnabled(
+- extensions_features::kExtensionManifestV2Unsupported)) {
+- return MV2ExperimentStage::kUnsupported;
+- }
+-
+- if (base::FeatureList::IsEnabled(
+- extensions_features::kExtensionManifestV2Disabled)) {
+- return MV2ExperimentStage::kDisableWithReEnable;
+- }
+-
+ return MV2ExperimentStage::kWarning;
+ }
+
+@@ -189,18 +178,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefFor(
+ // Returns true if legacy extensions should be disabled, looking at both
+ // experiment stage and global state.
+ bool ShouldDisableLegacyExtensions(MV2ExperimentStage stage) {
+- if (g_allow_mv2_for_testing) {
+- // We allow legacy MV2 extensions for testing purposes.
+- return false;
+- }
+-
+- switch (stage) {
+- case MV2ExperimentStage::kWarning:
+- return false;
+- case MV2ExperimentStage::kDisableWithReEnable:
+- case MV2ExperimentStage::kUnsupported:
+- return true;
+- }
++ return false;
+ }
+
+ // Returns true if the given `stage` is one in which extension enablement should
+diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
+index 9e73d41c3e..55c82edf96 100644
+--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
++++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
+@@ -483,7 +483,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+ extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
+ source->AddBoolean(
+ "safetyHubThreeDotDetails",
+- base::FeatureList::IsEnabled(features::kSafetyHubThreeDotDetails));
++ false);
+
+ // MV2 deprecation.
+ auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile);
+diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
+index 97752e1447..9889c9dfb6 100644
+--- a/extensions/common/extension.cc
++++ b/extensions/common/extension.cc
+@@ -101,13 +101,6 @@ bool IsManifestSupported(int manifest_version,
+ // Supported versions are always safe.
+ if (manifest_version >= kMinimumSupportedManifestVersion &&
+ manifest_version <= kMaximumSupportedManifestVersion) {
+- // Emit a warning for unpacked extensions on Manifest V2 warning that
+- // MV2 is deprecated.
+- if (type == Manifest::TYPE_EXTENSION && manifest_version == 2 &&
+- Manifest::IsUnpackedLocation(location) &&
+- !g_silence_deprecated_manifest_version_warnings) {
+- *warning = errors::kManifestV2IsDeprecatedWarning;
+- }
+ return true;
+ }
+
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-23 08:59:50 +0000