From c3ec60d8953748433a04137e04480e9c1a36ed4c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Jul 2023 05:29:41 +0100 Subject: gentoo auto-resync : 02:07:2023 - 05:29:41 --- www-client/chromium/Manifest | 4 - .../chromium/files/chromium-113-compiler.patch | 157 --------------------- .../files/chromium-113-std-monospace.patch | 36 ----- .../chromium/files/chromium-113-system-zlib.patch | 41 ------ .../files/chromium-113-web_view_impl-cstring.patch | 25 ---- 5 files changed, 263 deletions(-) delete mode 100644 www-client/chromium/files/chromium-113-compiler.patch delete mode 100644 www-client/chromium/files/chromium-113-std-monospace.patch delete mode 100644 www-client/chromium/files/chromium-113-system-zlib.patch delete mode 100644 www-client/chromium/files/chromium-113-web_view_impl-cstring.patch (limited to 'www-client/chromium') diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 58133a8552a7..adc874cbab67 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -2,12 +2,8 @@ AUX chromium-108-EnumTable-crash.patch 2974 BLAKE2B b2d58b6b2b67b3bc2f04662749c3 AUX chromium-109-system-openh264.patch 577 BLAKE2B ec83d9a72a163683d791893e6b72fd5a6ffaa18d611bc6e6785819292370cc9f4fd37d8d3a33ecb5621beb33a3271df00d7a1b629300fdfa8db6e4e4eb196f1e SHA512 5ea73c8522619d83047fcd429988b24687e928e01c2915ef4145469fbb1238ef4a72beca73493794e2275b855f95412355700579a31649d64d74133ed815f1cb AUX chromium-109-system-zlib.patch 440 BLAKE2B 95bb1099055e3e0e122d4d8a77cddec0a3417b3d87ef252d7a475f6be23b16f587ec627c90bac41d743bd9dc07488edccb0946ed465f2244b61adc44cd19761d SHA512 b4e386613eb2a0dd61af40bb29621356085e183b97d830661e5157e4f22c2ada5606d80e56d5a65fb2985cdffb505a878c32bdafb081b1fa24cbe976c7b60b86 AUX chromium-111-InkDropHost-crash.patch 1066 BLAKE2B ee0b42803a59ef4731e4f316849c2062870b92040ff4e339c3f3f2562999b54fa3176b27e432f31ada76559087631fd623d9f57f1961a42acd0684041c322a01 SHA512 dfa3ab6a84b57b6e66053be2597f0d6c7f4caf54b0e45a359774a56dfbe1e65bdea91120134e77b1e7c38c336a4fd8d05a7c26e9d3bf4bdc0fe40ad7cd832a54 -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 -AUX chromium-113-system-zlib.patch 1856 BLAKE2B 3d47acb3521b3d08fd963a6df57a7987ec54060a5abee55e5d7e86322b4fad21a54e4b2773334992ff563e2bace66d04fa6ce65e6822f3783829363414559882 SHA512 318b2f6566f9babcce91b2009863d06babb9eb3ff6bfef76323f089de1eed8b58d5579476bd2d14d6c8e45ab536ee8b5794e8f39c9563d43771e693908d07b8a -AUX chromium-113-web_view_impl-cstring.patch 911 BLAKE2B 7ad2a6e19ffd1ac45f763e9ca82757fea1dda72ad1b763655848cbe98f581d50dfbfc6e50cc78031a375480b6f5e09b80ae33b1bcd2601100ace55c37d076ecb SHA512 de8ff269a4ec658918896c5e6e42110aa6808f673097d38618463f46d37276b37c238143448846a32f57eebb05f6b35895b495f576c0bd5df07e6ea870f8943d AUX chromium-114-compiler.patch 5704 BLAKE2B 0db05ab61b031e70c92470c3028c99b012f7d8106d3fa91ea7c3412df9b3631b6eb22b65a5bf9a8f5cab266cd61e23ac23a79313c822bf05fd01efb75bd5ef74 SHA512 432f58eefa5a3c5e71d578f20db4e86a6ed9a2ab9bca37b3268f9d61bb124c3bbb1456513ce3b51eeb94aeb31d4d93f7ee5b73f1887a50d0288241989749ea51 AUX chromium-114-gcc12.patch 1256 BLAKE2B f0e964955ef529c01a9ce53e9cc64733dbf93e531bc7970c817ed3ade73c0095f62318a9d5e2e146b41d0727ecc30cde8c5e4106e8e9f7016d11c04494566979 SHA512 8a8bd49ce4793e20773e76efd472bc9d41f7257e1db99d4406f85faed3ee0af0e2e08688c22fca2807d7c63c016b433b4bb0174461925d992806d7b171855e8f AUX chromium-114-iwyu-gcc-13.patch 2523 BLAKE2B 3e6667f553ad6de2469071282642644786df7ef4073d9d9c40c5a90f0f849c68e146e3eb8f26ec22655fd65ce1982f8e0a080efc801be75c087e3db2e98dee7e SHA512 687b418843638840eba0ee258a4b5f9353fbe0860ef4228475322fba5eab698d5f8c28a57da47227a39ec8cfd1fc045a7c32b52b3c41795a0d87d7c32f93d300 diff --git a/www-client/chromium/files/chromium-113-compiler.patch b/www-client/chromium/files/chromium-113-compiler.patch deleted file mode 100644 index 5cd5d455f7ac..000000000000 --- a/www-client/chromium/files/chromium-113-compiler.patch +++ /dev/null @@ -1,157 +0,0 @@ ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -289,9 +289,7 @@ - - configs += [ - # See the definitions below. -- ":clang_revision", - ":rustc_revision", -- ":compiler_cpu_abi", - ":compiler_codegen", - ":compiler_deterministic", - ] -@@ -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 { -- cflags = [ "-Wall" ] -+ cflags = [] - if (treat_warnings_as_errors) { - cflags += [ "-Werror" ] - -@@ -1716,10 +1693,6 @@ - # well. - ldflags = [ "-Werror" ] - } -- if (is_clang) { -- # Enable extra warnings for chromium_code when we control the compiler. -- cflags += [ "-Wextra" ] -- } - - if (treat_warnings_as_errors) { - # Turn rustc warnings into the "deny" lint level, which produce compiler -@@ -1737,16 +1710,6 @@ - "__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. -- defines += [ "_FORTIFY_SOURCE=2" ] -- } -- - if (is_mac) { - cflags_objc = [ "-Wobjc-missing-property-synthesis" ] - cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -2111,7 +2074,8 @@ - } - - # Default "optimization on" config. --config("optimize") { -+config("optimize") { } -+config("xoptimize") { - if (is_win) { - if (chrome_pgo_phase != 2) { - # Favor size over speed, /O1 must be before the common flags. -@@ -2170,7 +2134,8 @@ - } - - # Turn off optimizations. --config("no_optimize") { -+config("no_optimize") { } -+config("xno_optimize") { - if (is_win) { - cflags = [ - "/Od", # Disable optimization. -@@ -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. --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: -@@ -2243,7 +2209,8 @@ - # - # 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: -@@ -2269,7 +2236,8 @@ - } - } - --config("optimize_fuzzing") { -+config("optimize_fuzzing") { } -+config("xoptimize_fuzzing") { - cflags = [ "-O1" ] + common_optimize_on_cflags - rustflags = [ "-Copt-level=1" ] - ldflags = common_optimize_on_ldflags -@@ -2394,7 +2362,8 @@ - } - - # Full symbols. --config("symbols") { -+config("symbols") { } -+config("xsymbols") { - if (is_win) { - if (is_clang) { - cflags = [ -@@ -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. --config("minimal_symbols") { -+config("minimal_symbols") { } -+config("xminimal_symbols") { - if (is_win) { - # Functions, files, and line tables only. - cflags = [] -@@ -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. --config("no_symbols") { -+config("no_symbols") { } -+config("xno_symbols") { - if (is_win) { - ldflags = [ "/DEBUG" ] - diff --git a/www-client/chromium/files/chromium-113-std-monospace.patch b/www-client/chromium/files/chromium-113-std-monospace.patch deleted file mode 100644 index 48d69513e6df..000000000000 --- a/www-client/chromium/files/chromium-113-std-monospace.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e55c0bf35f4c54610c3bb40fcdc1b961bfd9f763 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Mon, 27 Mar 2023 16:38:29 +0000 -Subject: [PATCH] Do not use std::monospace for absl::variant - -authenticator_request_dialog_model.h introduced usage of -std::monospace, though no include was added for it. But in this file -it is using absl::variant. For uniformity, keep using absl::monospace -before all the file moves to use std variants. - -This fixes a break in libstdc++ build. - -Bug: 957519 -Change-Id: I16adf924e935d2517916969000f8e94efc118c53 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4372590 -Commit-Queue: José Dapena Paz -Reviewed-by: Nina Satragno -Cr-Commit-Position: refs/heads/main@{#1122463} ---- - -diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.h b/chrome/browser/webauthn/authenticator_request_dialog_model.h -index f4992a7..6a4bcf68 100644 ---- a/chrome/browser/webauthn/authenticator_request_dialog_model.h -+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h -@@ -181,9 +181,9 @@ - // These types describe the type of Mechanism. - using Transport = - base::StrongAlias; -- using WindowsAPI = base::StrongAlias; -+ using WindowsAPI = base::StrongAlias; - using Phone = base::StrongAlias; -- using AddPhone = base::StrongAlias; -+ using AddPhone = base::StrongAlias; - using Type = absl::variant; - - Mechanism(Type type, diff --git a/www-client/chromium/files/chromium-113-system-zlib.patch b/www-client/chromium/files/chromium-113-system-zlib.patch deleted file mode 100644 index 8d225d495a11..000000000000 --- a/www-client/chromium/files/chromium-113-system-zlib.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c8b965be5b61c2412df938e1feb380b69bd92ee9 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Thu, 06 Apr 2023 07:15:03 +0000 -Subject: [PATCH] [unbundle] do not use ZipAnalyzer traits header - -It is enough to include chrome/common/safe_browsing/archive_analyzer_results.h. - -Bug: None -Change-Id: Ia63a66b77c073fa4fdb8470db34b4c24722293cc -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4373706 -Reviewed-by: Daniel Rubery -Commit-Queue: Stephan Hartmann -Cr-Commit-Position: refs/heads/main@{#1127041} ---- - -diff --git a/chrome/services/file_util/public/mojom/BUILD.gn b/chrome/services/file_util/public/mojom/BUILD.gn -index b9e80cc..461d2d0 100644 ---- a/chrome/services/file_util/public/mojom/BUILD.gn -+++ b/chrome/services/file_util/public/mojom/BUILD.gn -@@ -55,7 +55,8 @@ - cpp = "::safe_browsing::ArchiveAnalyzerResults" - }, - ] -- traits_headers = [ "//chrome/common/safe_browsing/zip_analyzer.h" ] -+ traits_headers = -+ [ "//chrome/common/safe_browsing/archive_analyzer_results.h" ] - traits_private_headers = [ "safe_archive_analyzer_param_traits.h" ] - traits_public_deps = [ - "//chrome/common/safe_browsing:proto", -diff --git a/chrome/services/file_util/safe_archive_analyzer.h b/chrome/services/file_util/safe_archive_analyzer.h -index 62307b8..0231205 100644 ---- a/chrome/services/file_util/safe_archive_analyzer.h -+++ b/chrome/services/file_util/safe_archive_analyzer.h -@@ -7,6 +7,7 @@ - - #include "chrome/common/safe_browsing/archive_analyzer_results.h" - #include "chrome/common/safe_browsing/rar_analyzer.h" -+#include "chrome/common/safe_browsing/zip_analyzer.h" - #include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h" - #include "mojo/public/cpp/bindings/remote.h" - diff --git a/www-client/chromium/files/chromium-113-web_view_impl-cstring.patch b/www-client/chromium/files/chromium-113-web_view_impl-cstring.patch deleted file mode 100644 index 44f7b2d36b48..000000000000 --- a/www-client/chromium/files/chromium-113-web_view_impl-cstring.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Tue, 28 Mar 2023 14:34:55 +0000 -Subject: [PATCH] IWYU: add cstring for std::strlen in web_view_impl.cc - -Bug: 957519 -Change-Id: I15ad1e905eda3d96bbf164f5df8f3cf8e02bc370 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376772 -Reviewed-by: Alex Ilin -Commit-Queue: Alex Ilin -Cr-Commit-Position: refs/heads/main@{#1123011} ---- - -diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc -index f726627..d96d481d 100644 ---- a/chrome/test/chromedriver/chrome/web_view_impl.cc -+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc -@@ -6,6 +6,7 @@ - - #include - #include -+#include - #include - #include - #include -- cgit v1.2.3