summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2023-06-30 23:11:34 +0200
committerConrad Kostecki <conikost@gentoo.org>2023-07-02 03:33:53 +0200
commitbf19d5aa7eaf8ffd34b581069196d7141e5772b9 (patch)
tree55de1514ec7b741e69cc860ed5a74e6d25c787d1 /www-client/chromium
parentwww-apps/phpsysinfo: add 3.4.3 (diff)
downloadgentoo-bf19d5aa7eaf8ffd34b581069196d7141e5772b9.tar.gz
gentoo-bf19d5aa7eaf8ffd34b581069196d7141e5772b9.tar.bz2
gentoo-bf19d5aa7eaf8ffd34b581069196d7141e5772b9.zip
www-client/chromium: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31681 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/files/chromium-113-compiler.patch157
-rw-r--r--www-client/chromium/files/chromium-113-std-monospace.patch36
-rw-r--r--www-client/chromium/files/chromium-113-system-zlib.patch41
-rw-r--r--www-client/chromium/files/chromium-113-web_view_impl-cstring.patch25
4 files changed, 0 insertions, 259 deletions
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 <jdapena@igalia.com>
-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 <jdapena@igalia.com>
-Reviewed-by: Nina Satragno <nsatragno@chromium.org>
-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<class TransportTag, AuthenticatorTransport>;
-- using WindowsAPI = base::StrongAlias<class WindowsAPITag, std::monostate>;
-+ using WindowsAPI = base::StrongAlias<class WindowsAPITag, absl::monostate>;
- using Phone = base::StrongAlias<class PhoneTag, std::string>;
-- using AddPhone = base::StrongAlias<class AddPhoneTag, std::monostate>;
-+ using AddPhone = base::StrongAlias<class AddPhoneTag, absl::monostate>;
- using Type = absl::variant<Transport, WindowsAPI, Phone, AddPhone>;
-
- 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 <stha09@googlemail.com>
-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 <drubery@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-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 <stha09@googlemail.com>
-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 <alexilin@chromium.org>
-Commit-Queue: Alex Ilin <alexilin@chromium.org>
-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 <stddef.h>
- #include <algorithm>
-+#include <cstring>
- #include <memory>
- #include <queue>
- #include <utility>