gentoo auto-resync : 07:05:2023 - 23:37:50

2 files changed, 40 insertions, 12 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 25901cdc34ca..b4efef778bea 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -8,7 +8,7 @@ AUX chromium-112-libstdc++-1.patch 3045 BLAKE2B 195dd794a4a00fb0a354ca6e8c56c102
 AUX chromium-112-libstdc++.patch 2874 BLAKE2B f354b06944a761556b6d0465aee2a1dd701b18cdd272a1aa4aa68405ad05f575d1f0ef04ca2b05d5e65ce54efab31cfdf95e8963613ef7c811aaf343662e4b62 SHA512 b0307d10708b0ea9f94e941b9b734a16b4f74b7149e11cd6b30532835074e773c3499f954f38935bf7f16ebbda6dcf53695b513e56ff5bb0d810b4b1a6f4d3ac
 AUX chromium-112-sql-relax.patch 2064 BLAKE2B 37f362da2af26481f15f705466ce1eb282759ddad0cdc34a967120e26a2894bd5a1f22b69f6b3749a84bd1b155c55cbaeffebb2b7405d5eb80c7c59124a90ba4 SHA512 83e852e6710a748030b001fccede282830c00db102f338dfd92a0a86865d0f25456ae9adc3ab5b33719b156b8f0274df347c18e4670c53e57568afdeaf874804
 AUX chromium-112-swiftshader.patch 4852 BLAKE2B d1e5008b6d2f2150d7b86b8a4495532f5c8e458e6cdcdce565d8efde2d1f2c72409218bdaab02b56f451ca141df4f0ca7afca41c1dd0ffe83db2362675aa2c3b SHA512 62c18e64acbfc6d91b82a4501a01c86a59d2aa46eb446fa0cf036f42b73b7e91f6bc3603ccca8a06eaf3da9ffcbd052dc1d77f86148777cad709ee7eaadbfd7f
-AUX chromium-113-compiler.patch 3862 BLAKE2B 97e81054f0892a7c2dfc7b8f32a5f2266cf31afa90e33e5e90b5ecfb5b4f99732d72659525048541ea9060483db8d8f131251dc577807c65016e13c6f6f9b733 SHA512 53bb2cea6cc9b5164ad9e7bbb084a8b72e414fbc422e2e7794cc0eaeb97c7edd2f8cfb0cbc632e012d54ef800cdf003af9c66e1430d93b576403075f509788d1
+AUX chromium-113-compiler.patch 4833 BLAKE2B 436a253dcdb13ea713acbf5b6e12ed1344753dde64f6d380f256f061f85f63927ebdca9d4da841cafb1651e2a1d9747fc0b8e13e128f1f47a410ea90d8f522c1 SHA512 ae1cf87ff2241127260ad81db68ea332578b2af6ec9f18839787815c88a7f250b8b784209db1c74faa4cc6c7d4796fa2cdc1a19cbeed107bc5b27e948ecc9d29
 AUX chromium-113-gcc-13-0001-vulkanmemoryallocator.patch 390 BLAKE2B 791e499d84c2e86d8fae571f8a09ead2f9578c7c613660f732c5e3f853dd4ed7b07f7b51c4ae3baf6c75617d037166bc61e5431ff349c6c84672ca6af38ccd8d SHA512 852dcdb96227e0fe01e0146093d636dc7fe12e5595115ec9288673bd5a85b5a714d3b172e55fddc4ceafae935c9a465485476831685b0f49c85065c194d79da6
 AUX chromium-113-std-monospace.patch 1749 BLAKE2B de90064f4a687cd63d1169bb2003860ba54515a0208ba10a26d1d0f004eee44cd21ae411b2f5358307d779a16ef45ec4be11552a165070c0e06e48e94a5cbe31 SHA512 aa6ac32c339befdf829ab8874b2c29c3d7fd855771d7c068e96f90ee10dc268d598a65c884b727976ffaeda699121abc0fb21b020fc455d4428fd182264d7440
 AUX chromium-113-swiftshader-cstdint.patch 1715 BLAKE2B e2171e680b92c26d3d33ce8f8289c9029e6b28e2314f23ed49d76145bbf0a5207697d69e1ba5ee637e859c55f8db06f234ed95d9f131e2747ca1e66ed784cddd SHA512 ffada8b9848a3b145d8aad3c4382ce957220506b55446f8420ed902e584b096b868b81002f2eecc5b9459f5d1fd84d457df1c7e2622f77a483ac5fc54adf8ae6
