chromium 125.0.6382.3?

3 files changed, 322 insertions, 5 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b9d02ca..80e3e64 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -37,6 +37,7 @@ AUX chromium-123-EnumTable-crash.patch 2978 BLAKE2B 44b18e702b82f4839a8a4cc639d1
 AUX chromium-123-compiler.patch 11238 BLAKE2B 2cd6a2dc550f952685db63062d7d90f688d29fb391b52646880c50d1884913a29e88f7e706a16b8a2954373f020d8488995dd9ced5c3a4aff044774a6b5a2320 SHA512 709ad3c413308a7e50ae95b433f52868c93a96682dacdeb82310e166af0b56afa7b98a1c0dfd147a34be0d9ba78c174ff547d95b429b4734aa3a11b736b3cf9f
 AUX chromium-123-qrgen-disablerust.patch 3371 BLAKE2B d4d8d37fc7c971f97467441c22bdf7dba1a22c17d73c47978b926565759b5b113c8a03a91d76cdb1e8f8d1fc3902c86bcc7ed703e84959927548cccfbc45836b SHA512 c3a5f6424806fc6528ee7eab83e13169218d82b18750298e916696a0d6fa288b1881e267a72a57cb03291fe642d7edf91d365e320587d40277ed9e7a860b497a
 AUX chromium-124-metrics-histograms-nodepotbin.patch 533 BLAKE2B 2dee74b4c10b4d8280ba0b0dcdea0c8f7896422c190bbf31b7ee147a6ac81b34033a156c9fd66cf8e875aaa02a8ebeb4e04d7164f7e6701836539300297f25f3 SHA512 a1ecd84d7433542779da17e79fe73a63f4bff94c49b13c51947ade9ed27f82e8fca94b08d628e7cd8853c2e9ffc11078b02fab81fba98635390805b0230035f4
+AUX chromium-125-compiler.patch 11174 BLAKE2B 72d9ba637c1d726edcb4a9ff695b34f6a70e39c775ac34bc6b3bd9151ac390c9840429bef82bac1ff32502dd5dee49754bbc868eed1c28562b07ca33cf136189 SHA512 7e17a17947025ae992882828ccea0dd85d0a749c7dd27b1423ea436f0da379fe846b4808df6186f74df161f69c6b8802881ab3569511580e121aea359c4f90e3
 AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
 AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6
@@ -47,8 +48,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-124.0.6315.2.tar.xz 3442060216 BLAKE2B 95f30a53d26bbd58006521899ca658ceda2a6054652b52795a5fbf11d10a6e6c4bf768b915e9f466f5f9568cacaf7706b887ebed383b51a964b457ab56b47399 SHA512 9e360923530c39bfc8f823e98ba69928ba8c890650f34ef3a7f31d5c34343caaf4db054f44211d02de2e3aac4913dd86308d5a7cd9a5b1e52308ec5998bc4946
 DIST chromium-124.0.6342.3.tar.xz 3445784432 BLAKE2B 65d682903123f2d853ceb016a416fd921c6efd6bbcb4fb65e3bd598fb794da72e8fcdee6507d508d84f45467394d3e9a43ca117891902e26e71ab01b3fa1df0e SHA512 43d11236f3f4c3a8137c0175e0098ae5e7a38a49a9040fe11a184cabf499c50b357800962d0235be61a82f9e09dbc8dac605c660331243798f08d116838859ba
+DIST chromium-125.0.6382.3.tar.xz 3423991912 BLAKE2B 45dc9f65ab91f235f7733d818e5e80a00915eebb1b0b24b2579b8346ec2c94f541b30f39dc7702db791e8789c4921a30a351b7b05c0c02be477fde803522fd14 SHA512 be5f1cab6e71a826899252075ca4b445799bf1b4d1ca4cb2a51f544a21b502622cd469afa1be08fe3a0809d44b717c6616cac31e905c90a633a265f5e5e6c5d5
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
-EBUILD chromium-124.0.6315.2.ebuild 39579 BLAKE2B 45bbd8369db6028d807ec0e53dbffb5abca498e9125dd5b13d7bedc43db739d569edfe79294daf9d0293898eabc8d8821510c11eb6ad3031bbad55fa9fa26f51 SHA512 2c58036fb56eb5dde2466a04494db7be9bf96e1ee76665224125df1a0bd4a260e82857d7d08828007b333e202a4be27536333951a37b0bb17aecc5a71d301780
 EBUILD chromium-124.0.6342.3.ebuild 39546 BLAKE2B 53b528f641e5f278c045c27aeba813d93eeedd5ea6f15e2c67e54de4781329336199e6bdb67ef194e1c620193bc58e15b59cc0c8415ec42733542f1cbaec93e5 SHA512 afef968b574473c39dd50be20a85031737b6c4e11050a2e2e124edff226aba62f9eca232c7f85991929cf078af5b18ba6465b273b32be283d014be6467b4db98
