more weird stuff

2 files changed, 28 insertions, 18 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a928e42..16c9d7a 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -17,7 +17,7 @@ AUX chromium-140-gni-lf.patch 1242 BLAKE2B 3686048909b6f4417951c1709b3d757ec6e73
 AUX chromium-140-rust-1.8x.patch 626 BLAKE2B 3dcd6ace2bd8e8072e0a12eb8035bfc060f59fe55b20e623ff16897bf79596991773eab4f1e7a1d1b8334a2b3193f208524f4397ba1ff10e78a70f94c7ff7723 SHA512 ecc8cdef7409f6fc2a0af5ea8f9909d30b267457120e0a87702726a213446607c9473b521420d6738d1113c6697bd0a0716d9a2097d70b9d396b3dc35d7c7660
 AUX chromium-141-compiler.patch 18130 BLAKE2B 371c035b27eabf9724a195e5d8d5a9472d0e6e7161484147da0e1230a30381b056bb195bdd8b0d354b0c5c0d0dc4712fbe0a75c45f8e189800181e7016dd90a5 SHA512 209c2398f646b07e2f0a742709e66db11fae169d5e10a1a360821f416c62e529b2516a1a61d05b753ade25f35956c72012d874fb94d6f8c1e7cbbff58cbabb34
 AUX chromium-141-mv2-ungoogled.patch 7180 BLAKE2B 5d4c0aa6c85aa62d77691b64ef9f99054977674fd05462f7eaa5612f8372ed0c9f8a92f480bcf6a152657c21f266f1449814f070f6510773214e2b55a8a868f2 SHA512 7dd646188b4db14cba565a3a91dbb8a0c101c74d46b23d43647dde57ba1abef80196d46623f7f66049fb80ac14c3dff872cf0bb78a7a59e073701899f8b235fb
-AUX chromium-142-compiler.patch 19579 BLAKE2B a02f67483bbf07b6c273d3a73939958fa2ac60cc0c886318b046cc4325d1f63ea9be7169b988aa86721e8316d0fc31f0f3f2e83f9f6c9c0b62eb903c7e4a05e4 SHA512 f8056f2f07c17da2878d2b34c2b692b65b1d0ddb57f48e92e4044835a1968e90fe7cf9cb60d02af6c768625047a83304e5378a15a8e7071f73c9c18ad91aeafe
+AUX chromium-142-compiler.patch 19923 BLAKE2B 02a8d8708291b35902019ce37f2b790f336e7e4fcfc89aabdedfc0e088cf4dde87244f93381e8a5c5b71a22f2aa6eaa92d93afdec92b22a8a0714cb54067a1e5 SHA512 af051a3691693a6cc39fa6b0f7a8084a019cb72e9b9b49d1aff48ef2c32bdcbc68144ef8ecc7375702a7d5433d443c7ae33d10bd633565cfd4b2316b93375319
 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
