summaryrefslogtreecommitdiff
path: root/www-client/chromium/files
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r--www-client/chromium/files/chromium-105-compiler.patch209
-rw-r--r--www-client/chromium/files/chromium-105-protobuf-RepeatedPtrField-export.patch13
-rw-r--r--www-client/chromium/files/chromium-105-webrtc-aec3-include.patch24
-rw-r--r--www-client/chromium/files/chromium-106-browser-ui-include.patch12
-rw-r--r--www-client/chromium/files/chromium-106-minizip.patch147
-rw-r--r--www-client/chromium/files/chromium-106-power_bookmarks-include.patch20
6 files changed, 0 insertions, 425 deletions
diff --git a/www-client/chromium/files/chromium-105-compiler.patch b/www-client/chromium/files/chromium-105-compiler.patch
deleted file mode 100644
index e8573e0..0000000
--- a/www-client/chromium/files/chromium-105-compiler.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index cab8b77aa..0b2bb7965 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -283,9 +283,7 @@ config("compiler") {
-
- configs += [
- # See the definitions below.
-- ":clang_revision",
- ":rustc_revision",
-- ":compiler_cpu_abi",
- ":compiler_codegen",
- ":compiler_deterministic",
- ]
-@@ -519,31 +517,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 ]
--
-- # 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/1235145): Investigate why/if this should be needed.
-- if (is_win) {
-- cflags += [ "/clang:-ffp-contract=off" ]
-- } else {
-- cflags += [ "-ffp-contract=off" ]
-- }
-- }
--
- # Rust compiler setup (for either clang or rustc).
- if (enable_rust) {
- defines += [ "RUST_ENABLED" ]
-@@ -1247,45 +1220,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=." ]
-- }
-- 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 goma cache entries.
-@@ -1624,7 +1558,7 @@ config("chromium_code") {
- defines = [ "_HAS_NODISCARD" ]
- }
- } else {
-- cflags = [ "-Wall" ]
-+ cflags = []
- if (treat_warnings_as_errors) {
- cflags += [ "-Werror" ]
-
-@@ -1633,10 +1567,6 @@ config("chromium_code") {
- # well.
- ldflags = [ "-Werror" ]
- }
-- if (is_clang) {
-- # Enable extra warnings for chromium_code when we control the compiler.
-- cflags += [ "-Wextra" ]
-- }
-
- # In Chromium code, we define __STDC_foo_MACROS in order to get the
- # C99 macros on Mac and Linux.
-@@ -1645,16 +1575,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") {
-- # 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" ]
-@@ -2045,7 +1965,8 @@ config("default_stack_frames") {
- }
-
- # 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.
-@@ -2083,7 +2004,8 @@ config("optimize") {
- }
-
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
- if (is_win) {
- cflags = [
- "/Od", # Disable optimization.
-@@ -2123,7 +2045,8 @@ config("no_optimize") {
- # 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:
-@@ -2156,7 +2079,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:
-@@ -2182,7 +2106,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
-@@ -2301,7 +2226,8 @@ config("win_pdbaltpath") {
- }
-
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
- if (is_win) {
- if (is_clang) {
- cflags = [ "/Z7" ] # Debug information in the .obj files.
-@@ -2426,7 +2352,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") {
- if (is_win) {
- # Functions, files, and line tables only.
- cflags = []
-@@ -2498,7 +2425,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/www-client/chromium/files/chromium-105-protobuf-RepeatedPtrField-export.patch b/www-client/chromium/files/chromium-105-protobuf-RepeatedPtrField-export.patch
deleted file mode 100644
index e20bc22..0000000
--- a/www-client/chromium/files/chromium-105-protobuf-RepeatedPtrField-export.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/protobuf/src/google/protobuf/repeated_ptr_field.h b/third_party/protobuf/src/google/protobuf/repeated_ptr_field.h
-index e81b2c7e4..df3811563 100644
---- a/third_party/protobuf/src/google/protobuf/repeated_ptr_field.h
-+++ b/third_party/protobuf/src/google/protobuf/repeated_ptr_field.h
-@@ -847,7 +847,7 @@ class StringTypeHandler {
- // RepeatedPtrField is like RepeatedField, but used for repeated strings or
- // Messages.
- template <typename Element>
--class RepeatedPtrField final : private internal::RepeatedPtrFieldBase {
-+class PROTOBUF_EXPORT RepeatedPtrField final : private internal::RepeatedPtrFieldBase {
-
- public:
- constexpr RepeatedPtrField();
diff --git a/www-client/chromium/files/chromium-105-webrtc-aec3-include.patch b/www-client/chromium/files/chromium-105-webrtc-aec3-include.patch
deleted file mode 100644
index 3f84a15..0000000
--- a/www-client/chromium/files/chromium-105-webrtc-aec3-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/third_party/webrtc/modules/audio_processing/aec3/render_delay_buffer.cc b/third_party/webrtc/modules/audio_processing/aec3/render_delay_buffer.cc
-index 05791216a..ec5d35507 100644
---- a/third_party/webrtc/modules/audio_processing/aec3/render_delay_buffer.cc
-+++ b/third_party/webrtc/modules/audio_processing/aec3/render_delay_buffer.cc
-@@ -13,6 +13,7 @@
- #include <string.h>
-
- #include <algorithm>
-+#include <atomic>
- #include <cmath>
- #include <memory>
- #include <numeric>
-diff --git a/third_party/webrtc/modules/audio_processing/aec3/render_delay_controller.cc b/third_party/webrtc/modules/audio_processing/aec3/render_delay_controller.cc
-index 826c38a1e..7fd2868c3 100644
---- a/third_party/webrtc/modules/audio_processing/aec3/render_delay_controller.cc
-+++ b/third_party/webrtc/modules/audio_processing/aec3/render_delay_controller.cc
-@@ -12,6 +12,7 @@
- #include <stddef.h>
-
- #include <algorithm>
-+#include <atomic>
- #include <memory>
-
- #include "absl/types/optional.h"
diff --git a/www-client/chromium/files/chromium-106-browser-ui-include.patch b/www-client/chromium/files/chromium-106-browser-ui-include.patch
deleted file mode 100644
index 4e2d0a4..0000000
--- a/www-client/chromium/files/chromium-106-browser-ui-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/chrome/browser/ui/browser_finder.h b/chrome/browser/ui/browser_finder.h
-index f885be017..ad7a184fa 100644
---- a/chrome/browser/ui/browser_finder.h
-+++ b/chrome/browser/ui/browser_finder.h
-@@ -6,6 +6,7 @@
- #define CHROME_BROWSER_UI_BROWSER_FINDER_H_
-
- #include <stddef.h>
-+#include <vector>
-
- #include "ui/display/types/display_constants.h"
- #include "ui/gfx/native_widget_types.h"
diff --git a/www-client/chromium/files/chromium-106-minizip.patch b/www-client/chromium/files/chromium-106-minizip.patch
deleted file mode 100644
index d85acb7..0000000
--- a/www-client/chromium/files/chromium-106-minizip.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
-index 62d091018..ccedc7777 100644
---- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
-+++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
-@@ -27,8 +27,8 @@ limitations under the License.
- #include "tensorflow_lite_support/cc/port/status_macros.h"
- #include "tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h"
- #include "tensorflow_lite_support/metadata/metadata_schema_generated.h"
--#include "third_party/zlib/contrib/minizip/ioapi.h"
--#include "third_party/zlib/contrib/minizip/unzip.h"
-+#include "minizip/ioapi.h"
-+#include "minizip/unzip.h"
-
- namespace tflite {
- namespace metadata {
-diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
-index 8e13fa63d..e96bc0491 100644
---- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
-+++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
-@@ -26,8 +26,8 @@ limitations under the License.
- #include "tensorflow_lite_support/cc/port/statusor.h"
- #include "tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h"
- #include "tensorflow_lite_support/metadata/metadata_schema_generated.h"
--#include "third_party/zlib/contrib/minizip/ioapi.h"
--#include "third_party/zlib/contrib/minizip/zip.h"
-+#include "minizip/ioapi.h"
-+#include "minizip/zip.h"
-
- namespace tflite {
- namespace metadata {
-diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
-index 525ae4a2b..80ad84900 100644
---- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
-+++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
-@@ -19,7 +19,7 @@ limitations under the License.
- #include <cstdio>
-
- #include "absl/strings/string_view.h" // from @com_google_absl
--#include "third_party/zlib/contrib/minizip/ioapi.h"
-+#include "minizip/ioapi.h"
-
- namespace tflite {
- namespace metadata {
-diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
-index 72413a0a5..38c9278da 100644
---- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
-+++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
-@@ -19,7 +19,7 @@ limitations under the License.
- #include <cstdlib>
-
- #include "absl/strings/string_view.h" // from @com_google_absl
--#include "third_party/zlib/contrib/minizip/ioapi.h"
-+#include "minizip/ioapi.h"
-
- namespace tflite {
- namespace metadata {
-diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
-index 3ba91b5e2..646822093 100644
---- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
-+++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
-@@ -19,7 +19,7 @@ limitations under the License.
- #include <cstdio>
-
- #include "absl/strings/string_view.h" // from @com_google_absl
--#include "third_party/zlib/contrib/minizip/ioapi.h"
-+#include "minizip/ioapi.h"
-
- namespace tflite {
- namespace metadata {
-diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
-index 3d329925d..da6ff5ad8 100644
---- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
-+++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
-@@ -19,7 +19,7 @@ limitations under the License.
- #include <cstdlib>
-
- #include "absl/strings/string_view.h" // from @com_google_absl
--#include "third_party/zlib/contrib/minizip/ioapi.h"
-+#include "minizip/ioapi.h"
-
- namespace tflite {
- namespace metadata {
-diff --git a/third_party/zlib/google/zip_internal.cc b/third_party/zlib/google/zip_internal.cc
-index 1adf2e6d0..c8cf33c25 100644
---- a/third_party/zlib/google/zip_internal.cc
-+++ b/third_party/zlib/google/zip_internal.cc
-@@ -17,7 +17,7 @@
- #include "base/strings/string_util.h"
- #include "base/strings/utf_string_conversions.h"
-
--#if defined(USE_SYSTEM_MINIZIP)
-+#if 1//defined(USE_SYSTEM_MINIZIP)
- #include <minizip/ioapi.h>
- #include <minizip/unzip.h>
- #include <minizip/zip.h>
-diff --git a/third_party/zlib/google/zip_internal.h b/third_party/zlib/google/zip_internal.h
-index 92833fa17..343f6e291 100644
---- a/third_party/zlib/google/zip_internal.h
-+++ b/third_party/zlib/google/zip_internal.h
-@@ -14,7 +14,7 @@
- #include <windows.h>
- #endif
-
--#if defined(USE_SYSTEM_MINIZIP)
-+#if 1//defined(USE_SYSTEM_MINIZIP)
- #include <minizip/unzip.h>
- #include <minizip/zip.h>
- #else
-diff --git a/third_party/zlib/google/zip_reader.cc b/third_party/zlib/google/zip_reader.cc
-index 075ba70aa..8be91a5ef 100644
---- a/third_party/zlib/google/zip_reader.cc
-+++ b/third_party/zlib/google/zip_reader.cc
-@@ -23,7 +23,7 @@
- #include "third_party/zlib/google/redact.h"
- #include "third_party/zlib/google/zip_internal.h"
-
--#if defined(USE_SYSTEM_MINIZIP)
-+#if 1//defined(USE_SYSTEM_MINIZIP)
- #include <minizip/unzip.h>
- #else
- #include "third_party/zlib/contrib/minizip/unzip.h"
-diff --git a/third_party/zlib/google/zip_reader.h b/third_party/zlib/google/zip_reader.h
-index 286ddfd9b..616bd7e0b 100644
---- a/third_party/zlib/google/zip_reader.h
-+++ b/third_party/zlib/google/zip_reader.h
-@@ -18,7 +18,7 @@
- #include "base/numerics/safe_conversions.h"
- #include "base/time/time.h"
-
--#if defined(USE_SYSTEM_MINIZIP)
-+#if 1//defined(USE_SYSTEM_MINIZIP)
- #include <minizip/unzip.h>
- #else
- #include "third_party/zlib/contrib/minizip/unzip.h"
-diff --git a/third_party/zlib/google/zip_writer.h b/third_party/zlib/google/zip_writer.h
-index aa3c965d9..f471c73b5 100644
---- a/third_party/zlib/google/zip_writer.h
-+++ b/third_party/zlib/google/zip_writer.h
-@@ -13,7 +13,7 @@
- #include "build/build_config.h"
- #include "third_party/zlib/google/zip.h"
-
--#if defined(USE_SYSTEM_MINIZIP)
-+#if 1//defined(USE_SYSTEM_MINIZIP)
- #include <minizip/unzip.h>
- #include <minizip/zip.h>
- #else
diff --git a/www-client/chromium/files/chromium-106-power_bookmarks-include.patch b/www-client/chromium/files/chromium-106-power_bookmarks-include.patch
deleted file mode 100644
index afc0cce..0000000
--- a/www-client/chromium/files/chromium-106-power_bookmarks-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/components/power_bookmarks/core/power_bookmark_service.cc b/components/power_bookmarks/core/power_bookmark_service.cc
-index 7b9b35a5d..463fbbf35 100644
---- a/components/power_bookmarks/core/power_bookmark_service.cc
-+++ b/components/power_bookmarks/core/power_bookmark_service.cc
-@@ -4,6 +4,8 @@
-
- #include "components/power_bookmarks/core/power_bookmark_service.h"
-
-+#include <algorithm>
-+
- namespace power_bookmarks {
-
- PowerBookmarkService::PowerBookmarkService() = default;
-@@ -22,4 +24,4 @@ void PowerBookmarkService::RemoveDataProvider(
- data_providers_.erase(it);
- }
-
--} // namespace power_bookmarks
-\ No newline at end of file
-+} // namespace power_bookmarks