diff --git a/www-client/chromium/files/chromium-113-compiler.patch b/www-client/chromium/files/chromium-113-compiler.patch
index 3b4c9238dbc5..5cd5d455f7ac 100644
--- a/www-client/chromium/files/chromium-113-compiler.patch
+++ b/www-client/chromium/files/chromium-113-compiler.patch
@@ -10,7 +10,35 @@
      ":compiler_codegen",
      ":compiler_deterministic",
    ]
-@@ -1707,7 +1705,7 @@
+@@ -1397,27 +1395,6 @@
+   }
+ }
+ 
+-config("clang_revision") {
+-  if (is_clang && clang_base_path == default_clang_base_path) {
+-    update_args = [
+-      "--print-revision",
+-      "--verify-version=$clang_version",
+-    ]
+-    if (llvm_force_head_revision) {
+-      update_args += [ "--llvm-force-head-revision" ]
+-    }
+-    clang_revision = exec_script("//tools/clang/scripts/update.py",
+-                                 update_args,
+-                                 "trim string")
+-
+-    # 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\"" ]
+-  }
+-}
+-
+ config("rustc_revision") {
+   if (rustc_revision != "") {
+     # Similar to the above config, this is here so that all files get recompiled
+@@ -1707,7 +1684,7 @@
        defines = [ "_HAS_NODISCARD" ]
      }
    } else {
@@ -19,7 +47,7 @@
      if (treat_warnings_as_errors) {
        cflags += [ "-Werror" ]
  
-@@ -1716,10 +1714,6 @@
+@@ -1716,10 +1693,6 @@
        # well.
        ldflags = [ "-Werror" ]
      }
@@ -30,7 +58,7 @@
  
      if (treat_warnings_as_errors) {
        # Turn rustc warnings into the "deny" lint level, which produce compiler
-@@ -1737,16 +1731,6 @@
+@@ -1737,16 +1710,6 @@
        "__STDC_FORMAT_MACROS",
      ]
  
@@ -47,7 +75,7 @@
      if (is_mac) {
        cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
        cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -2111,7 +2095,8 @@
+@@ -2111,7 +2074,8 @@
  }
  
  # Default "optimization on" config.
@@ -57,7 +85,7 @@
    if (is_win) {
      if (chrome_pgo_phase != 2) {
        # Favor size over speed, /O1 must be before the common flags.
-@@ -2170,7 +2155,8 @@
+@@ -2170,7 +2134,8 @@
  }
  
  # Turn off optimizations.
@@ -67,7 +95,7 @@
    if (is_win) {
      cflags = [
        "/Od",  # Disable optimization.
-@@ -2210,7 +2196,8 @@
+@@ -2210,7 +2175,8 @@
  # Turns up the optimization level. On Windows, this implies whole program
  # optimization and link-time code generation which is very expensive and should
  # be used sparingly.
@@ -77,7 +105,7 @@
    if (is_nacl && is_nacl_irt) {
      # The NaCl IRT is a special case and always wants its own config.
      # Various components do:
-@@ -2243,7 +2230,8 @@
+@@ -2243,7 +2209,8 @@
  #
  # TODO(crbug.com/621335) - rework how all of these configs are related
  # so that we don't need this disclaimer.
@@ -87,7 +115,7 @@
    if (is_nacl && is_nacl_irt) {
      # The NaCl IRT is a special case and always wants its own config.
      # Various components do:
-@@ -2269,7 +2257,8 @@
+@@ -2269,7 +2236,8 @@
    }
  }
  
@@ -97,7 +125,7 @@
    cflags = [ "-O1" ] + common_optimize_on_cflags
    rustflags = [ "-Copt-level=1" ]
    ldflags = common_optimize_on_ldflags
-@@ -2394,7 +2383,8 @@
+@@ -2394,7 +2362,8 @@
  }
  
  # Full symbols.
@@ -107,7 +135,7 @@
    if (is_win) {
      if (is_clang) {
        cflags = [
-@@ -2534,7 +2524,8 @@
+@@ -2534,7 +2503,8 @@
  # Minimal symbols.
  # This config guarantees to hold symbol for stack trace which are shown to user
  # when crash happens in unittests running on buildbot.
@@ -117,7 +145,7 @@
    if (is_win) {
      # Functions, files, and line tables only.
      cflags = []
-@@ -2608,7 +2599,8 @@
+@@ -2608,7 +2578,8 @@
  # 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.