diff --git a/www-client/chromium/files/chromium-142-compiler.patch b/www-client/chromium/files/chromium-142-compiler.patch
index 8b9b331..ba45a89 100644
--- a/www-client/chromium/files/chromium-142-compiler.patch
+++ b/www-client/chromium/files/chromium-142-compiler.patch
@@ -1,5 +1,5 @@
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 9cf9079bc5..fe08327b93 100644
+index 9cf9079bc5..2e4c762503 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -261,15 +261,6 @@ declare_args() {
@@ -316,17 +316,27 @@ index 9cf9079bc5..fe08327b93 100644
  config("compiler_arm_fpu") {
    if (current_cpu == "arm" && !is_ios) {
      cflags = [ "-mfpu=$arm_fpu" ]
-@@ -1866,7 +1629,8 @@ config("compiler_arm") {
-   }
+@@ -1867,6 +1630,19 @@ config("compiler_arm") {
  }
  
--config("libcxx_module") {
-+config("libcxx_module") {}
+ 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",
-@@ -2163,18 +1927,6 @@ config("default_warnings") {
+@@ -2163,18 +1939,6 @@ config("default_warnings") {
        ]
      }
  
@@ -345,7 +355,7 @@ index 9cf9079bc5..fe08327b93 100644
      if (is_wasm) {
        # Abseil's `symbolize_emscripten.inc` file currently has macros that are
        # not compatible with C++98, so turn off the warnings.
-@@ -2206,14 +1958,6 @@ config("default_warnings") {
+@@ -2206,14 +1970,6 @@ config("default_warnings") {
      if (cc_wrapper == "ccache" || cc_wrapper == "icecc") {
        cflags += [ "-Wno-gnu-line-marker" ]
      }
@@ -360,7 +370,7 @@ index 9cf9079bc5..fe08327b93 100644
    }
  
    # TODO(crbug.com/354162568): Clean up and enable.
-@@ -2286,11 +2030,7 @@ config("chromium_code") {
+@@ -2286,11 +2042,7 @@ config("chromium_code") {
        defines = [ "_HAS_NODISCARD" ]
      }
    } else {
@@ -373,7 +383,7 @@ index 9cf9079bc5..fe08327b93 100644
  
      # In Chromium code, we define __STDC_foo_MACROS in order to get the
      # C99 macros on Mac and Linux.
-@@ -2299,24 +2039,6 @@ config("chromium_code") {
+@@ -2299,24 +2051,6 @@ config("chromium_code") {
        "__STDC_FORMAT_MACROS",
      ]
  
@@ -398,7 +408,7 @@ index 9cf9079bc5..fe08327b93 100644
      if (is_apple) {
        cflags_objc = [ "-Wimplicit-retain-self" ]
        cflags_objcc = [ "-Wimplicit-retain-self" ]
-@@ -2732,7 +2454,8 @@ config("default_stack_frames") {
+@@ -2732,7 +2466,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
@@ -408,7 +418,7 @@ index 9cf9079bc5..fe08327b93 100644
    if (is_win) {
      # clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for
      # consistency with the other platforms.
-@@ -2781,7 +2504,8 @@ config("optimize") {
+@@ -2781,7 +2516,8 @@ config("optimize") {
  }
  
  # Turn off optimizations.
@@ -418,7 +428,7 @@ index 9cf9079bc5..fe08327b93 100644
    if (is_win) {
      cflags = [
        "/Od",  # Disable optimization.
-@@ -2816,7 +2540,8 @@ config("no_optimize") {
+@@ -2816,7 +2552,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.
@@ -428,7 +438,7 @@ index 9cf9079bc5..fe08327b93 100644
    ldflags = common_optimize_on_ldflags
    if (is_win) {
      # Favor speed over size, /O2 must be before the common flags.
-@@ -2837,7 +2562,8 @@ config("optimize_max") {
+@@ -2837,7 +2574,8 @@ config("optimize_max") {
  #
  # TODO(crbug.com/41259697) - rework how all of these configs are related
  # so that we don't need this disclaimer.
@@ -438,7 +448,7 @@ index 9cf9079bc5..fe08327b93 100644
    ldflags = common_optimize_on_ldflags
    if (is_win) {
      # Favor speed over size, /O2 must be before the common flags.
-@@ -2854,7 +2580,8 @@ config("optimize_speed") {
+@@ -2854,7 +2592,8 @@ config("optimize_speed") {
    rustflags = [ "-Copt-level=3" ]
  }
  
@@ -448,7 +458,7 @@ index 9cf9079bc5..fe08327b93 100644
    cflags = [ "-O1" ] + common_optimize_on_cflags
    rustflags = [ "-Copt-level=1" ]
    ldflags = common_optimize_on_ldflags
-@@ -2981,7 +2708,8 @@ config("win_pdbaltpath") {
+@@ -2981,7 +2720,8 @@ config("win_pdbaltpath") {
  }
  
  # Full symbols.
@@ -458,7 +468,7 @@ index 9cf9079bc5..fe08327b93 100644
    rustflags = []
    configs = []
    if (is_win) {
-@@ -3137,7 +2865,8 @@ config("symbols") {
+@@ -3137,7 +2877,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.
@@ -468,7 +478,7 @@ index 9cf9079bc5..fe08327b93 100644
    rustflags = []
    if (is_win) {
      # Functions, files, and line tables only.
-@@ -3213,7 +2942,8 @@ config("minimal_symbols") {
+@@ -3213,7 +2954,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.