+EBUILD chromium-125.0.6382.3.ebuild 39546 BLAKE2B c499e397d9d091b5c40a0cf052ec44eb623095f4332c40c10ff26b11ead7e89e26074130e7dc6d5ffbfad8ae37c5d268f376501d8d2b1657206f790e5dea28c9 SHA512 f4deb561bb8ff36f50cef197fd2a6dcdb14fd145bc44954a6615a97d61530302cd26a37e6355e468969d361c98441456c3edb43e106d7945d40fb8dac0e58b4c
diff --git a/www-client/chromium/chromium-124.0.6315.2.ebuild b/www-client/chromium/chromium-125.0.6382.3.ebuild
index fe4a244..d7c49ec 100644
--- a/www-client/chromium/chromium-124.0.6315.2.ebuild
+++ b/www-client/chromium/chromium-125.0.6382.3.ebuild
@@ -320,11 +320,11 @@ src_prepare() {
 
 	local PATCHES=(
 		"${FILESDIR}/chromium-105-protobuf-RepeatedPtrField-export.patch"
-		"${FILESDIR}/chromium-123-compiler.patch"
-		"${FILESDIR}/chromium-122-VirtualCursor-std-layout.patch"
+		"${FILESDIR}/chromium-125-compiler.patch"
 		"${FILESDIR}/chromium-119-minizip.patch"
 		"${FILESDIR}/chromium-118-material-color-utils.patch"
 		"${FILESDIR}/chromium-118-freetype-blink.patch"
+		"${FILESDIR}/chromium-124-metrics-histograms-nodepotbin.patch"
 
 		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-123-EnumTable-crash.patch"
@@ -502,7 +502,6 @@ src_prepare() {
 		third_party/ots
 		third_party/pdfium
 		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
 		third_party/pdfium/third_party/bigint
 		third_party/pdfium/third_party/freetype
 		third_party/pdfium/third_party/lcms
diff --git a/www-client/chromium/files/chromium-125-compiler.patch b/www-client/chromium/files/chromium-125-compiler.patch
new file mode 100644
index 0000000..f656fcf
--- /dev/null
+++ b/www-client/chromium/files/chromium-125-compiler.patch
@@ -0,0 +1,317 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 2ac26091c0..75abd9a935 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -319,9 +319,6 @@ config("compiler") {
+ 
+   configs += [
+     # See the definitions below.
+-    ":clang_revision",
+-    ":rustc_revision",
+-    ":compiler_cpu_abi",
+     ":compiler_codegen",
+     ":compiler_deterministic",
+   ]
+@@ -496,6 +493,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.)
+@@ -587,55 +587,6 @@ config("compiler") {
+     ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
+   }
+ 
+-  if (is_clang && !is_nacl && current_os != "zos") {
+-    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/1488374): This causes binary size growth and potentially
+-    # other problems.
+-    # TODO(crbug.com/1491036): 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/1235145): Investigate why/if this should be needed.
+-    if (is_win) {
+-      cflags += [ "/clang:-ffp-contract=off" ]
+-    } else {
+-      cflags += [ "-ffp-contract=off" ]
+-    }
+-  }
+-
+   # C11/C++11 compiler flags setup.
+   # ---------------------------
+   if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
+@@ -1000,17 +951,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=.",
+   ]
+ 
+   if (!is_win || force_rustc_color_output) {
+@@ -1518,46 +1458,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.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-      swiftflags += [ "-file-compilation-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.
+@@ -1576,39 +1476,6 @@ config("compiler_deterministic") {
+   }
+ }
+ 
+-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
+-    # 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 && !is_nacl) {
+     cflags = [ "-mfpu=$arm_fpu" ]
+@@ -1981,11 +1848,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.
+@@ -1994,24 +1857,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 && !lacros_use_chromium_toolchain) {
+-        fortify_level = "3"
+-      }
+-      defines += [ "_FORTIFY_SOURCE=" + fortify_level ]
+-    }
+-
+     if (is_apple) {
+       cflags_objc = [ "-Wimplicit-retain-self" ]
+       cflags_objcc = [ "-Wimplicit-retain-self" ]
+@@ -2387,7 +2232,8 @@ config("default_stack_frames") {
+ }
+ 
+ # Default "optimization on" config.
+-config("optimize") {
++config("optimize") { }
++config("xoptimize") {
+   if (is_win) {
+     cflags = [ "/O2" ] + common_optimize_on_cflags
+ 
+@@ -2428,7 +2274,8 @@ config("optimize") {
+ }
+ 
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+   if (is_win) {
+     cflags = [
+       "/Od",  # Disable optimization.
+@@ -2468,7 +2315,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") {
+   if (is_nacl && is_nacl_irt) {
+     # The NaCl IRT is a special case and always wants its own config.
+     # Various components do:
+@@ -2501,7 +2349,8 @@ config("optimize_max") {
+ #
+ # TODO(crbug.com/621335) - 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") {
+   if (is_nacl && is_nacl_irt) {
+     # The NaCl IRT is a special case and always wants its own config.
+     # Various components do:
+@@ -2530,7 +2379,8 @@ config("optimize_speed") {
+   }
+ }
+ 
+-config("optimize_fuzzing") {
++config("optimize_fuzzing") { }
++config("xoptimize_fuzzing") {
+   cflags = [ "-O1" ] + common_optimize_on_cflags
+   rustflags = [ "-Copt-level=1" ]
+   ldflags = common_optimize_on_ldflags
+@@ -2663,7 +2513,8 @@ config("win_pdbaltpath") {
+ }
+ 
+ # Full symbols.
+-config("symbols") {
++config("symbols") { }
++config("xsymbols") {
+   rustflags = []
+   if (is_win) {
+     if (is_clang) {
+@@ -2812,7 +2663,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.
+@@ -2897,7 +2749,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/rust.gni b/build/config/rust.gni
+index 59fa14463b..ca780602b4 100644
+--- a/build/config/rust.gni
++++ b/build/config/rust.gni
+@@ -75,7 +75,8 @@ declare_args() {
+   #
+   # TODO(https://crbug.com/1482525): 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'