* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2016-12-04 22:43 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2016-12-04 22:43 UTC (permalink / raw
To: gentoo-commits
commit: dd8f2882a3498d340046a91f8111307ca964e63c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 4 22:42:39 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 4 22:43:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd8f2882
www-client/chromium: remove unused files
Package-Manager: portage-2.3.2_p13
www-client/chromium/files/chromium-gn-r8.patch | 24 ---------
www-client/chromium/files/chromium-gn-r9.patch | 12 -----
www-client/chromium/files/chromium-launcher-r2.sh | 32 ------------
.../chromium/files/chromium-system-ffmpeg-r3.patch | 48 ------------------
.../chromium/files/chromium-system-jinja-r13.patch | 59 ----------------------
www-client/chromium/files/dot-gclient | 6 ---
6 files changed, 181 deletions(-)
diff --git a/www-client/chromium/files/chromium-gn-r8.patch b/www-client/chromium/files/chromium-gn-r8.patch
deleted file mode 100644
index acbe500..00000000
--- a/www-client/chromium/files/chromium-gn-r8.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 034d808c4d4042cf9944450bc45efc23aa868fdd Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppymaster@gmail.com>
-Date: Mon, 24 Oct 2016 10:43:11 -0400
-Subject: [PATCH] gn: fix bootstrap script
-
----
- tools/gn/bootstrap/bootstrap.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index d66da12..6059741 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -450,7 +450,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/task_scheduler/post_task.cc',
- 'base/task_scheduler/priority_queue.cc',
- 'base/task_scheduler/scheduler_lock_impl.cc',
-- 'base/task_scheduler/scheduler_service_thread.cc',
- 'base/task_scheduler/scheduler_worker.cc',
- 'base/task_scheduler/scheduler_worker_pool_impl.cc',
- 'base/task_scheduler/scheduler_worker_stack.cc',
---
-2.10.1
-
diff --git a/www-client/chromium/files/chromium-gn-r9.patch b/www-client/chromium/files/chromium-gn-r9.patch
deleted file mode 100644
index dde262d..00000000
--- a/www-client/chromium/files/chromium-gn-r9.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 6059741..78e508d 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -532,6 +532,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/synchronization/read_write_lock_posix.cc',
- 'base/synchronization/waitable_event_posix.cc',
- 'base/sys_info_posix.cc',
-+ 'base/task_scheduler/task_tracker_posix.cc',
- 'base/threading/platform_thread_internal_posix.cc',
- 'base/threading/platform_thread_posix.cc',
- 'base/threading/thread_local_storage_posix.cc',
diff --git a/www-client/chromium/files/chromium-launcher-r2.sh b/www-client/chromium/files/chromium-launcher-r2.sh
deleted file mode 100644
index e20bcea..00000000
--- a/www-client/chromium/files/chromium-launcher-r2.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Allow the user to override command-line flags, bug #357629.
-# This is based on Debian's chromium-browser package, and is intended
-# to be consistent with Debian.
-if [ -f /etc/chromium/default ] ; then
- . /etc/chromium/default
-fi
-
-# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
-# default CHROMIUM_FLAGS (from /etc/chromium/default).
-CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
-
-# Let the wrapped binary know that it has been run through the wrapper
-export CHROME_WRAPPER="`readlink -f "$0"`"
-
-PROGDIR="`dirname "$CHROME_WRAPPER"`"
-
-case ":$PATH:" in
- *:$PROGDIR:*)
- # $PATH already contains $PROGDIR
- ;;
- *)
- # Append $PROGDIR to $PATH
- export PATH="$PATH:$PROGDIR"
- ;;
-esac
-
-# Set the .desktop file name
-export CHROME_DESKTOP="chromium-browser-chromium.desktop"
-
-exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r3.patch b/www-client/chromium/files/chromium-system-ffmpeg-r3.patch
deleted file mode 100644
index 023dd26..00000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:01:56.155462264 +0000
-+++ b/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:03:03.348846300 +0000
-@@ -19,10 +19,6 @@
-
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings. This
--// list of defines must mirror those in the 'defines' section of BUILD.gn file &
--// ffmpeg.gyp file or the headers below will generate different structures!
--#define FF_API_CONVERGENCE_DURATION 0
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -36,7 +32,6 @@
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
---- a/media/filters/ffmpeg_demuxer.cc.orig 2016-08-01 10:52:01.528177808 +0000
-+++ b/media/filters/ffmpeg_demuxer.cc 2016-08-01 10:52:27.160707694 +0000
-@@ -1150,24 +1150,6 @@
- // If no estimate is found, the stream entry will be kInfiniteDuration.
- std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
- kInfiniteDuration);
-- const AVFormatInternal* internal = format_context->internal;
-- if (internal && internal->packet_buffer &&
-- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-- struct AVPacketList* packet_buffer = internal->packet_buffer;
-- while (packet_buffer != internal->packet_buffer_end) {
-- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
-- start_time_estimates.size());
-- const AVStream* stream =
-- format_context->streams[packet_buffer->pkt.stream_index];
-- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-- const base::TimeDelta packet_pts =
-- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
-- if (packet_pts < start_time_estimates[stream->index])
-- start_time_estimates[stream->index] = packet_pts;
-- }
-- packet_buffer = packet_buffer->next;
-- }
-- }
-
- std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
- AVStream* audio_stream = NULL;
diff --git a/www-client/chromium/files/chromium-system-jinja-r13.patch b/www-client/chromium/files/chromium-system-jinja-r13.patch
deleted file mode 100644
index 845ac94..00000000
--- a/www-client/chromium/files/chromium-system-jinja-r13.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
- 'actions': [{
- 'action_name': 'cache_jinja_templates',
- 'inputs': [
-- '<@(jinja_module_files)',
- 'code_generator_v8.py',
- '<@(code_generator_template_files)',
- ],
---- a/third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000
-+++ b/third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
- 'variables': {
- 'scripts_for_in_files': [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- 'hasher.py',
- 'in_file.py',
- 'in_generator.py',
---- a/third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- 'idl_lexer_parser_files': [
-- # PLY (Python Lex-Yacc)
-- '<(DEPTH)/third_party/ply/lex.py',
-- '<(DEPTH)/third_party/ply/yacc.py',
- # Web IDL lexer/parser (base parser)
- '<(DEPTH)/tools/idl_parser/idl_lexer.py',
- '<(DEPTH)/tools/idl_parser/idl_node.py',
---- a/third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000
-+++ b/third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000
-@@ -9,10 +9,6 @@
- _scripts_dir = "//third_party/WebKit/Source/build/scripts"
-
- scripts_for_in_files = [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- "//third_party/jinja2/__init__.py",
-- "//third_party/markupsafe/__init__.py", # jinja2 dep
- "$_scripts_dir/hasher.py",
- "$_scripts_dir/in_file.py",
- "$_scripts_dir/in_generator.py",
---- a/third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02 10:03:13.240907715 +0000
-@@ -36,7 +36,7 @@
- action("cached_jinja_templates") {
- script = "code_generator_v8.py"
-
-- inputs = jinja_module_files + [ "code_generator_v8.py" ] +
-+ inputs = [ "code_generator_v8.py" ] +
- code_generator_template_files
-
- # Dummy file to track dependency.
diff --git a/www-client/chromium/files/dot-gclient b/www-client/chromium/files/dot-gclient
deleted file mode 100644
index ef19b40..00000000
--- a/www-client/chromium/files/dot-gclient
+++ /dev/null
@@ -1,6 +0,0 @@
-solutions = [
- { "name" : "src",
- "url" : "https://src.chromium.org/svn/trunk/src",
- "safesync_url": "https://chromium-status.appspot.com/lkgr",
- },
-]
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2025-03-05 2:53 Matt Jolly
0 siblings, 0 replies; 48+ messages in thread
From: Matt Jolly @ 2025-03-05 2:53 UTC (permalink / raw
To: gentoo-commits
commit: 77fb97b1ea3a45e9d9f9c6f1824ff50da6fbab2a
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 5 02:50:39 2025 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Wed Mar 5 02:52:58 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fb97b1
www-client/chromium: restore dropped patch
This patch was dropped in the latest M135 build, however it
is still required for M133 and M134 and should not have
been removed from the repository.
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
.../files/chromium-135-fix-non-wayland-build.patch | 45 ++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch b/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch
new file mode 100644
index 000000000000..a31462ac0f29
--- /dev/null
+++ b/www-client/chromium/files/chromium-135-fix-non-wayland-build.patch
@@ -0,0 +1,45 @@
+From 919cda539b142b51fc2ef2342dbf1803b65f5434 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Wed, 12 Feb 2025 20:13:09 +1000
+Subject: [PATCH] remoting: Linux: guard wayland includes
+
+During the refactor in 53f3429926deb4cb92d9cddcda5fc096a0332db3
+wayland support became required to build this component.
+
+Only include wayland components in the `platform_impls` target
+if `ozone_platform_wayland` is true.
+
+Bug: 391722217
+See also: https://bugs.gentoo.org/948384
+Signed-off-by: Matt Jolly <kangie@gentoo.org>
+--- a/remoting/host/linux/BUILD.gn
++++ b/remoting/host/linux/BUILD.gn
+@@ -192,7 +192,6 @@ source_set("platform_impls") {
+ "wayland_seat.h",
+ ]
+ deps = [
+- ":wayland",
+ ":x11",
+ ":x11_display_utils",
+ "//base",
+@@ -214,9 +213,16 @@ source_set("platform_impls") {
+ "//ui/base",
+ "//ui/base/x",
+ "//ui/events:dom_keycode_converter",
+- "//ui/events/platform/wayland:wayland_event_watcher",
+ "//ui/gfx/x",
+ ]
++ # ui/events/platform/wayland:wayland_event_watcher asserts that the wayland
++ # platform is enabled.
++ if (ozone_platform_wayland) {
++ deps += [
++ ":wayland",
++ "//ui/events/platform/wayland:wayland_event_watcher",
++ ]
++ }
+ }
+
+ source_set("x11_display_utils") {
+--
+2.48.0
+
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2025-01-20 21:57 Conrad Kostecki
0 siblings, 0 replies; 48+ messages in thread
From: Conrad Kostecki @ 2025-01-20 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 03ef3923550ec32bc56b54c388aef29cf7f67bcf
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jan 20 17:15:21 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 21:57:18 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03ef3923
www-client/chromium: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../chromium-126-oauth2-client-switches.patch | 45 ---------
.../chromium-127-bindgen-custom-toolchain.patch | 102 ---------------------
...hromium-131-const-atomicstring-conversion.patch | 35 -------
3 files changed, 182 deletions(-)
diff --git a/www-client/chromium/files/chromium-126-oauth2-client-switches.patch b/www-client/chromium/files/chromium-126-oauth2-client-switches.patch
deleted file mode 100644
index b7ddf794aa27..000000000000
--- a/www-client/chromium/files/chromium-126-oauth2-client-switches.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b6cda4bc2283a02a5b5209c0f4282a8365f6f33e Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Tue, 21 May 2024 10:04:24 +1000
-Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials -
- 126 update
-
-126 changed the function proto; patch rebased.
-
-Google doesn't let us bake in OAuth2 credentials, and for some time,
-Google sign-in has been broken. Arch dealt with this in March, and so
-did we to some degree, but in the last few months, our sign-in
-credentials have been broken. It appears that we actually did remove API
-credentials in March around Chrome 89, but they got added back, perhaps
-when rotating newer versions to replace older versions. Work around this
-by following Arch's lead: we remove the predefined credentials, as
-before, but also we patch Chromium so that people can use their own
-easily, using Arch's patch for that.
-
-For more info, see:
-
-https://archlinux.org/news/chromium-losing-sync-support-in-early-march/
-https://bodhi.fedoraproject.org/updates/FEDORA-2021-48866282e5
-https://hackaday.com/2021/01/26/whats-the-deal-with-chromium-on-linux-google-at-odds-with-package-maintainers/
-
-Bug: https://bugs.gentoo.org/791871
-Signed-off-by: Matt Jolly <kangie@gentoo.org>
---- a/google_apis/google_api_keys-inc.cc
-+++ b/google_apis/google_api_keys-inc.cc
-@@ -193,11 +193,11 @@ class APIKeyCache {
- std::string default_client_id = CalculateKeyValue(
- GOOGLE_DEFAULT_CLIENT_ID,
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(),
-- nullptr, std::string(), environment.get(), command_line, gaia_config);
-+ ::switches::kOAuth2ClientID, std::string(), environment.get(), command_line, gaia_config);
- std::string default_client_secret = CalculateKeyValue(
- GOOGLE_DEFAULT_CLIENT_SECRET,
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
-- nullptr, std::string(), environment.get(), command_line, gaia_config);
-+ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config);
-
- // We currently only allow overriding the baked-in values for the
- // default OAuth2 client ID and secret using a command-line
---
-2.45.1
-
diff --git a/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch b/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch
deleted file mode 100644
index aaf4b19a556f..000000000000
--- a/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 6df5a080f58ddb6a49a9d33e4a3619a34fffa78c Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Fri, 5 Jul 2024 20:49:01 +1000
-Subject: [PATCH] Make bindgen wrapper work with unbundled toolchain
-
-The `run_bindgen.py` wrapper takes a --libclang-path option
-and uses it to set the appropriate environment variable.
-
-This is currently hardcoded to use libclang shipped alongside
-bindgen (in our rust toolchain), but distributions may want to
-override this and use a system path.
-
-Additionally enable distros to feed in appropriate library paths.
---- a/build/config/rust.gni
-+++ b/build/config/rust.gni
-@@ -60,6 +60,17 @@ declare_args() {
- # the bindgen exectuable).
- rust_bindgen_root = "//third_party/rust-toolchain"
-
-+ # Directory under which to find one of `libclang.{dll,so}` (a `lib[64]` or
-+ # `bin` directory containing the libclang shared library).
-+ # We don't need to worry about multlib, but specify the full path here
-+ # in case a distribution does.
-+ if (host_os == "win") {
-+ bindgen_libclang_path = "//third_party/rust-toolchain/bin"
-+ } else {
-+ bindgen_libclang_path = "//third_party/rust-toolchain/lib"
-+ }
-+
-+
- # If you're using a Rust toolchain as specified by rust_sysroot_absolute,
- # set this to the output of `rustc -V`. Changing this string will cause all
- # Rust targets to be rebuilt, which allows you to update your toolchain and
---- a/build/rust/rust_bindgen.gni
-+++ b/build/rust/rust_bindgen.gni
-@@ -16,13 +16,13 @@ if (host_os == "win") {
- _bindgen_path = "${_bindgen_path}.exe"
- }
-
--# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
--# ../lib.
--_libclang_path = rust_bindgen_root
--if (host_os == "win") {
-- _libclang_path += "/bin"
-+if (clang_base_path != default_clang_base_path && custom_toolchain == "//build/toolchain/linux/unbundle:default") {
-+ # Assume that the user has set this up properly, including handling multilib
-+ _clang_libpath = clang_base_path + "/include"
-+ _clang_ld_libpath = bindgen_libclang_path
- } else {
-- _libclang_path += "/lib"
-+ _clang_libpath = clang_base_path + "/lib/clang/" + clang_version
-+ _clang_ld_libpath = clang_base_path + "/lib"
- }
-
- # Template to build Rust/C bindings with bindgen.
-@@ -100,7 +100,7 @@ template("rust_bindgen") {
- "--output",
- rebase_path(out_gen_rs, root_build_dir),
- "--libclang-path",
-- rebase_path(_libclang_path, root_build_dir),
-+ rebase_path(bindgen_libclang_path, root_build_dir),
- ]
-
- if (wrap_static_fns) {
-@@ -117,7 +117,7 @@ template("rust_bindgen") {
- # point to.
- args += [
- "--ld-library-path",
-- rebase_path(clang_base_path + "/lib", root_build_dir),
-+ rebase_path(_clang_ld_libpath, root_build_dir),
- ]
- }
-
-@@ -145,8 +145,7 @@ template("rust_bindgen") {
- # make it behave consistently with our other command line flags and allows
- # system headers to be found.
- clang_resource_dir =
-- rebase_path(clang_base_path + "/lib/clang/" + clang_version,
-- root_build_dir)
-+ rebase_path(_clang_libpath, root_build_dir)
- args += [
- "-resource-dir",
- clang_resource_dir,
-@@ -167,6 +166,15 @@ template("rust_bindgen") {
- }
- }
-
-+ if (custom_toolchain == "//build/toolchain/linux/unbundle:default") {
-+ # We need to pass the path to the libstdc++ headers to bindgen so that it
-+ # can find them when parsing C++ headers.
-+ args += [
-+ "-I",
-+ rebase_path(clang_base_path + "/include/", root_build_dir),
-+ ]
-+ }
-+
- if (is_win) {
- # On Windows we fall back to using system headers from a sysroot from
- # depot_tools. This is negotiated by python scripts and the result is
---
-2.45.2
-
diff --git a/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch b/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch
deleted file mode 100644
index 52f746669b55..000000000000
--- a/www-client/chromium/files/chromium-131-const-atomicstring-conversion.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 403ee5b14df12c8ee3b3583177bbd30d930e9aaf Mon Sep 17 00:00:00 2001
-From: Matt Jolly <kangie@gentoo.org>
-Date: Sat, 12 Oct 2024 13:45:37 +1000
-Subject: [PATCH] Convert 'Const AtomicString' to 'const char *'.
-
-I don't know why this is suddenly required?
---- a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-+++ b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-@@ -323,7 +323,10 @@ void TextCodecICU::CreateICUConverter() const {
- DCHECK(!converter_icu_);
-
- #if defined(USING_SYSTEM_ICU)
-- const char* name = encoding_.GetName();
-+ //convert to WTF::String to use existing `const char *` dependent functions
-+ WTF::String nameString = encoding_.GetName();
-+ std::string nameUtf8 = nameString.Utf8();
-+ const char* name = nameUtf8.c_str();
- needs_gbk_fallbacks_ =
- name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3];
- #endif
-@@ -448,7 +451,10 @@ String TextCodecICU::Decode(base::span<const uint8_t> data,
- // <http://bugs.webkit.org/show_bug.cgi?id=17014>
- // Simplified Chinese pages use the code A3A0 to mean "full-width space", but
- // ICU decodes it as U+E5E5.
-- if (!strcmp(encoding_.GetName(), "GBK")) {
-+ // Convert AtomicString to String
-+ WTF::String nameString = encoding_.GetName();
-+ std::string nameUtf8 = nameString.Utf8();
-+ if (!strcmp(nameUtf8.c_str(), "GBK")) {
- if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030"))
- resultString.Replace(0xE5E5, kIdeographicSpaceCharacter);
- // Make GBK compliant to the encoding spec and align with GB18030
---
-2.46.2
-
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2025-01-04 22:47 Conrad Kostecki
0 siblings, 0 replies; 48+ messages in thread
From: Conrad Kostecki @ 2025-01-04 22:47 UTC (permalink / raw
To: gentoo-commits
commit: e3d6f6c3a0293a01ea7e3ec79e6039fe6a5b692a
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jan 3 15:39:54 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 22:47:10 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d6f6c3
www-client/chromium: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../chromium-133-openh264-decoder-source-set.patch | 24 ----------------------
1 file changed, 24 deletions(-)
diff --git a/www-client/chromium/files/chromium-133-openh264-decoder-source-set.patch b/www-client/chromium/files/chromium-133-openh264-decoder-source-set.patch
deleted file mode 100644
index db366cf83eb1..000000000000
--- a/www-client/chromium/files/chromium-133-openh264-decoder-source-set.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3cdb3cdccbaafc1d41713894dac7affc9e4cab6d Mon Sep 17 00:00:00 2001
-From: Matt Jolly <kangie@gentoo.org>
-Date: Fri, 6 Dec 2024 10:46:55 +1000
-Subject: [PATCH] unbundle: add decoder source set to openh264
-
---- a/build/linux/unbundle/openh264.gn
-+++ b/build/linux/unbundle/openh264.gn
-@@ -40,6 +40,13 @@ source_set("processing") {
- public_configs = [ ":config" ]
- }
-
-+source_set("decoder") {
-+ deps = [ ":openh264_shim" ]
-+ public_configs = [
-+ ":config",
-+ ]
-+}
-+
- source_set("encoder") {
- deps = [ ":openh264_shim" ]
- public_configs = [
---
-2.47.0
-
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2024-12-06 23:12 Conrad Kostecki
0 siblings, 0 replies; 48+ messages in thread
From: Conrad Kostecki @ 2024-12-06 23:12 UTC (permalink / raw
To: gentoo-commits
commit: 6bbec43dd536e6b62d69ffeb9ab5eb02e463f34f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 3 19:31:03 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Dec 6 23:11:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bbec43d
www-client/chromium: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/chromium-127-updater-systemd.patch | 73 ----------------------
1 file changed, 73 deletions(-)
diff --git a/www-client/chromium/files/chromium-127-updater-systemd.patch b/www-client/chromium/files/chromium-127-updater-systemd.patch
deleted file mode 100644
index 57e9029b9378..000000000000
--- a/www-client/chromium/files/chromium-127-updater-systemd.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-https://github.com/chromium/chromium/commit/570332aad61afab5d9d88a8438bae53ea28a298a
-From: Noah Rose Ledesma <noahrose@google.com>
-Date: Wed, 31 Jul 2024 17:59:12 +0000
-Subject: [PATCH] Use libs instead of pkg_config for linux deps
-
-pkg_config can cause builds to fail if the requested packages are not
-present, regardless of if the lib is depended upon by the target being
-built.
-
-This issue can be avoided by setting 'libs' instead. I'm not sure why we
-didn't do so in the first place.
-
-Bug: 355967882
-Change-Id: Ie5dc4c03b08d7c1e26458ea143f6dc812b670544
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5749680
-Reviewed-by: Sorin Jianu <sorin@chromium.org>
-Commit-Queue: Noah Rose Ledesma <noahrose@google.com>
-Cr-Commit-Position: refs/heads/main@{#1335558}
---- a/chrome/updater/BUILD.gn
-+++ b/chrome/updater/BUILD.gn
-@@ -367,9 +367,10 @@ if (is_win || is_mac || is_linux) {
- "update_service_internal_impl_qualifying_linux.cc",
- "update_usage_stats_task_linux.cc",
- ]
-- public_configs = [
-- "linux:libcurl",
-- "linux:libsystemd",
-+
-+ libs = [
-+ "curl",
-+ "systemd",
- ]
- }
- }
-@@ -1040,7 +1041,7 @@ if (is_win || is_mac || is_linux) {
-
- data += [ "//chrome/test/data/updater/updater_qualification_app.crx" ]
- data_deps += [ "//chrome/updater/linux:updater_test" ]
-- public_configs = [ "linux:libsystemd" ]
-+ libs = [ "systemd" ]
- }
-
- if (is_posix) {
---- a/chrome/updater/linux/BUILD.gn
-+++ b/chrome/updater/linux/BUILD.gn
-@@ -2,7 +2,6 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--import("//build/config/linux/pkg_config.gni")
- import("//chrome/updater/zip.gni")
-
- # This target builds the updater executable and unittests.
-@@ -13,18 +12,10 @@ group("linux") {
- ]
- }
-
--pkg_config("libcurl") {
-- packages = [ "libcurl" ]
--}
--
--pkg_config("libsystemd") {
-- packages = [ "libsystemd" ]
--}
--
- source_set("updater_executable") {
- sources = [ "main.cc" ]
- deps = [ "//chrome/updater:base" ]
-- public_configs = [ ":libsystemd" ]
-+ libs = [ "systemd" ]
- }
-
- executable("updater") {
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2024-10-15 21:46 Conrad Kostecki
0 siblings, 0 replies; 48+ messages in thread
From: Conrad Kostecki @ 2024-10-15 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 4bb77d26efe1d192ddd4f6f57cf50e38ca3f7e77
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Oct 14 15:37:44 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 21:45:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bb77d26
www-client/chromium: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/chromium-127-browser-ui-deps.patch | 57 ----------------------
1 file changed, 57 deletions(-)
diff --git a/www-client/chromium/files/chromium-127-browser-ui-deps.patch b/www-client/chromium/files/chromium-127-browser-ui-deps.patch
deleted file mode 100644
index e262e315c678..000000000000
--- a/www-client/chromium/files/chromium-127-browser-ui-deps.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://gitlab.exherbo.org/exherbo/desktop/-/raw/master/packages/net-www/chromium-beta/files/chromium-browser-ui-missing-deps.patch
-https://issues.chromium.org/u/2/issues/351157339
-Source: Tom Briden <tom@decompile.me.uk>
-Upstream: No
-
---- a/chrome/browser/ui/views/side_panel/BUILD.gn
-+++ b/chrome/browser/ui/views/side_panel/BUILD.gn
-@@ -142,18 +142,30 @@ static_library("side_panel") {
- }
- public_deps = [
- "//base",
-+ "//chrome/browser/cart:mojo_bindings",
- "//chrome/browser/companion/core/mojom:mojo_bindings",
- "//chrome/browser/profiles:profile",
- "//chrome/browser/ui/actions:actions_headers",
- "//chrome/browser/ui/color:color_headers",
-+ "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings",
-+ "//chrome/browser/ui/webui/side_panel/bookmarks:mojo_bindings",
- "//chrome/browser/ui/webui/side_panel/performance_controls:mojo_bindings",
-+ "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings",
-+ "//chrome/browser/ui:webui_name_variants",
- "//chrome/common",
- "//chrome/common/accessibility:mojo_bindings",
-+ "//chrome/common/companion:mojo_bindings",
-+ "//components/enterprise/buildflags:buildflags",
-+ "//components/enterprise/common/proto:connectors_proto",
- "//components/lens",
- "//components/lens:buildflags",
- "//components/omnibox/browser",
-+ "//components/page_image_service/mojom:mojo_bindings",
-+ "//components/paint_preview/buildflags:buildflags",
- "//components/prefs",
- "//components/search_engines",
-+ "//components/segmentation_platform/public/proto:proto",
-+ "//components/webapps/common:mojo_bindings",
- "//content/public/browser",
- "//extensions/browser",
- "//extensions/common",
-@@ -165,6 +177,8 @@ static_library("side_panel") {
- "//ui/gfx/geometry",
- "//ui/views",
- "//ui/views/controls/webview",
-+ "//ui/webui/resources/cr_components/commerce:mojo_bindings",
-+ "//ui/webui/resources/cr_components/help_bubble:mojo_bindings",
- "//url",
- ]
- deps = [
---- a/chrome/browser/ui/webui/top_chrome/BUILD.gn
-+++ b/chrome/browser/ui/webui/top_chrome/BUILD.gn
-@@ -19,6 +19,7 @@ source_set("top_chrome") {
- deps = [
- "//base",
- "//chrome/browser/profiles:profile",
-+ "//chrome/browser/ui:webui_name_variants",
- "//components/site_engagement/content:content",
- "//content/public/browser",
- "//ui/webui",
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2024-06-27 15:40 Conrad Kostecki
0 siblings, 0 replies; 48+ messages in thread
From: Conrad Kostecki @ 2024-06-27 15:40 UTC (permalink / raw
To: gentoo-commits
commit: b6fcfdd3162929e0ffa848fb86d2fdf197f09ab8
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jun 24 17:21:05 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 15:40:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6fcfdd3
www-client/chromium: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/chromium-124-libwebp-shim-sharpyuv.patch | 36 -----------------
.../chromium/files/chromium-125-ninja-1-12.patch | 17 --------
.../chromium-125-oauth2-client-switches.patch | 45 ----------------------
3 files changed, 98 deletions(-)
diff --git a/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch b/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch
deleted file mode 100644
index fa038731cd4a..000000000000
--- a/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 40c466949bd8ccb61cb55655848d23684a9f8a94 Mon Sep 17 00:00:00 2001
-From: Matt Jolly <kangie@gentoo.org>
-Date: Mon, 25 Mar 2024 21:38:35 +1000
-Subject: [PATCH] libwebp shim: add libwebp_sharpyuv target
-
-Signed-off-by: Matt Jolly <Kangie@gentoo.org>
---- a/build/linux/unbundle/libwebp.gn
-+++ b/build/linux/unbundle/libwebp.gn
-@@ -22,14 +22,24 @@ shim_headers("libwebp_shim") {
- "webp/mux.h",
- "webp/mux_types.h",
- "webp/types.h",
-+ "webp/sharpyuv/sharpyuv.h",
-+ "webp/sharpyuv/sharpyuv_csp.h",
- ]
- }
-
-+source_set("libwebp_sharpyuv") {
-+ deps = [ ":libwebp_shim" ]
-+ public_configs = [ ":system_libwebp" ]
-+}
-+
- source_set("libwebp_webp") {
- deps = [ ":libwebp_shim" ]
- public_configs = [ ":system_libwebp" ]
- }
-
- group("libwebp") {
-- deps = [ ":libwebp_webp" ]
-+ deps = [
-+ ":libwebp_webp",
-+ ":libwebp_sharpyuv"
-+ ]
- }
---
-2.44.0
diff --git a/www-client/chromium/files/chromium-125-ninja-1-12.patch b/www-client/chromium/files/chromium-125-ninja-1-12.patch
deleted file mode 100644
index 55d0887cd94f..000000000000
--- a/www-client/chromium/files/chromium-125-ninja-1-12.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://chromium-review.googlesource.com/c/chromium/src/+/5487538
-commit a976cb05b4024b7a6452d1541378d718cdfe33e6
-Author: Takuto Ikuta <tikuta@chromium.org>
-Date: Thu Apr 25 07:25:32 2024
-
- [devtools] fix a missing build dependency to a generated file
-
---- a/chrome/browser/devtools/BUILD.gn
-+++ b/chrome/browser/devtools/BUILD.gn
-@@ -117,6 +117,7 @@
- "//chrome/browser/autofill:autofill",
- "//components/autofill/content/browser:browser",
- "//components/autofill/core/browser:browser",
-+ "//components/enterprise/buildflags",
- "//components/paint_preview/buildflags:buildflags",
- "//components/variations/service:service",
- "//components/webapps/common:common",
diff --git a/www-client/chromium/files/chromium-125-oauth2-client-switches.patch b/www-client/chromium/files/chromium-125-oauth2-client-switches.patch
deleted file mode 100644
index 6c7f56b56d96..000000000000
--- a/www-client/chromium/files/chromium-125-oauth2-client-switches.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6a84205d0399a94e8b526176a7dcafd6c2051a95 Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Thu, 18 Apr 2024 21:15:20 +1000
-Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials -
- 125 update
-
-125 moved the content to a new file.
-
-Google doesn't let us bake in OAuth2 credentials, and for some time,
-Google sign-in has been broken. Arch dealt with this in March, and so
-did we to some degree, but in the last few months, our sign-in
-credentials have been broken. It appears that we actually did remove API
-credentials in March around Chrome 89, but they got added back, perhaps
-when rotating newer versions to replace older versions. Work around this
-by following Arch's lead: we remove the predefined credentials, as
-before, but also we patch Chromium so that people can use their own
-easily, using Arch's patch for that.
-
-For more info, see:
-
-https://archlinux.org/news/chromium-losing-sync-support-in-early-march/
-https://bodhi.fedoraproject.org/updates/FEDORA-2021-48866282e5
-https://hackaday.com/2021/01/26/whats-the-deal-with-chromium-on-linux-google-at-odds-with-package-maintainers/
-
-Bug: https://bugs.gentoo.org/791871
-Signed-off-by: Matt Jolly <kangie@gentoo.org>
---- a/google_apis/google_api_keys-inc.cc
-+++ b/google_apis/google_api_keys-inc.cc
-@@ -182,11 +182,11 @@ class APIKeyCache {
-
- std::string default_client_id = CalculateKeyValue(
- GOOGLE_DEFAULT_CLIENT_ID,
-- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr,
-+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID,
- std::string(), environment.get(), command_line, gaia_config);
- std::string default_client_secret = CalculateKeyValue(
- GOOGLE_DEFAULT_CLIENT_SECRET,
-- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
-+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
- std::string(), environment.get(), command_line, gaia_config);
-
- // We currently only allow overriding the baked-in values for the
---
-2.44.0
-
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2024-06-22 18:54 Conrad Kostecki
0 siblings, 0 replies; 48+ messages in thread
From: Conrad Kostecki @ 2024-06-22 18:54 UTC (permalink / raw
To: gentoo-commits
commit: 5477b0133079c680cfce266d40a73edfb58f9fe0
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 18 17:30:39 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 18:50:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5477b013
www-client/chromium: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../chromium/files/chromium-117-system-zstd.patch | 46 ----------------------
...ium-use-oauth2-client-switches-as-default.patch | 17 --------
2 files changed, 63 deletions(-)
diff --git a/www-client/chromium/files/chromium-117-system-zstd.patch b/www-client/chromium/files/chromium-117-system-zstd.patch
deleted file mode 100644
index 0fcd3efc3a05..000000000000
--- a/www-client/chromium/files/chromium-117-system-zstd.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ae3ae3711784865bdc38bf119a6182a7b8dae91c Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Sun, 17 Sep 2023 16:51:42 +1000
-Subject: [PATCH] Add system-zstd
-
---- a/build/linux/unbundle/replace_gn_files.py
-+++ b/build/linux/unbundle/replace_gn_files.py
-@@ -74,6 +74,7 @@ REPLACEMENTS = {
- #
- 'woff2': 'third_party/woff2/BUILD.gn',
- 'zlib': 'third_party/zlib/BUILD.gn',
-+ 'zstd': 'third_party/zstd/BUILD.gn',
- }
-
-
---- /dev/null
-+++ b/build/linux/unbundle/zstd.gn
-@@ -0,0 +1,25 @@
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("system_zstd") {
-+ packages = [ "libzstd" ]
-+}
-+
-+shim_headers("zstd_shim") {
-+ root_path = "src/lib"
-+ headers = [
-+ "zdict.h",
-+ "zstd.h",
-+ "zstd_errors.h",
-+ ]
-+}
-+
-+source_set("zstd") {
-+ deps = [ ":zstd_shim" ]
-+ public_configs = [ ":system_zstd" ]
-+}
-+
-+source_set("decompress") {
-+ deps = [ ":zstd_shim" ]
-+ public_configs = [ ":system_zstd" ]
-+}
---
-2.42.0
-
diff --git a/www-client/chromium/files/chromium-use-oauth2-client-switches-as-default.patch b/www-client/chromium/files/chromium-use-oauth2-client-switches-as-default.patch
deleted file mode 100644
index 9d9c57bfb0d2..000000000000
--- a/www-client/chromium/files/chromium-use-oauth2-client-switches-as-default.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -upr chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc chromium-89.0.4389.58/google_apis/google_api_keys.cc
---- chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc 2021-02-24 22:37:18.494007649 +0000
-+++ chromium-89.0.4389.58/google_apis/google_api_keys.cc 2021-02-24 22:35:00.865777600 +0000
-@@ -154,11 +154,11 @@ class APIKeyCache {
-
- std::string default_client_id = CalculateKeyValue(
- GOOGLE_DEFAULT_CLIENT_ID,
-- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr,
-+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID,
- std::string(), environment.get(), command_line, gaia_config);
- std::string default_client_secret = CalculateKeyValue(
- GOOGLE_DEFAULT_CLIENT_SECRET,
-- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
-+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
- std::string(), environment.get(), command_line, gaia_config);
-
- // We currently only allow overriding the baked-in values for the
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2024-04-18 19:32 Conrad Kostecki
0 siblings, 0 replies; 48+ messages in thread
From: Conrad Kostecki @ 2024-04-18 19:32 UTC (permalink / raw
To: gentoo-commits
commit: e17ca4c45ccdd3176d8e63ad70641faed0e156e3
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:16:46 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17ca4c4
www-client/chromium: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/chromium-108-EnumTable-crash.patch | 76 ----------------------
.../files/chromium-119.0.6045.159-icu-74.patch | 21 ------
2 files changed, 97 deletions(-)
diff --git a/www-client/chromium/files/chromium-108-EnumTable-crash.patch b/www-client/chromium/files/chromium-108-EnumTable-crash.patch
deleted file mode 100644
index 661ec33c1d0d..000000000000
--- a/www-client/chromium/files/chromium-108-EnumTable-crash.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/components/media_router/common/providers/cast/channel/enum_table.h b/components/media_router/common/providers/cast/channel/enum_table.h
-index 842553a..89de703 100644
---- a/components/media_router/common/providers/cast/channel/enum_table.h
-+++ b/components/media_router/common/providers/cast/channel/enum_table.h
-@@ -8,6 +8,7 @@
- #include <cstdint>
- #include <cstring>
- #include <ostream>
-+#include <vector>
-
- #include "base/check_op.h"
- #include "base/notreached.h"
-@@ -187,7 +188,6 @@ class
- inline constexpr GenericEnumTableEntry(int32_t value);
- inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
-
-- GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
- GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
-
- private:
-@@ -253,7 +253,6 @@ class EnumTable {
- constexpr Entry(E value, base::StringPiece str)
- : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
-
-- Entry(const Entry&) = delete;
- Entry& operator=(const Entry&) = delete;
- };
-
-@@ -312,15 +311,14 @@ class EnumTable {
- if (is_sorted_) {
- const std::size_t index = static_cast<std::size_t>(value);
- if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
-- const auto& entry = data_.begin()[index];
-+ const auto& entry = data_[index];
- if (ANALYZER_ASSUME_TRUE(entry.has_str()))
- return entry.str();
- }
- return absl::nullopt;
- }
- return GenericEnumTableEntry::FindByValue(
-- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
-- data_.size(), static_cast<int32_t>(value));
-+ &data_[0], data_.size(), static_cast<int32_t>(value));
- }
-
- // This overload of GetString is designed for cases where the argument is a
-@@ -348,8 +346,7 @@ class EnumTable {
- // enum value directly.
- absl::optional<E> GetEnum(base::StringPiece str) const {
- auto* entry = GenericEnumTableEntry::FindByString(
-- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
-- data_.size(), str);
-+ &data_[0], data_.size(), str);
- return entry ? static_cast<E>(entry->value) : absl::optional<E>();
- }
-
-@@ -364,7 +361,7 @@ class EnumTable {
- // Align the data on a cache line boundary.
- alignas(64)
- #endif
-- std::initializer_list<Entry> data_;
-+ const std::vector<Entry> data_;
- bool is_sorted_;
-
- constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
-@@ -376,8 +373,8 @@ class EnumTable {
-
- for (std::size_t i = 0; i < data.size(); i++) {
- for (std::size_t j = i + 1; j < data.size(); j++) {
-- const Entry& ei = data.begin()[i];
-- const Entry& ej = data.begin()[j];
-+ const Entry& ei = data[i];
-+ const Entry& ej = data[j];
- DCHECK(ei.value != ej.value)
- << "Found duplicate enum values at indices " << i << " and " << j;
- DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))
diff --git a/www-client/chromium/files/chromium-119.0.6045.159-icu-74.patch b/www-client/chromium/files/chromium-119.0.6045.159-icu-74.patch
deleted file mode 100644
index efb8fb161c61..000000000000
--- a/www-client/chromium/files/chromium-119.0.6045.159-icu-74.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/917645
-(copied patch from qtwebengine:6 - https://bugs.gentoo.org/917633)
-
-Quick fix for a static_assert failure with icu74. Still waiting
-for a proper upstream fix and unknown if entirely right, but is
-an extension of [1] (is now 48 rather than 43).
-
-[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192
---- a/third_party/blink/renderer/platform/text/text_break_iterator.cc
-+++ b/third_party/blink/renderer/platform/text/text_break_iterator.cc
-@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar
- };
- // clang-format on
-
--#if U_ICU_VERSION_MAJOR_NUM >= 58
-+#if U_ICU_VERSION_MAJOR_NUM >= 74
-+#define BA_LB_COUNT (U_LB_COUNT - 8)
-+#elif U_ICU_VERSION_MAJOR_NUM >= 58
- #define BA_LB_COUNT (U_LB_COUNT - 3)
- #else
- #define BA_LB_COUNT U_LB_COUNT
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2024-03-27 7:55 Matt Jolly
0 siblings, 0 replies; 48+ messages in thread
From: Matt Jolly @ 2024-03-27 7:55 UTC (permalink / raw
To: gentoo-commits
commit: ce49374a3c3df7571a6cd2c420d8c83b13ee88da
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 07:53:38 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 07:53:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce49374a
www-client/chromium: add missed 124 patch
Closes: https://bugs.gentoo.org/927932
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
.../files/chromium-124-libwebp-shim-sharpyuv.patch | 36 ++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch b/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch
new file mode 100644
index 000000000000..fa038731cd4a
--- /dev/null
+++ b/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch
@@ -0,0 +1,36 @@
+From 40c466949bd8ccb61cb55655848d23684a9f8a94 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Mon, 25 Mar 2024 21:38:35 +1000
+Subject: [PATCH] libwebp shim: add libwebp_sharpyuv target
+
+Signed-off-by: Matt Jolly <Kangie@gentoo.org>
+--- a/build/linux/unbundle/libwebp.gn
++++ b/build/linux/unbundle/libwebp.gn
+@@ -22,14 +22,24 @@ shim_headers("libwebp_shim") {
+ "webp/mux.h",
+ "webp/mux_types.h",
+ "webp/types.h",
++ "webp/sharpyuv/sharpyuv.h",
++ "webp/sharpyuv/sharpyuv_csp.h",
+ ]
+ }
+
++source_set("libwebp_sharpyuv") {
++ deps = [ ":libwebp_shim" ]
++ public_configs = [ ":system_libwebp" ]
++}
++
+ source_set("libwebp_webp") {
+ deps = [ ":libwebp_shim" ]
+ public_configs = [ ":system_libwebp" ]
+ }
+
+ group("libwebp") {
+- deps = [ ":libwebp_webp" ]
++ deps = [
++ ":libwebp_webp",
++ ":libwebp_sharpyuv"
++ ]
+ }
+--
+2.44.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2024-03-05 9:18 Petr Vaněk
0 siblings, 0 replies; 48+ messages in thread
From: Petr Vaněk @ 2024-03-05 9:18 UTC (permalink / raw
To: gentoo-commits
commit: ba2830a0185a3a4679eb0856d30b7d354c22ef16
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Mar 4 18:27:50 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Mar 5 09:17:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2830a0
www-client/chromium: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
.../chromium/files/chromium-119-minizip-cast.patch | 23 ----------------------
1 file changed, 23 deletions(-)
diff --git a/www-client/chromium/files/chromium-119-minizip-cast.patch b/www-client/chromium/files/chromium-119-minizip-cast.patch
deleted file mode 100644
index 0d03e8ea3d9b..000000000000
--- a/www-client/chromium/files/chromium-119-minizip-cast.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-clang-16 does not get the types for an aggregate right and fails with narrowing error
---- a/third_party/zlib/google/zip_internal.cc
-+++ b/third_party/zlib/google/zip_internal.cc
-@@ -260,13 +260,12 @@ zip_fileinfo TimeToZipFileInfo(const base::Time& file_time) {
- // It assumes that dates below 1980 are in the double digit format.
- // Hence the fail safe option is to leave the date unset. Some programs
- // might show the unset date as 1980-0-0 which is invalid.
-- zip_info.tmz_date = {
-- .tm_sec = static_cast<uInt>(file_time_parts.second),
-- .tm_min = static_cast<uInt>(file_time_parts.minute),
-- .tm_hour = static_cast<uInt>(file_time_parts.hour),
-- .tm_mday = static_cast<uInt>(file_time_parts.day_of_month),
-- .tm_mon = static_cast<uInt>(file_time_parts.month - 1),
-- .tm_year = static_cast<uInt>(file_time_parts.year)};
-+ zip_info.tmz_date.tm_sec = static_cast<uInt>(file_time_parts.second);
-+ zip_info.tmz_date.tm_min = static_cast<uInt>(file_time_parts.minute);
-+ zip_info.tmz_date.tm_hour = static_cast<uInt>(file_time_parts.hour);
-+ zip_info.tmz_date.tm_mday = static_cast<uInt>(file_time_parts.day_of_month);
-+ zip_info.tmz_date.tm_mon = static_cast<uInt>(file_time_parts.month - 1);
-+ zip_info.tmz_date.tm_year = static_cast<uInt>(file_time_parts.year);
- }
-
- return zip_info;
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2023-10-04 21:45 Conrad Kostecki
0 siblings, 0 replies; 48+ messages in thread
From: Conrad Kostecki @ 2023-10-04 21:45 UTC (permalink / raw
To: gentoo-commits
commit: 7db0bb7a157466da2b5934675415eb205ed0528f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Oct 4 15:51:15 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 21:44:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7db0bb7a
www-client/chromium: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33192
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/chromium-114-remove-evdev-dep.patch | 47 ---------
.../files/chromium-115-binutils-2.41.patch | 76 ---------------
.../chromium/files/chromium-98-gtk4-build.patch | 56 -----------
www-client/chromium/files/chromium-qt6.patch | 106 ---------------------
4 files changed, 285 deletions(-)
diff --git a/www-client/chromium/files/chromium-114-remove-evdev-dep.patch b/www-client/chromium/files/chromium-114-remove-evdev-dep.patch
deleted file mode 100644
index 6c106c33e747..000000000000
--- a/www-client/chromium/files/chromium-114-remove-evdev-dep.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-commit e3612e8dcb1a43bc358248845aa4f16f4a2792c7
-Author: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri Jun 30 19:15:09 2023 +0200
-
- remoting: remove unused dependency on libevdev
-
- There is only one include, but nothing of libevdev is used. Instead
- linux/input.h (defines BTN_*).
-
-diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn
-index 9e8dfee8b7d9e..5f46876222fd5 100644
---- a/remoting/host/BUILD.gn
-+++ b/remoting/host/BUILD.gn
-@@ -241,10 +241,6 @@ if (is_linux) {
- pkg_config("xkbcommon") {
- packages = [ "xkbcommon" ]
- }
--
-- pkg_config("libevdev") {
-- packages = [ "libevdev" ]
-- }
- }
-
- # This must be a static library instead of a source set because
-@@ -576,7 +572,6 @@ static_library("common") {
- "x11_display_util.cc",
- "x11_display_util.h",
- ]
-- configs += [ ":libevdev" ]
- libs += [ "//third_party/libei/lib64/libei.a" ]
- public_deps += [
- "//third_party/wayland:wayland_client",
-diff --git a/remoting/host/linux/remote_desktop_portal_injector.cc b/remoting/host/linux/remote_desktop_portal_injector.cc
-index f6de2b406a97f..bb40aa00328d4 100644
---- a/remoting/host/linux/remote_desktop_portal_injector.cc
-+++ b/remoting/host/linux/remote_desktop_portal_injector.cc
-@@ -7,9 +7,9 @@
- #include <gio/gio.h>
- #include <gio/gunixfdlist.h>
- #include <glib-object.h>
-+#include <linux/input.h>
- #include <poll.h>
-
--#include <libevdev/libevdev-uinput.h>
- #include <utility>
-
- #include "base/check.h"
diff --git a/www-client/chromium/files/chromium-115-binutils-2.41.patch b/www-client/chromium/files/chromium-115-binutils-2.41.patch
deleted file mode 100644
index 95f65eb6e33e..000000000000
--- a/www-client/chromium/files/chromium-115-binutils-2.41.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
-index 6298f5ed19..ca7e2dffc1 100644
---- a/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/third_party/ffmpeg/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
---
-2.41.0
-
diff --git a/www-client/chromium/files/chromium-98-gtk4-build.patch b/www-client/chromium/files/chromium-98-gtk4-build.patch
deleted file mode 100644
index 94d2f1f00d58..000000000000
--- a/www-client/chromium/files/chromium-98-gtk4-build.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/ui/gtk/gsk.sigs
-+++ b/ui/gtk/gsk.sigs
-@@ -1,16 +1,16 @@
--GskRenderNodeType gsk_render_node_get_node_type(GskRenderNode* node);
-+GskRenderNodeType gsk_render_node_get_node_type(const GskRenderNode* node);
- void gsk_render_node_unref(GskRenderNode* node);
--GskRenderNode* gsk_transform_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_opacity_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_color_matrix_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_repeat_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_clip_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_rounded_clip_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_shadow_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_blur_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_debug_node_get_child(GskRenderNode* node);
--GskRenderNode* gsk_container_node_get_child(GskRenderNode* node, guint idx);
--GskRenderNode* gsk_gl_shader_node_get_child(GskRenderNode* node, guint idx);
--guint gsk_container_node_get_n_children(GskRenderNode* node);
--guint gsk_gl_shader_node_get_n_children(GskRenderNode* node);
--GdkTexture* gsk_texture_node_get_texture(GskRenderNode* node);
-+GskRenderNode* gsk_transform_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_opacity_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_color_matrix_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_repeat_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_clip_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_rounded_clip_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_shadow_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_blur_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_debug_node_get_child(const GskRenderNode* node);
-+GskRenderNode* gsk_container_node_get_child(const GskRenderNode* node, guint idx);
-+GskRenderNode* gsk_gl_shader_node_get_child(const GskRenderNode* node, guint idx);
-+guint gsk_container_node_get_n_children(const GskRenderNode* node);
-+guint gsk_gl_shader_node_get_n_children(const GskRenderNode* node);
-+GdkTexture* gsk_texture_node_get_texture(const GskRenderNode* node);
---- a/ui/gtk/gtk_util.cc
-+++ b/ui/gtk/gtk_util.cc
-@@ -705,7 +705,7 @@
- DCHECK(GtkCheckVersion(4));
- struct {
- GskRenderNodeType node_type;
-- GskRenderNode* (*get_child)(GskRenderNode*);
-+ GskRenderNode* (*get_child)(const GskRenderNode*);
- } constexpr simple_getters[] = {
- {GSK_TRANSFORM_NODE, gsk_transform_node_get_child},
- {GSK_OPACITY_NODE, gsk_opacity_node_get_child},
-@@ -719,8 +719,8 @@
- };
- struct {
- GskRenderNodeType node_type;
-- guint (*get_n_children)(GskRenderNode*);
-- GskRenderNode* (*get_child)(GskRenderNode*, guint);
-+ guint (*get_n_children)(const GskRenderNode*);
-+ GskRenderNode* (*get_child)(const GskRenderNode*, guint);
- } constexpr container_getters[] = {
- {GSK_CONTAINER_NODE, gsk_container_node_get_n_children,
- gsk_container_node_get_child},
diff --git a/www-client/chromium/files/chromium-qt6.patch b/www-client/chromium/files/chromium-qt6.patch
deleted file mode 100644
index 1f18a937331c..000000000000
--- a/www-client/chromium/files/chromium-qt6.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- a/ui/qt/qt.gni
-+++ b/ui/qt/qt.gni
-@@ -12,9 +12,21 @@ declare_args() {
- use_qt = is_linux && !is_castos && !is_msan
- }
-
-+declare_args() {
-+ if(!use_sysroot && use_qt) {
-+ moc_qt5_path = ""
-+ }
-+}
-+
- declare_args() {
- use_qt6 = use_qt && use_sysroot
- }
-
-+declare_args() {
-+ if(!use_sysroot && use_qt6) {
-+ moc_qt6_path = ""
-+ }
-+}
-+
- # use_qt6 => use_qt
- assert(!use_qt6 || use_qt)
---- a/ui/qt/BUILD.gn
-+++ b/ui/qt/BUILD.gn
-@@ -41,16 +41,19 @@ source_set("qt_interface") {
- sources = [ "qt_interface.cc" ]
- }
-
--if (!use_sysroot) {
-- action("generate_moc") {
-- script = "moc_wrapper.py"
-- inputs = [ "//ui/qt/qt_shim.h" ]
-- outputs = [ "$root_gen_dir/qt_shim_moc.cc" ]
-- args = rebase_path(inputs + outputs, root_build_dir)
-+template("qt_shim") {
-+ if (!use_sysroot) {
-+ action("generate_moc" + invoker.qt_version) {
-+ script = "moc_wrapper.py"
-+ inputs = [ "//ui/qt/qt_shim.h" ]
-+ outputs = [ "$root_gen_dir/qt" + invoker.qt_version + "/qt_shim_moc.cc" ]
-+ args = rebase_path(inputs + outputs, root_build_dir)
-+ if (invoker.moc_qt_path != "") {
-+ args += [ "--path", invoker.moc_qt_path ]
-+ }
-+ }
- }
--}
-
--template("qt_shim") {
- pkg_config("qt" + invoker.qt_version + "_config") {
- packages = [
- "Qt" + invoker.qt_version + "Core",
-@@ -90,17 +93,23 @@ template("qt_shim") {
- # avoid a build-time dependency on `moc` when using the sysroot.
- sources += [ "qt" + invoker.qt_version + "_shim_moc.cc" ]
- } else {
-- sources += get_target_outputs(":generate_moc")
-- deps += [ ":generate_moc" ]
-+ sources += get_target_outputs(":generate_moc" + invoker.qt_version)
-+ deps += [ ":generate_moc" + invoker.qt_version ]
- }
- }
- }
- qt_shim("qt5_shim") {
- qt_version = "5"
-+ if (!use_sysroot) {
-+ moc_qt_path = "$moc_qt5_path"
-+ }
- }
- if (use_qt6) {
- qt_shim("qt6_shim") {
- qt_version = "6"
-+ if (!use_sysroot) {
-+ moc_qt_path = "$moc_qt6_path"
-+ }
- }
- }
-
---- a/ui/qt/moc_wrapper.py
-+++ b/ui/qt/moc_wrapper.py
-@@ -3,8 +3,21 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
-+import argparse
- import subprocess
--import sys
-
-+parser = argparse.ArgumentParser()
-+parser.add_argument(
-+ 'input', type=str, help='Input header file.')
-+parser.add_argument(
-+ 'output', type=str, help='Output file.')
-+parser.add_argument(
-+ '--path', required=False, type=str, default=None,
-+ help='Path to moc binary.')
-
--subprocess.check_call(["moc", sys.argv[1], "-o", sys.argv[2]])
-+args = parser.parse_args()
-+
-+if args.path is None:
-+ subprocess.check_call(["moc", args.input, "-o", args.output])
-+else:
-+ subprocess.check_call([args.path + "/moc", args.input, "-o", args.output])
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2023-09-13 18:43 Conrad Kostecki
0 siblings, 0 replies; 48+ messages in thread
From: Conrad Kostecki @ 2023-09-13 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 3db4bb06b1adab23426a480c18311365ebc3dcc3
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Sep 13 12:22:07 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 18:42:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db4bb06
www-client/chromium: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32753
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
www-client/chromium/files/chromium-114-gcc12.patch | 30 ----------------------
1 file changed, 30 deletions(-)
diff --git a/www-client/chromium/files/chromium-114-gcc12.patch b/www-client/chromium/files/chromium-114-gcc12.patch
deleted file mode 100644
index 5070135c6117..000000000000
--- a/www-client/chromium/files/chromium-114-gcc12.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://chromium.googlesource.com/chromium/src/+/a1fec6273f3ad7c73b35bb420a5540355df35b74
-controlledframe: Fix start up crash
-
-This commit applies a fix from mail@maciej.szmigiero.name to prevent a
-null reference error in GetControlledFrameFeatureList(). The fix is to
-add static to `feature_list` so that the object lives past this
-function.
-
-BUG=1447422
-
-Change-Id: I22879831ec879ce7d6a178760540f88106b3ded4
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4555985
-Commit-Queue: Ovidio Ruiz-Henríquez <odejesush@chromium.org>
-Reviewed-by: David Roger <droger@chromium.org>
-Reviewed-by: Chase Phillips <cmp@chromium.org>
-Auto-Submit: Ovidio Ruiz-Henríquez <odejesush@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1149296}
-
---- a/chrome/common/initialize_extensions_client.cc
-+++ b/chrome/common/initialize_extensions_client.cc
-
-@@ -19,7 +19,7 @@
-
- // This list should stay in sync with GetExpectedDelegatedFeaturesForTest().
- base::span<const char* const> GetControlledFrameFeatureList() {
-- constexpr const char* feature_list[] = {
-+ static constexpr const char* feature_list[] = {
- "controlledFrameInternal", "chromeWebViewInternal", "guestViewInternal",
- "webRequestInternal", "webViewInternal",
- };
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2023-07-02 1:43 Conrad Kostecki
0 siblings, 0 replies; 48+ messages in thread
From: Conrad Kostecki @ 2023-07-02 1:43 UTC (permalink / raw
To: gentoo-commits
commit: bf19d5aa7eaf8ffd34b581069196d7141e5772b9
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jun 30 21:11:34 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jul 2 01:33:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf19d5aa
www-client/chromium: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31681
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../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 ----
4 files changed, 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>
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2023-06-30 19:03 Stephan Hartmann
0 siblings, 0 replies; 48+ messages in thread
From: Stephan Hartmann @ 2023-06-30 19:03 UTC (permalink / raw
To: gentoo-commits
commit: c68de9614a876d68d27c3cddd6b1bdc4861380b0
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 19:02:47 2023 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 19:03:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68de961
www-client/chromium: update evdev patch
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
.../files/chromium-114-remove-evdev-dep.patch | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/www-client/chromium/files/chromium-114-remove-evdev-dep.patch b/www-client/chromium/files/chromium-114-remove-evdev-dep.patch
index 61d09d341adc..6c106c33e747 100644
--- a/www-client/chromium/files/chromium-114-remove-evdev-dep.patch
+++ b/www-client/chromium/files/chromium-114-remove-evdev-dep.patch
@@ -1,7 +1,14 @@
-This patch removes the dependency on libevdev from remoting/host.
+commit e3612e8dcb1a43bc358248845aa4f16f4a2792c7
+Author: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri Jun 30 19:15:09 2023 +0200
-According to sultan it's not (currently(?)) used so we can avoid that dependency.
+ remoting: remove unused dependency on libevdev
+ There is only one include, but nothing of libevdev is used. Instead
+ linux/input.h (defines BTN_*).
+
+diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn
+index 9e8dfee8b7d9e..5f46876222fd5 100644
--- a/remoting/host/BUILD.gn
+++ b/remoting/host/BUILD.gn
@@ -241,10 +241,6 @@ if (is_linux) {
@@ -15,7 +22,7 @@ According to sultan it's not (currently(?)) used so we can avoid that dependency
}
# This must be a static library instead of a source set because
-@@ -572,7 +572,6 @@ static_library("common") {
+@@ -576,7 +572,6 @@ static_library("common") {
"x11_display_util.cc",
"x11_display_util.h",
]
@@ -23,10 +30,15 @@ According to sultan it's not (currently(?)) used so we can avoid that dependency
libs += [ "//third_party/libei/lib64/libei.a" ]
public_deps += [
"//third_party/wayland:wayland_client",
+diff --git a/remoting/host/linux/remote_desktop_portal_injector.cc b/remoting/host/linux/remote_desktop_portal_injector.cc
+index f6de2b406a97f..bb40aa00328d4 100644
--- a/remoting/host/linux/remote_desktop_portal_injector.cc
+++ b/remoting/host/linux/remote_desktop_portal_injector.cc
-@@ -9,7 +9,6 @@
+@@ -7,9 +7,9 @@
+ #include <gio/gio.h>
+ #include <gio/gunixfdlist.h>
#include <glib-object.h>
++#include <linux/input.h>
#include <poll.h>
-#include <libevdev/libevdev-uinput.h>
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2023-05-07 18:22 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2023-05-07 18:22 UTC (permalink / raw
To: gentoo-commits
commit: 36756f98fbabfc24deb746ac7574380a99191959
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May 7 18:21:55 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May 7 18:21:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36756f98
www-client/chromium: update compiler patch
Should fix gn failure with clang.
Closes: https://bugs.gentoo.org/905798
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../chromium/files/chromium-113-compiler.patch | 50 +++++++++++++++++-----
1 file changed, 39 insertions(+), 11 deletions(-)
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.
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2023-05-02 20:05 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2023-05-02 20:05 UTC (permalink / raw
To: gentoo-commits
commit: b60d25c220c343feae0b26a0853cab976ff89842
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon May 1 18:38:18 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue May 2 20:05:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60d25c2
www-client/chromium: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30829
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../files/chromium-111-ozone-platform.patch | 32 ----------------------
1 file changed, 32 deletions(-)
diff --git a/www-client/chromium/files/chromium-111-ozone-platform.patch b/www-client/chromium/files/chromium-111-ozone-platform.patch
deleted file mode 100644
index cf9d11793e65..000000000000
--- a/www-client/chromium/files/chromium-111-ozone-platform.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From eeb0b18565e6e644524fedb511a1658b502836cf Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Tue, 14 Feb 2023 19:09:47 +0000
-Subject: [PATCH] IWYU: missing PlatformKeyboardHook include in ozone_platform.cc
-
-libstdc++ implementation of std::unique_ptr requires full declaration
-of the contained type for converting from nullptr. Add the required
-include in OzonePlatform for PlatformKeyboardHook.
-
-This fixes this build error with GCC and libstdc++:
- /usr/include/c++/12/bits/unique_ptr.h:93:23: error: invalid application of ‘sizeof’ to incomplete type ‘ui::PlatformKeyboardHook’
-
-Bug: 957519
-Change-Id: I20429925dd00108cf684548b0260ebb053a8ada2
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4239869
-Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/main@{#1105184}
----
-
-diff --git a/ui/ozone/public/ozone_platform.cc b/ui/ozone/public/ozone_platform.cc
-index 81f8070..6c4ce21 100644
---- a/ui/ozone/public/ozone_platform.cc
-+++ b/ui/ozone/public/ozone_platform.cc
-@@ -15,6 +15,7 @@
- #include "ui/ozone/platform_object.h"
- #include "ui/ozone/platform_selection.h"
- #include "ui/ozone/public/platform_global_shortcut_listener.h"
-+#include "ui/ozone/public/platform_keyboard_hook.h"
- #include "ui/ozone/public/platform_menu_utils.h"
- #include "ui/ozone/public/platform_screen.h"
- #include "ui/ozone/public/platform_user_input_monitor.h"
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2023-04-23 14:46 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2023-04-23 14:46 UTC (permalink / raw
To: gentoo-commits
commit: d92f571cc96e10d74f49068c5c83b89f762cd373
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 14:45:28 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 14:45:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d92f571c
www-client/chromium: update swiftshader patch
Closes: https://bugs.gentoo.org/904850
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../chromium/files/chromium-112-swiftshader.patch | 52 +++++++++++++++++++++-
1 file changed, 50 insertions(+), 2 deletions(-)
diff --git a/www-client/chromium/files/chromium-112-swiftshader.patch b/www-client/chromium/files/chromium-112-swiftshader.patch
index 5f703d919555..9d67841a1dea 100644
--- a/www-client/chromium/files/chromium-112-swiftshader.patch
+++ b/www-client/chromium/files/chromium-112-swiftshader.patch
@@ -1,4 +1,5 @@
https://bugs.gentoo.org/904725
+https://bugs.gentoo.org/904850
From 451fb9470e4e1cd183ff05d5e171dc21bae6e47c Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz <jdapena@igalia.com>
@@ -29,8 +30,6 @@ Tested-by: Shahbaz Youssefi <syoussefi@google.com>
Commit-Queue: Shahbaz Youssefi <syoussefi@google.com>
---
-diff --git a/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h b/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h
-index 620209b..d0a48e8 100644
--- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h
+++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h
@@ -1415,9 +1415,9 @@
@@ -72,3 +71,52 @@ index 620209b..d0a48e8 100644
Result = Other.Result;
return *this;
}
+From e4dea744b7838470757f010fc2ff4b92f02b3fac Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Thu, 16 Mar 2023 13:29:54 +0100
+Subject: [PATCH] More C++20 fixes
+
+Partial backport of llvm-project patch:
+ commit 2ccf0b76bcaf0895e04f14e3ff53c59dd96f9f0f
+ Author: Evgeny Mandrikov <mandrikov@gmail.com>
+ Date: Thu Jan 6 17:01:05 2022 +0100
+
+ Fix build failure with GCC 11 in C++20 mode
+
+ See https://wg21.link/cwg2237
+
+ Reviewed By: shafik, dexonsmith
+
+ Differential Revision: https://reviews.llvm.org/D115355
+
+Bug: chromium:819294
+Change-Id: I90d58b6fc601f9a4f615e2f6edc13a73ce848e4f
+Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71089
+Reviewed-by: Shahbaz Youssefi <syoussefi@google.com>
+Tested-by: Shahbaz Youssefi <syoussefi@google.com>
+Kokoro-Result: kokoro <noreply+kokoro@google.com>
+Commit-Queue: Shahbaz Youssefi <syoussefi@google.com>
+---
+
+--- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h
++++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h
+@@ -718,7 +718,7 @@
+ T *P;
+
+ public:
+- SingleLinkedListIterator<T>(T *P) : P(P) {}
++ SingleLinkedListIterator(T *P) : P(P) {}
+
+ SingleLinkedListIterator<T> &operator++() {
+ P = P->Next;
+--- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/BinaryStreamArray.h
++++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/BinaryStreamArray.h
+@@ -324,7 +324,7 @@
+ FixedStreamArrayIterator(const FixedStreamArray<T> &Array, uint32_t Index)
+ : Array(Array), Index(Index) {}
+
+- FixedStreamArrayIterator<T>(const FixedStreamArrayIterator<T> &Other)
++ FixedStreamArrayIterator(const FixedStreamArrayIterator<T> &Other)
+ : Array(Other.Array), Index(Other.Index) {}
+ FixedStreamArrayIterator<T> &
+ operator=(const FixedStreamArrayIterator<T> &Other) {
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2023-01-01 18:16 Conrad Kostecki
0 siblings, 0 replies; 48+ messages in thread
From: Conrad Kostecki @ 2023-01-01 18:16 UTC (permalink / raw
To: gentoo-commits
commit: e5ef5742f88583d5240f9f471fc0ae68f929a94b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jan 1 13:46:49 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 18:16:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5ef5742
www-client/chromium: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28922
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/chromium-98-EnumTable-crash.patch | 76 ----------------------
1 file changed, 76 deletions(-)
diff --git a/www-client/chromium/files/chromium-98-EnumTable-crash.patch b/www-client/chromium/files/chromium-98-EnumTable-crash.patch
deleted file mode 100644
index f058ec18327a..000000000000
--- a/www-client/chromium/files/chromium-98-EnumTable-crash.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
-index 842553a..89de703 100644
---- a/components/cast_channel/enum_table.h
-+++ b/components/cast_channel/enum_table.h
-@@ -8,6 +8,7 @@
- #include <cstdint>
- #include <cstring>
- #include <ostream>
-+#include <vector>
-
- #include "base/check_op.h"
- #include "base/notreached.h"
-@@ -187,7 +188,6 @@ class
- inline constexpr GenericEnumTableEntry(int32_t value);
- inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
-
-- GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
- GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
-
- private:
-@@ -253,7 +253,6 @@ class EnumTable {
- constexpr Entry(E value, base::StringPiece str)
- : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
-
-- Entry(const Entry&) = delete;
- Entry& operator=(const Entry&) = delete;
- };
-
-@@ -312,15 +311,14 @@ class EnumTable {
- if (is_sorted_) {
- const std::size_t index = static_cast<std::size_t>(value);
- if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
-- const auto& entry = data_.begin()[index];
-+ const auto& entry = data_[index];
- if (ANALYZER_ASSUME_TRUE(entry.has_str()))
- return entry.str();
- }
- return absl::nullopt;
- }
- return GenericEnumTableEntry::FindByValue(
-- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
-- data_.size(), static_cast<int32_t>(value));
-+ &data_[0], data_.size(), static_cast<int32_t>(value));
- }
-
- // This overload of GetString is designed for cases where the argument is a
-@@ -348,8 +346,7 @@ class EnumTable {
- // enum value directly.
- absl::optional<E> GetEnum(base::StringPiece str) const {
- auto* entry = GenericEnumTableEntry::FindByString(
-- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
-- data_.size(), str);
-+ &data_[0], data_.size(), str);
- return entry ? static_cast<E>(entry->value) : absl::optional<E>();
- }
-
-@@ -364,7 +361,7 @@ class EnumTable {
- // Align the data on a cache line boundary.
- alignas(64)
- #endif
-- std::initializer_list<Entry> data_;
-+ const std::vector<Entry> data_;
- bool is_sorted_;
-
- constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
-@@ -376,8 +373,8 @@ class EnumTable {
-
- for (std::size_t i = 0; i < data.size(); i++) {
- for (std::size_t j = i + 1; j < data.size(); j++) {
-- const Entry& ei = data.begin()[i];
-- const Entry& ej = data.begin()[j];
-+ const Entry& ei = data[i];
-+ const Entry& ej = data[j];
- DCHECK(ei.value != ej.value)
- << "Found duplicate enum values at indices " << i << " and " << j;
- DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2022-12-22 19:54 Stephan Hartmann
0 siblings, 0 replies; 48+ messages in thread
From: Stephan Hartmann @ 2022-12-22 19:54 UTC (permalink / raw
To: gentoo-commits
commit: 0314a48a82b68675dde3d1998d6e46daa128b95b
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 19:54:15 2022 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 19:54:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0314a48a
www-client/chromium: remove unused patches
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
.../chromium-105-swiftshader-no-wayland.patch | 11 --------
.../chromium/files/chromium-106-python3_11.patch | 11 --------
...6-revert-GlobalMediaControlsCastStartStop.patch | 32 ----------------------
3 files changed, 54 deletions(-)
diff --git a/www-client/chromium/files/chromium-105-swiftshader-no-wayland.patch b/www-client/chromium/files/chromium-105-swiftshader-no-wayland.patch
deleted file mode 100644
index 71326dbd8011..000000000000
--- a/www-client/chromium/files/chromium-105-swiftshader-no-wayland.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/third_party/swiftshader/src/WSI/BUILD.gn
-+++ b/third_party/swiftshader/src/WSI/BUILD.gn
-@@ -84,7 +84,7 @@ swiftshader_source_set("WSI") {
- "../Vulkan:swiftshader_libvulkan_headers",
- ]
-
-- if (is_linux && !use_system_libwayland) {
-+ if (is_linux && !use_system_libwayland && ozone_platform_wayland) {
- # Use third-party targets
- deps += [ "$wayland_gn_dir:wayland_client" ]
- }
diff --git a/www-client/chromium/files/chromium-106-python3_11.patch b/www-client/chromium/files/chromium-106-python3_11.patch
deleted file mode 100644
index 795f48547490..000000000000
--- a/www-client/chromium/files/chromium-106-python3_11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/grit/grit/util.py
-+++ b/tools/grit/grit/util.py
-@@ -209,7 +209,7 @@ def ReadFile(filename, encoding):
- mode = 'rb'
- encoding = None
- else:
-- mode = 'rU'
-+ mode = 'r'
-
- with io.open(filename, mode, encoding=encoding) as f:
- return f.read()
diff --git a/www-client/chromium/files/chromium-106-revert-GlobalMediaControlsCastStartStop.patch b/www-client/chromium/files/chromium-106-revert-GlobalMediaControlsCastStartStop.patch
deleted file mode 100644
index 5b28ff461bb1..000000000000
--- a/www-client/chromium/files/chromium-106-revert-GlobalMediaControlsCastStartStop.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b58f0f2725a8c1a8a131f9984b5fd53b54119dba Mon Sep 17 00:00:00 2001
-From: Muyao Xu <muyaoxu@google.com>
-Date: Thu, 20 Jan 2022 23:46:21 +0000
-Subject: [PATCH] [Zenith] Enable GlobalMediaControlsCastStartStop flag by
- default
-
-The feature is rolled out to 100% stable through finch for M96+.
-This CL enables it by default and fixes some unit tests failures.
-
-Bug: 1287242, 1287305
-Change-Id: I7e5c9625b77379fef253c41ef292a0dd6fc366fb
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3388416
-Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
-Commit-Queue: Muyao Xu <muyaoxu@google.com>
-Cr-Commit-Position: refs/heads/main@{#961658}
----
- chrome/browser/media/router/media_router_feature.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
-index dcb025a..f7ea08a 100644
---- a/chrome/browser/media/router/media_router_feature.cc
-+++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -48,7 +48,7 @@ const base::Feature kGlobalMediaControlsCastStartStop{
- "GlobalMediaControlsCastStartStop", base::FEATURE_DISABLED_BY_DEFAULT};
- #else
- const base::Feature kGlobalMediaControlsCastStartStop{
-- "GlobalMediaControlsCastStartStop", base::FEATURE_ENABLED_BY_DEFAULT};
-+ "GlobalMediaControlsCastStartStop", base::FEATURE_DISABLED_BY_DEFAULT};
- #endif // BUILDFLAG(IS_CHROMEOS)
-
- #endif // !BUILDFLAG(IS_ANDROID)
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2022-02-03 9:18 Stephan Hartmann
0 siblings, 0 replies; 48+ messages in thread
From: Stephan Hartmann @ 2022-02-03 9:18 UTC (permalink / raw
To: gentoo-commits
commit: 079c473b3379b07537213a34f039d87a7ae791a7
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 3 09:18:31 2022 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Thu Feb 3 09:18:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079c473b
www-client/chromium: remove unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
.../files/chromium-96-EnumTable-crash.patch | 76 ----------------------
.../files/chromium-97-arm64-mte-clang.patch | 34 ----------
2 files changed, 110 deletions(-)
diff --git a/www-client/chromium/files/chromium-96-EnumTable-crash.patch b/www-client/chromium/files/chromium-96-EnumTable-crash.patch
deleted file mode 100644
index 9736739c8224..000000000000
--- a/www-client/chromium/files/chromium-96-EnumTable-crash.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
-index aad9e08..2f3fcad 100644
---- a/components/cast_channel/enum_table.h
-+++ b/components/cast_channel/enum_table.h
-@@ -8,6 +8,7 @@
- #include <cstdint>
- #include <cstring>
- #include <ostream>
-+#include <vector>
-
- #include "base/check_op.h"
- #include "base/macros.h"
-@@ -188,7 +189,6 @@ class
- inline constexpr GenericEnumTableEntry(int32_t value);
- inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
-
-- GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
- GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
-
- private:
-@@ -254,7 +254,6 @@ class EnumTable {
- constexpr Entry(E value, base::StringPiece str)
- : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
-
-- Entry(const Entry&) = delete;
- Entry& operator=(const Entry&) = delete;
- };
-
-@@ -313,15 +312,14 @@ class EnumTable {
- if (is_sorted_) {
- const std::size_t index = static_cast<std::size_t>(value);
- if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
-- const auto& entry = data_.begin()[index];
-+ const auto& entry = data_[index];
- if (ANALYZER_ASSUME_TRUE(entry.has_str()))
- return entry.str();
- }
- return absl::nullopt;
- }
- return GenericEnumTableEntry::FindByValue(
-- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
-- data_.size(), static_cast<int32_t>(value));
-+ &data_[0], data_.size(), static_cast<int32_t>(value));
- }
-
- // This overload of GetString is designed for cases where the argument is a
-@@ -349,8 +347,7 @@ class EnumTable {
- // enum value directly.
- absl::optional<E> GetEnum(base::StringPiece str) const {
- auto* entry = GenericEnumTableEntry::FindByString(
-- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
-- data_.size(), str);
-+ &data_[0], data_.size(), str);
- return entry ? static_cast<E>(entry->value) : absl::optional<E>();
- }
-
-@@ -365,7 +362,7 @@ class EnumTable {
- // Align the data on a cache line boundary.
- alignas(64)
- #endif
-- std::initializer_list<Entry> data_;
-+ const std::vector<Entry> data_;
- bool is_sorted_;
-
- constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
-@@ -377,8 +374,8 @@ class EnumTable {
-
- for (std::size_t i = 0; i < data.size(); i++) {
- for (std::size_t j = i + 1; j < data.size(); j++) {
-- const Entry& ei = data.begin()[i];
-- const Entry& ej = data.begin()[j];
-+ const Entry& ei = data[i];
-+ const Entry& ej = data[j];
- DCHECK(ei.value != ej.value)
- << "Found duplicate enum values at indices " << i << " and " << j;
- DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))
diff --git a/www-client/chromium/files/chromium-97-arm64-mte-clang.patch b/www-client/chromium/files/chromium-97-arm64-mte-clang.patch
deleted file mode 100644
index e86110bfb0ea..000000000000
--- a/www-client/chromium/files/chromium-97-arm64-mte-clang.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c04406585217092f85f3188dab4875b7be78af1d Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Thu, 02 Dec 2021 16:56:39 +0000
-Subject: [PATCH] base: enable mte via -Xclang instead
-
--march is fragile as it may get overridden later on by
-e.g. distributors.
-
-Bug: 1137393
-Change-Id: Ia6b98491ef6f955929d0699e9f435844de48e1da
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3310965
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Cr-Commit-Position: refs/heads/main@{#947530}
----
-
-diff --git a/base/BUILD.gn b/base/BUILD.gn
-index df6293d..eaa02b7 100644
---- a/base/BUILD.gn
-+++ b/base/BUILD.gn
-@@ -104,7 +104,12 @@
- # but they're not backwards compatible. Use base::CPU::has_mte()
- # beforehand to confirm or use indirect functions (ifuncs) to select
- # an MTE-specific implementation at dynamic link-time.
-- cflags = [ "-march=armv8-a+memtag" ]
-+ cflags = [
-+ "-Xclang",
-+ "-target-feature",
-+ "-Xclang",
-+ "+mte",
-+ ]
- }
- }
-
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2021-11-20 10:08 Stephan Hartmann
0 siblings, 0 replies; 48+ messages in thread
From: Stephan Hartmann @ 2021-11-20 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 2415a3c94f322bf84d310cf985b6e6081683ff92
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 10:08:00 2021 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 10:08:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2415a3c9
www-client/chromium: add workaround for sandbox with glibc-2.34
Bug: https://bugs.gentoo.org/823857
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
.../chromium/files/chromium-glibc-2.34.patch | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/www-client/chromium/files/chromium-glibc-2.34.patch b/www-client/chromium/files/chromium-glibc-2.34.patch
index 0cb85b2ca516..64c03a6adae6 100644
--- a/www-client/chromium/files/chromium-glibc-2.34.patch
+++ b/www-client/chromium/files/chromium-glibc-2.34.patch
@@ -26,3 +26,25 @@ index ca353c4..5cdabcf 100644
// Only set an alternative stack if there isn't already one, or if the current
// one is too small.
+diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
+index ca6b595..1c1ee42 100644
+--- a/sandbox/linux/services/credentials.cc
++++ b/sandbox/linux/services/credentials.cc
+@@ -11,6 +11,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -100,7 +101,8 @@ bool ChrootToSafeEmptyDir() {
+ // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
+ clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
+
+- char tls_buf[PTHREAD_STACK_MIN] = {0};
++ char tls_buf[PTHREAD_STACK_MIN];
++ memset(tls_buf, 0, PTHREAD_STACK_MIN);
+ tls = tls_buf;
+ #endif
+
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2021-08-28 19:43 Stephan Hartmann
0 siblings, 0 replies; 48+ messages in thread
From: Stephan Hartmann @ 2021-08-28 19:43 UTC (permalink / raw
To: gentoo-commits
commit: d50088b3d4fd368f392c82ac95b67a499cdb7032
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Aug 28 19:25:03 2021 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 28 19:42:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d50088b3
www-client/chromium: remove unused patch
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22145
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
.../files/chromium-92-GetUsableSize-nullptr.patch | 46 ----------------------
1 file changed, 46 deletions(-)
diff --git a/www-client/chromium/files/chromium-92-GetUsableSize-nullptr.patch b/www-client/chromium/files/chromium-92-GetUsableSize-nullptr.patch
deleted file mode 100644
index e36ed1b6615..00000000000
--- a/www-client/chromium/files/chromium-92-GetUsableSize-nullptr.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 61e16c92ff24bb71b9b7309a9d6d470ee91738bc Mon Sep 17 00:00:00 2001
-From: Bartek Nowierski <bartekn@chromium.org>
-Date: Wed, 21 Jul 2021 15:01:38 +0000
-Subject: [PATCH] [PA] Make GetUsableSize() handle nullptr gracefully
-
-malloc_usable_size() is expected to not crush on NULL and return 0.
-
-Bug: 1221442
-Change-Id: I6a3b90dcf3a8ad18114c206d87b98f60d5f50eb1
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3042177
-Commit-Queue: Bartek Nowierski <bartekn@chromium.org>
-Commit-Queue: Kentaro Hara <haraken@chromium.org>
-Auto-Submit: Bartek Nowierski <bartekn@chromium.org>
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#903900}
----
-
-diff --git a/base/allocator/partition_allocator/partition_alloc_unittest.cc b/base/allocator/partition_allocator/partition_alloc_unittest.cc
-index c1212011..8863984 100644
---- a/base/allocator/partition_allocator/partition_alloc_unittest.cc
-+++ b/base/allocator/partition_allocator/partition_alloc_unittest.cc
-@@ -2838,6 +2838,10 @@
- }
- }
-
-+TEST_F(PartitionAllocTest, GetUsableSizeNull) {
-+ EXPECT_EQ(0ULL, PartitionRoot<ThreadSafe>::GetUsableSize(nullptr));
-+}
-+
- TEST_F(PartitionAllocTest, GetUsableSize) {
- size_t delta = SystemPageSize() + 1;
- for (size_t size = 1; size <= kMinDirectMappedDownsize; size += delta) {
-diff --git a/base/allocator/partition_allocator/partition_root.h b/base/allocator/partition_allocator/partition_root.h
-index b72a1d9..baac9525 100644
---- a/base/allocator/partition_allocator/partition_root.h
-+++ b/base/allocator/partition_allocator/partition_root.h
-@@ -1220,6 +1220,9 @@
- // PartitionAlloc's internal data. Used as malloc_usable_size.
- template <bool thread_safe>
- ALWAYS_INLINE size_t PartitionRoot<thread_safe>::GetUsableSize(void* ptr) {
-+ // malloc_usable_size() is expected to handle NULL gracefully and return 0.
-+ if (!ptr)
-+ return 0;
- auto* slot_span = SlotSpan::FromSlotInnerPtr(ptr);
- auto* root = FromSlotSpan(slot_span);
- return slot_span->GetUsableSize(root);
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2021-07-03 7:51 Stephan Hartmann
0 siblings, 0 replies; 48+ messages in thread
From: Stephan Hartmann @ 2021-07-03 7:51 UTC (permalink / raw
To: gentoo-commits
commit: 43ac6fb27ccc8edfa3112fdfd088923332e65483
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 3 07:50:57 2021 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sat Jul 3 07:50:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ac6fb2
www-client/chromium: remove unused patch
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
.../chromium/files/chromium-93-system-ffmpeg.patch | 25 ----------------------
1 file changed, 25 deletions(-)
diff --git a/www-client/chromium/files/chromium-93-system-ffmpeg.patch b/www-client/chromium/files/chromium-93-system-ffmpeg.patch
deleted file mode 100644
index 7ed5331c527..00000000000
--- a/www-client/chromium/files/chromium-93-system-ffmpeg.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 04d56bcb5a59c4a36b9bb9ac57a84090033761ce Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 19 Jun 2021 13:08:48 +0000
-Subject: [PATCH] unbundle: add libavcodec/format.h shim headers
-
-Header is included in ffmpeg_demuxer.
----
- build/linux/unbundle/ffmpeg.gn | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
-index 978298a..16e2074 100644
---- a/build/linux/unbundle/ffmpeg.gn
-+++ b/build/linux/unbundle/ffmpeg.gn
-@@ -23,6 +23,7 @@ shim_headers("ffmpeg_shim") {
- root_path = "."
- headers = [
- "libavcodec/avcodec.h",
-+ "libavcodec/packet.h",
- "libavformat/avformat.h",
- "libavutil/imgutils.h",
- ]
---
-2.31.1
-
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2020-07-14 17:32 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2020-07-14 17:32 UTC (permalink / raw
To: gentoo-commits
commit: b913adab222a7a22fa651debf92aee428dd1ba28
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jul 11 20:34:10 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jul 14 17:31:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b913adab
www-client/chromium: remove unused patch
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16671
.../chromium/files/chromium-85-ozone-include.patch | 24 ----------------------
1 file changed, 24 deletions(-)
diff --git a/www-client/chromium/files/chromium-85-ozone-include.patch b/www-client/chromium/files/chromium-85-ozone-include.patch
deleted file mode 100644
index 2441a2aca13..00000000000
--- a/www-client/chromium/files/chromium-85-ozone-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9abbd7da1ddd8003106cc3420170561d475231a9 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 29 Jun 2020 13:01:27 +0000
-Subject: [PATCH] IWYU: add missing include for std::vector
-
----
- ui/ozone/public/platform_screen.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ui/ozone/public/platform_screen.h b/ui/ozone/public/platform_screen.h
-index 9ce293c..ba20597 100644
---- a/ui/ozone/public/platform_screen.h
-+++ b/ui/ozone/public/platform_screen.h
-@@ -7,6 +7,7 @@
-
- #include <set>
- #include <string>
-+#include <vector>
-
- #include "base/component_export.h"
- #include "base/macros.h"
---
-2.26.2
-
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2020-02-28 14:39 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2020-02-28 14:39 UTC (permalink / raw
To: gentoo-commits
commit: 0f63495513b774cf8494894df98e8112c1463165
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Fri Feb 28 10:16:17 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 14:39:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f634955
www-client/chromium: fix compiler patch for dev channel
Closes: https://bugs.gentoo.org/711010
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14796
.../chromium/files/chromium-compiler-r12.patch | 54 +++++++++-------------
1 file changed, 22 insertions(+), 32 deletions(-)
diff --git a/www-client/chromium/files/chromium-compiler-r12.patch b/www-client/chromium/files/chromium-compiler-r12.patch
index 18f597f7e34..833abe2828c 100644
--- a/www-client/chromium/files/chromium-compiler-r12.patch
+++ b/www-client/chromium/files/chromium-compiler-r12.patch
@@ -1,17 +1,17 @@
-From 4ee82d093d26ab2fcdb989fd62f55b0588afdde0 Mon Sep 17 00:00:00 2001
+From 137de121a36f9349ad8435fee57940facef82878 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 15 Feb 2020 12:11:49 +0000
+Date: Fri, 26 Feb 2020 10:09:23 +0000
Subject: [PATCH] Disable various compiler configs
---
- build/config/compiler/BUILD.gn | 70 ++++++++++++----------------------
- 1 file changed, 25 insertions(+), 45 deletions(-)
+ build/config/compiler/BUILD.gn | 67 ++++++++++++----------------------
+ 1 file changed, 23 insertions(+), 44 deletions(-)
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index e40194e..f2bd02e 100644
+index 85bc736..a85bd12 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
-@@ -260,8 +260,6 @@ config("compiler") {
+@@ -261,8 +261,6 @@ config("compiler") {
configs += [
# See the definitions below.
@@ -20,7 +20,7 @@ index e40194e..f2bd02e 100644
":compiler_codegen",
":compiler_deterministic",
]
-@@ -486,26 +484,6 @@ config("compiler") {
+@@ -487,26 +485,6 @@ config("compiler") {
}
}
@@ -37,7 +37,7 @@ index e40194e..f2bd02e 100644
- "-instcombine-lower-dbg-declare=0",
- ]
-
-- if (target_os != "chromeos") {
+- if (!is_chromeos && default_toolchain != "//build/toolchain/cros:target") {
- # TODO(https://crbug.com/1049161): Remove '-DCLANG_SPAWN_CC1=ON' from build.py instead
- # once this change has marinated a bit.
- cflags += [ "-fintegrated-cc1" ]
@@ -47,7 +47,7 @@ index e40194e..f2bd02e 100644
# C11/C++11 compiler flags setup.
# ---------------------------
if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
-@@ -1452,6 +1430,12 @@ config("default_warnings") {
+@@ -1442,6 +1420,12 @@ config("default_warnings") {
cflags_cc += [ "-Wno-class-memaccess" ]
}
@@ -60,7 +60,7 @@ index e40194e..f2bd02e 100644
# -Wunused-local-typedefs is broken in gcc,
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872
cflags += [ "-Wno-unused-local-typedefs" ]
-@@ -1577,7 +1561,7 @@ config("chromium_code") {
+@@ -1572,7 +1556,7 @@ config("chromium_code") {
defines = [ "_HAS_NODISCARD" ]
}
} else {
@@ -69,7 +69,7 @@ index e40194e..f2bd02e 100644
if (treat_warnings_as_errors) {
cflags += [ "-Werror" ]
-@@ -1586,10 +1570,6 @@ config("chromium_code") {
+@@ -1581,10 +1565,6 @@ config("chromium_code") {
# well.
ldflags = [ "-Werror" ]
}
@@ -80,7 +80,7 @@ index e40194e..f2bd02e 100644
# In Chromium code, we define __STDC_foo_MACROS in order to get the
# C99 macros on Mac and Linux.
-@@ -1598,15 +1578,6 @@ config("chromium_code") {
+@@ -1593,15 +1573,6 @@ config("chromium_code") {
"__STDC_FORMAT_MACROS",
]
@@ -96,7 +96,7 @@ index e40194e..f2bd02e 100644
if (is_mac) {
cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -2010,7 +1981,8 @@ config("default_stack_frames") {
+@@ -1993,7 +1964,8 @@ config("default_stack_frames") {
}
# Default "optimization on" config.
@@ -104,19 +104,9 @@ index e40194e..f2bd02e 100644
+config("optimize") { }
+config("xoptimize") {
if (is_win) {
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772
- if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -2036,7 +2008,8 @@ config("optimize") {
- }
-
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
- if (is_win) {
- # Favor size over speed, /O1 must be before the common flags. The GYP
- # build also specifies /Os and /GF but these are implied by /O1.
-@@ -2059,7 +2032,8 @@ config("optimize_no_wpo") {
+ # Favor size over speed, /O1 must be before the common flags.
+ # /O1 implies /Os and /GF.
+@@ -2016,7 +1988,8 @@ config("optimize") {
}
# Turn off optimizations.
@@ -126,7 +116,7 @@ index e40194e..f2bd02e 100644
if (is_win) {
cflags = [
"/Od", # Disable optimization.
-@@ -2093,7 +2067,8 @@ config("no_optimize") {
+@@ -2050,7 +2023,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.
@@ -136,7 +126,7 @@ index e40194e..f2bd02e 100644
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2132,7 +2107,8 @@ config("optimize_max") {
+@@ -2089,7 +2063,8 @@ config("optimize_max") {
#
# TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer.
@@ -146,7 +136,7 @@ index e40194e..f2bd02e 100644
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2162,7 +2138,8 @@ config("optimize_speed") {
+@@ -2119,7 +2094,8 @@ config("optimize_speed") {
}
}
@@ -156,7 +146,7 @@ index e40194e..f2bd02e 100644
cflags = [ "-O1" ] + common_optimize_on_cflags
ldflags = common_optimize_on_ldflags
visibility = [ ":default_optimization" ]
-@@ -2278,7 +2255,8 @@ config("win_pdbaltpath") {
+@@ -2235,7 +2211,8 @@ config("win_pdbaltpath") {
}
# Full symbols.
@@ -166,7 +156,7 @@ index e40194e..f2bd02e 100644
if (is_win) {
if (use_goma || is_clang) {
# Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2388,7 +2366,8 @@ config("symbols") {
+@@ -2361,7 +2338,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.
@@ -176,7 +166,7 @@ index e40194e..f2bd02e 100644
if (is_win) {
# Functions, files, and line tables only.
cflags = []
-@@ -2443,7 +2422,8 @@ config("minimal_symbols") {
+@@ -2416,7 +2394,8 @@ config("minimal_symbols") {
}
# No symbols.
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2020-01-30 16:17 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2020-01-30 16:17 UTC (permalink / raw
To: gentoo-commits
commit: 9d20c3d6e0c13bbc530b60ba37ca821a408436ff
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Thu Jan 30 08:35:28 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 16:17:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d20c3d6
www-client/chromium: remove unused patch
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
www-client/chromium/files/chromium-81-gcc-dav1d.patch | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/www-client/chromium/files/chromium-81-gcc-dav1d.patch b/www-client/chromium/files/chromium-81-gcc-dav1d.patch
deleted file mode 100644
index 00586fd929c..00000000000
--- a/www-client/chromium/files/chromium-81-gcc-dav1d.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn
-index 63f12f8..f8f0b40 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -99,6 +99,7 @@ config("dav1d_config") {
- dav1d_copts = [
- "-D_FILE_OFFSET_BITS=64",
- "-D_POSIX_C_SOURCE=200112L",
-+ "-D_GNU_SOURCE",
- ]
-
- if (is_win) {
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2019-06-28 15:30 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2019-06-28 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 1cc6e650f4b09c32396fb33c6588dd2c09e53945
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Wed Jun 26 14:25:05 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 15:29:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc6e650
www-client/chromium: update angle inline patch
Closes: https://github.com/gentoo/gentoo/pull/12331
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../chromium/files/chromium-angle-inline.patch | 120 ++++++++++++++++++---
1 file changed, 106 insertions(+), 14 deletions(-)
diff --git a/www-client/chromium/files/chromium-angle-inline.patch b/www-client/chromium/files/chromium-angle-inline.patch
index 8ece410f104..e8975d74817 100644
--- a/www-client/chromium/files/chromium-angle-inline.patch
+++ b/www-client/chromium/files/chromium-angle-inline.patch
@@ -1,26 +1,118 @@
-From 2ee4e7f857514f4c0cbff135a1c5f968d8814d31 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sun, 23 Jun 2019 12:14:57 +0000
-Subject: [PATCH] explicit declaration of const GLfloat/const GLint for ValidateSamplerParameterBase
+From 4c0a23611b3906855db7b93da2f34aec57930cdf Mon Sep 17 00:00:00 2001
+From: Geoff Lang <geofflang@chromium.org>
+Date: Tue, 25 Jun 2019 10:56:29 -0400
+Subject: [PATCH] Update ValidateSamplerParameterBase to use const parameters.
+ValidateSamplerParameterBase is called with both const and non-const
+parameter pointers which caused our explicit template instantiations to
+not cover all cases resulting in link errors. Force the parameters to
+always be const so that our instantiations cover everything.
+
+BUG=angleproject:3555
+
+Change-Id: Ibf92572ba80a689c75dcdc70e5153d9941da76f3
+Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1676305
+Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
+Commit-Queue: Geoff Lang <geofflang@chromium.org>
---
- third_party/angle/src/libANGLE/validationES.cpp | 2 ++
- 1 file changed, 2 insertions(+)
diff --git a/third_party/angle/src/libANGLE/validationES.cpp b/third_party/angle/src/libANGLE/validationES.cpp
-index ae353f7..fdc7ac2 100644
+index 041803a..3f402f6 100644
--- a/third_party/angle/src/libANGLE/validationES.cpp
+++ b/third_party/angle/src/libANGLE/validationES.cpp
-@@ -6089,7 +6089,9 @@ bool ValidateSamplerParameterBase(Context *context,
+@@ -189,7 +189,9 @@
+ }
+
+ template <typename ParamType>
+-bool ValidateTextureWrapModeValue(Context *context, ParamType *params, bool restrictedWrapModes)
++bool ValidateTextureWrapModeValue(Context *context,
++ const ParamType *params,
++ bool restrictedWrapModes)
+ {
+ switch (ConvertToGLenum(params[0]))
+ {
+@@ -223,7 +225,9 @@
+ }
+
+ template <typename ParamType>
+-bool ValidateTextureMinFilterValue(Context *context, ParamType *params, bool restrictedMinFilter)
++bool ValidateTextureMinFilterValue(Context *context,
++ const ParamType *params,
++ bool restrictedMinFilter)
+ {
+ switch (ConvertToGLenum(params[0]))
+ {
+@@ -252,7 +256,7 @@
+ }
+
+ template <typename ParamType>
+-bool ValidateTextureMagFilterValue(Context *context, ParamType *params)
++bool ValidateTextureMagFilterValue(Context *context, const ParamType *params)
+ {
+ switch (ConvertToGLenum(params[0]))
+ {
+@@ -269,7 +273,7 @@
}
- template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLfloat *);
-+template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, const GLfloat *);
- template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLint *);
+ template <typename ParamType>
+-bool ValidateTextureCompareModeValue(Context *context, ParamType *params)
++bool ValidateTextureCompareModeValue(Context *context, const ParamType *params)
+ {
+ // Acceptable mode parameters from GLES 3.0.2 spec, table 3.17
+ switch (ConvertToGLenum(params[0]))
+@@ -287,7 +291,7 @@
+ }
+
+ template <typename ParamType>
+-bool ValidateTextureCompareFuncValue(Context *context, ParamType *params)
++bool ValidateTextureCompareFuncValue(Context *context, const ParamType *params)
+ {
+ // Acceptable function parameters from GLES 3.0.2 spec, table 3.17
+ switch (ConvertToGLenum(params[0]))
+@@ -311,7 +315,7 @@
+ }
+
+ template <typename ParamType>
+-bool ValidateTextureSRGBDecodeValue(Context *context, ParamType *params)
++bool ValidateTextureSRGBDecodeValue(Context *context, const ParamType *params)
+ {
+ if (!context->getExtensions().textureSRGBDecode)
+ {
+@@ -5996,7 +6000,7 @@
+ GLenum pname,
+ GLsizei bufSize,
+ bool vectorParams,
+- ParamType *params)
++ const ParamType *params)
+ {
+ if (context->getClientMajorVersion() < 3)
+ {
+@@ -6099,8 +6103,13 @@
+ return true;
+ }
+
+-template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLfloat *);
+-template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, GLint *);
++template bool ValidateSamplerParameterBase(Context *,
++ GLuint,
++ GLenum,
++ GLsizei,
++ bool,
++ const GLfloat *);
+template bool ValidateSamplerParameterBase(Context *, GLuint, GLenum, GLsizei, bool, const GLint *);
template bool ValidateSamplerParameterBase(Context *,
GLuint,
GLenum,
---
-2.21.0
-
+diff --git a/third_party/angle/src/libANGLE/validationES.h b/third_party/angle/src/libANGLE/validationES.h
+index c61bda6..4b06d28 100644
+--- a/third_party/angle/src/libANGLE/validationES.h
++++ b/third_party/angle/src/libANGLE/validationES.h
+@@ -584,7 +584,7 @@
+ GLenum pname,
+ GLsizei bufSize,
+ bool vectorParams,
+- ParamType *params);
++ const ParamType *params);
+
+ bool ValidateGetInternalFormativBase(Context *context,
+ GLenum target,
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2019-06-20 14:49 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2019-06-20 14:49 UTC (permalink / raw
To: gentoo-commits
commit: a41ee0718f84f926d9c585429b5a461f80fe912c
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Thu Jun 20 11:34:29 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 14:48:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a41ee071
www-client/chromium: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/12290
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../chromium/files/chromium-compiler-r8.patch | 169 ---------------------
www-client/chromium/files/quiche-00f47df.patch | 38 -----
2 files changed, 207 deletions(-)
diff --git a/www-client/chromium/files/chromium-compiler-r8.patch b/www-client/chromium/files/chromium-compiler-r8.patch
deleted file mode 100644
index 5d8bd0efecd..00000000000
--- a/www-client/chromium/files/chromium-compiler-r8.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From aff4a3a1c35dc37141a61d2c6b7e703a55f9b371 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 23 Mar 2019 12:12:37 -0400
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 55 ++++++++++++----------------------
- 1 file changed, 19 insertions(+), 36 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index ca6ff2b13809..b614709cd1db 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -240,8 +240,6 @@ config("compiler") {
-
- configs += [
- # See the definitions below.
-- ":clang_revision",
-- ":compiler_cpu_abi",
- ":compiler_codegen",
- ":compiler_deterministic",
- ]
-@@ -489,17 +487,6 @@ config("compiler") {
- }
- }
-
-- if (is_clang && !is_nacl && !use_xcode_clang) {
-- cflags += [
-- # TODO(hans): Remove this once Clang generates better optimized debug info
-- # by default. https://crbug.com/765793
-- "-Xclang",
-- "-mllvm",
-- "-Xclang",
-- "-instcombine-lower-dbg-declare=0",
-- ]
-- }
--
- # Print absolute paths in diagnostics. There is no precedent for doing this
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
-@@ -1540,7 +1527,7 @@ config("chromium_code") {
- defines = [ "_HAS_NODISCARD" ]
- }
- } else {
-- cflags = [ "-Wall" ]
-+ cflags = []
- if (treat_warnings_as_errors) {
- cflags += [ "-Werror" ]
-
-@@ -1549,10 +1536,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.
-@@ -1561,15 +1544,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") {
-- # 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" ]
-@@ -1949,7 +1923,8 @@ config("default_stack_frames") {
- }
-
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
- if (is_win) {
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772
- if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -1983,7 +1958,8 @@ config("optimize") {
- }
-
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
- if (is_win) {
- # Favor size over speed, /O1 must be before the common flags. The GYP
- # build also specifies /Os and /GF but these are implied by /O1.
-@@ -2006,7 +1982,8 @@ config("optimize_no_wpo") {
- }
-
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
- if (is_win) {
- cflags = [
- "/Od", # Disable optimization.
-@@ -2034,7 +2011,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:
-@@ -2081,7 +2059,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:
-@@ -2119,7 +2098,8 @@ config("optimize_speed") {
- }
- }
-
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
- cflags = [ "-O1" ] + common_optimize_on_cflags
- ldflags = common_optimize_on_ldflags
- visibility = [ ":default_optimization" ]
-@@ -2221,7 +2201,8 @@ config("win_pdbaltpath") {
- }
-
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
- if (is_win) {
- if (use_goma || is_clang) {
- # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2328,7 +2309,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) {
- # Linker symbols for backtraces only.
- cflags = []
-@@ -2380,7 +2362,8 @@ config("minimal_symbols") {
- }
-
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
- if (!is_win) {
- cflags = [ "-g0" ]
- asmflags = cflags
---
-2.21.0
-
diff --git a/www-client/chromium/files/quiche-00f47df.patch b/www-client/chromium/files/quiche-00f47df.patch
deleted file mode 100644
index 720edf934d3..00000000000
--- a/www-client/chromium/files/quiche-00f47df.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 00f47df999c9b19e80fdc01db0ae9ca1b6a12b3a Mon Sep 17 00:00:00 2001
-From: vasilvv <vasilvv@google.com>
-Date: Wed, 3 Apr 2019 13:58:53 -0700
-Subject: [PATCH] GCC: do not delete move constructor of QuicStreamSendBuffer
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QuicStreamSendBuffer constructor is implicitely required in the
-initialization of the vector of substreams in QuicCryptoStream.
-Though clang apparently ignores that, GCC fails to build.
-
-BUG=chromium:819294
-
-Originally submitted by José Dapena Paz <jose.dapena@lge.com> at https://quiche-review.googlesource.com/c/quiche/+/2420
-
-PiperOrigin-RevId: 241800134
-Change-Id: I4e3c97d6e5895d85340e8c1b740e6196d9104066
----
- quic/core/quic_stream_send_buffer.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/quic/core/quic_stream_send_buffer.h b/quic/core/quic_stream_send_buffer.h
-index e34514b..74e9d0d 100644
---- a/net/third_party/quic/core/quic_stream_send_buffer.h
-+++ b/net/third_party/quic/core/quic_stream_send_buffer.h
-@@ -62,7 +62,7 @@ class QUIC_EXPORT_PRIVATE QuicStreamSendBuffer {
- public:
- explicit QuicStreamSendBuffer(QuicBufferAllocator* allocator);
- QuicStreamSendBuffer(const QuicStreamSendBuffer& other) = delete;
-- QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = delete;
-+ QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = default;
- ~QuicStreamSendBuffer();
-
- // Save |data_length| of data starts at |iov_offset| in |iov| to send buffer.
---
-2.21.0
-
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2018-12-29 18:50 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2018-12-29 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 1939ce0754ff4d47b1dd37ae21dd7dbbb5a52f83
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 17:20:22 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 18:49:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1939ce07
www-client/chromium: cleanup widevine patch
Bug: https://bugs.gentoo.org/670928
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
www-client/chromium/files/chromium-widevine-r4.patch | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/www-client/chromium/files/chromium-widevine-r4.patch b/www-client/chromium/files/chromium-widevine-r4.patch
index 5f912a675a2..d5a3be8345a 100644
--- a/www-client/chromium/files/chromium-widevine-r4.patch
+++ b/www-client/chromium/files/chromium-widevine-r4.patch
@@ -1,8 +1,11 @@
Define WIDEVINE_CDM_VERSION_STRING && re-re-re-patch for latest ninja
---
-diff -urpN a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
---- a/chrome/common/chrome_content_client.cc 2018-12-19 13:48:52.000000000 -0800
-+++ b/chrome/common/chrome_content_client.cc 2018-12-25 20:24:51.062139147 -0800
+
+Stolen from Arch basically.
+
+gmt
+
+--- a/chrome/common/chrome_content_client.cc
++++ b/chrome/common/chrome_content_client.cc
@@ -99,7 +99,7 @@
// Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
// bundled and not a component. When the Widevine CDM is a component, it is
@@ -12,9 +15,8 @@ diff -urpN a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_conte
#define REGISTER_BUNDLED_WIDEVINE_CDM
#include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
// TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support
-diff -urpN a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h
---- a/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-19 13:49:55.000000000 -0800
-+++ b/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-25 20:30:09.290141783 -0800
+--- a/third_party/widevine/cdm/widevine_cdm_version.h
++++ b/third_party/widevine/cdm/widevine_cdm_version.h
@@ -11,5 +11,6 @@
// If the Widevine CDM is available define the following:
// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2018-11-05 3:30 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2018-11-05 3:30 UTC (permalink / raw
To: gentoo-commits
commit: 6c14e1728eaab2fcc6dd3d7f1c33debb44d0c8c2
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 5 03:30:43 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov 5 03:30:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c14e172
www-client/chromium: remove unused patches
Package-Manager: Portage-2.3.51_p9, Repoman-2.3.12
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
www-client/chromium/files/chromium-ceil-r0.patch | 59 --------
.../chromium/files/chromium-compiler-r5.patch | 167 ---------------------
.../chromium/files/chromium-ffmpeg-ebp-r1.patch | 18 ---
3 files changed, 244 deletions(-)
diff --git a/www-client/chromium/files/chromium-ceil-r0.patch b/www-client/chromium/files/chromium-ceil-r0.patch
deleted file mode 100644
index 9e7f2a7392e..00000000000
--- a/www-client/chromium/files/chromium-ceil-r0.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From cc843eb64f6599d9ede176f711fe6355015c30b1 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Mon, 8 Oct 2018 22:33:38 +0000
-Subject: [PATCH] PictureLayerImpl: Use ceil() instead of ceilf()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-ceilf() is only formally mentioned in C++17, even though previous versions
-of the standard say <cmath> should have the same contents as C's math.h.
-
-libstdc++ does not ship ceilf() in its cmath, but the ceil(float) overload
-that _is_ in the standard is available everywhere, so use that instead.
-
-This fixes the build with libstdc++ after 77b67445ba ("Elements with fixed
-bottom and top stick to top"):
-
- ../../cc/layers/picture_layer_impl.cc: In member function ‘void cc::PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace()’:
- ../../cc/layers/picture_layer_impl.cc:738:16: error: ‘ceilf’ is not a member of ‘std’
- std::ceilf(-total_controls_height * hidden_ratio)); // bottom
- ^~~~~
- ../../cc/layers/picture_layer_impl.cc:738:16: note: suggested alternative: ‘ceil’
- std::ceilf(-total_controls_height * hidden_ratio)); // bottom
- ^~~~~
- ceil
-
-Bug: 819294
-Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
-Change-Id: Ida69eb3127ca132e7090c9aad0dd17dc314b6992
-Reviewed-on: https://chromium-review.googlesource.com/c/1264537
-Commit-Queue: David Bokan <bokan@chromium.org>
-Reviewed-by: David Bokan <bokan@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#597709}
----
- cc/layers/picture_layer_impl.cc | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
-index 937255884a6e..020bcee55201 100644
---- a/cc/layers/picture_layer_impl.cc
-+++ b/cc/layers/picture_layer_impl.cc
-@@ -727,10 +727,10 @@ void PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace() {
- 1.f - layer_tree_impl()->CurrentBrowserControlsShownRatio();
-
- viewport_rect_for_tile_priority_in_content_space_.Inset(
-- 0, // left
-- 0, // top,
-- 0, // right,
-- std::ceilf(-total_controls_height * hidden_ratio)); // bottom
-+ 0, // left
-+ 0, // top,
-+ 0, // right,
-+ std::ceil(-total_controls_height * hidden_ratio)); // bottom
- }
- }
- }
---
-2.19.1
-
diff --git a/www-client/chromium/files/chromium-compiler-r5.patch b/www-client/chromium/files/chromium-compiler-r5.patch
deleted file mode 100644
index 6d6b980b168..00000000000
--- a/www-client/chromium/files/chromium-compiler-r5.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 07fa6b9176dfd1acd4eb6706323ab4823f530432 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 25 Apr 2018 13:22:49 -0400
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 60 ++++++++++------------------------
- 1 file changed, 18 insertions(+), 42 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 0e796978d479..fa77c2476e4e 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -235,8 +235,6 @@ config("compiler") {
-
- configs += [
- # See the definitions below.
-- ":clang_revision",
-- ":compiler_cpu_abi",
- ":compiler_codegen",
- ]
-
-@@ -501,17 +499,6 @@ config("compiler") {
- }
- }
-
-- if (is_clang && !is_nacl && !use_xcode_clang) {
-- cflags += [
-- # TODO(hans): Remove this once Clang generates better optimized debug info
-- # by default. https://crbug.com/765793
-- "-Xclang",
-- "-mllvm",
-- "-Xclang",
-- "-instcombine-lower-dbg-declare=0",
-- ]
-- }
--
- # Print absolute paths in diagnostics. There is no precedent for doing this
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
-@@ -1510,10 +1497,6 @@ config("default_warnings") {
- cflags += [
- # TODO(thakis): https://crbug.com/753973
- "-Wno-enum-compare-switch",
--
-- # Ignore warnings about MSVC optimization pragmas.
-- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
-- "-Wno-ignored-pragma-optimize",
- ]
- }
- }
-@@ -1555,22 +1538,6 @@ config("chromium_code") {
- "__STDC_FORMAT_MACROS",
- ]
-
-- if (!is_debug && !using_sanitizer &&
-- (!is_linux || !is_clang || is_official_build) &&
-- current_cpu != "s390x" && current_cpu != "s390" &&
-- current_cpu != "ppc64" && current_cpu != "ppc64" &&
-- current_cpu != "mips" && current_cpu != "mips64") {
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see
-- # http://llvm.org/bugs/show_bug.cgi?id=16821.
-- # It seems to work fine with Ubuntu 12 headers though, so use it in
-- # official builds.
-- #
-- # 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" ]
-@@ -1940,7 +1907,8 @@ config("default_stack_frames") {
- }
-
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
- if (is_win) {
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772
- if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -1974,7 +1942,8 @@ config("optimize") {
- }
-
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
- if (is_win) {
- # Favor size over speed, /O1 must be before the common flags. The GYP
- # build also specifies /Os and /GF but these are implied by /O1.
-@@ -1997,7 +1966,8 @@ config("optimize_no_wpo") {
- }
-
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
- if (is_win) {
- cflags = [
- "/Od", # Disable optimization.
-@@ -2021,7 +1991,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:
-@@ -2068,7 +2039,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:
-@@ -2106,7 +2078,8 @@ config("optimize_speed") {
- }
- }
-
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
- cflags = [ "-O1" ] + common_optimize_on_cflags
- ldflags = common_optimize_on_ldflags
- visibility = [ ":default_optimization" ]
-@@ -2192,7 +2165,8 @@ config("afdo") {
- # configs += [ "//build/config/compiler:symbols" ]
-
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
- if (is_win) {
- if (use_goma || is_clang) {
- # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2290,7 +2264,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) {
- # Linker symbols for backtraces only.
- cflags = []
-@@ -2330,7 +2305,8 @@ config("minimal_symbols") {
- }
-
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
- if (!is_win) {
- cflags = [ "-g0" ]
- asmflags = cflags
---
-2.19.0
-
diff --git a/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch b/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch
deleted file mode 100644
index 20ded611e0a..00000000000
--- a/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.chromium.org/p/chromium/issues/detail?id=796379
-https://bugs.gentoo.org/656902
-
---- a/third_party/ffmpeg/BUILD.gn
-+++ b/third_party/ffmpeg/BUILD.gn
-@@ -239,11 +239,7 @@
- # Windows builds can't compile without EBP because we can't omit frame
- # pointers like we do on posix.
- if (target_cpu == "x86") {
-- if (using_sanitizer || is_win) {
-- defines += [ "HAVE_EBP_AVAILABLE=0" ]
-- } else {
-- defines += [ "HAVE_EBP_AVAILABLE=1" ]
-- }
-+ defines += [ "HAVE_EBP_AVAILABLE=0" ]
- }
-
- if (is_posix || is_fuchsia) {
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2018-09-30 21:28 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2018-09-30 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 69f59621a66e0141cb6321ecbccc1d94fc24c8d8
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 21:27:55 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 21:28:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f59621
www-client/chromium: remove unused patches
Package-Manager: Portage-2.3.50_p10, Repoman-2.3.11_p17
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../chromium/files/chromium-compiler-r2.patch | 168 ---------------------
.../chromium/files/chromium-cors-string-r0.patch | 51 -------
www-client/chromium/files/chromium-ffmpeg-r1.patch | 22 ---
.../chromium/files/chromium-libjpeg-r0.patch | 62 --------
.../chromium/files/chromium-libwebp-shim-r0.patch | 43 ------
5 files changed, 346 deletions(-)
diff --git a/www-client/chromium/files/chromium-compiler-r2.patch b/www-client/chromium/files/chromium-compiler-r2.patch
deleted file mode 100644
index 3ac2eb81f4c..00000000000
--- a/www-client/chromium/files/chromium-compiler-r2.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 4310db462fab74bf14066f2a6f7cf250ecba0cf1 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 25 Apr 2018 13:22:49 -0400
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 61 ++++++++++------------------------
- 1 file changed, 18 insertions(+), 43 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 83337d52e4b9..f2c192fc31ca 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -228,8 +228,6 @@ config("compiler") {
-
- configs += [
- # See the definitions below.
-- ":clang_revision",
-- ":compiler_cpu_abi",
- ":compiler_codegen",
- ]
-
-@@ -488,18 +486,6 @@ config("compiler") {
- }
- }
-
-- if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
-- target_os != "chromeos") {
-- cflags += [
-- # TODO(hans): Remove this once Clang generates better optimized debug info
-- # by default. https://crbug.com/765793
-- "-Xclang",
-- "-mllvm",
-- "-Xclang",
-- "-instcombine-lower-dbg-declare=0",
-- ]
-- }
--
- # Print absolute paths in diagnostics. There is no precedent for doing this
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
-@@ -1415,10 +1401,6 @@ config("default_warnings") {
-
- # TODO(hans): https://crbug.com/766891
- "-Wno-null-pointer-arithmetic",
--
-- # Ignore warnings about MSVC optimization pragmas.
-- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
-- "-Wno-ignored-pragma-optimize",
- ]
- } else if (use_xcode_clang) {
- cflags += [
-@@ -1462,22 +1444,6 @@ config("chromium_code") {
- "__STDC_FORMAT_MACROS",
- ]
-
-- if (!is_debug && !using_sanitizer &&
-- (!is_linux || !is_clang || is_official_build) &&
-- current_cpu != "s390x" && current_cpu != "s390" &&
-- current_cpu != "ppc64" && current_cpu != "ppc64" &&
-- current_cpu != "mips" && current_cpu != "mips64") {
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see
-- # http://llvm.org/bugs/show_bug.cgi?id=16821.
-- # It seems to work fine with Ubuntu 12 headers though, so use it in
-- # official builds.
-- #
-- # 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 || is_ios) {
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -1807,7 +1773,8 @@ config("default_stack_frames") {
- }
-
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
- if (is_win) {
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772
- if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -1841,7 +1808,8 @@ config("optimize") {
- }
-
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
- if (is_win) {
- # Favor size over speed, /O1 must be before the common flags. The GYP
- # build also specifies /Os and /GF but these are implied by /O1.
-@@ -1864,7 +1832,8 @@ config("optimize_no_wpo") {
- }
-
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
- if (is_win) {
- cflags = [
- "/Od", # Disable optimization.
-@@ -1888,7 +1857,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:
-@@ -1935,7 +1905,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:
-@@ -1973,7 +1944,8 @@ config("optimize_speed") {
- }
- }
-
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
- cflags = [ "-O1" ] + common_optimize_on_cflags
- ldflags = common_optimize_on_ldflags
- visibility = [ ":default_optimization" ]
-@@ -2057,7 +2029,8 @@ config("afdo") {
- # configs += [ "//build/config/compiler:symbols" ]
-
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
- if (is_win) {
- if (use_goma || is_clang) {
- # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2155,7 +2128,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) {
- # Linker symbols for backtraces only.
- cflags = []
-@@ -2186,7 +2160,8 @@ config("minimal_symbols") {
- }
-
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
- if (!is_win) {
- cflags = [ "-g0" ]
- asmflags = cflags
---
-2.17.0
-
diff --git a/www-client/chromium/files/chromium-cors-string-r0.patch b/www-client/chromium/files/chromium-cors-string-r0.patch
deleted file mode 100644
index b724cd44df7..00000000000
--- a/www-client/chromium/files/chromium-cors-string-r0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Thu, 31 May 2018 17:03:37 +0000
-Subject: [PATCH] CORS legacy: add missing string include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The cors_legacy.h file includes declarations using std::string, but
-it is not declared due to missing #include <string>.
-
-Also drop unneeded declarations in .cpp file.
-
-Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd
-Reviewed-on: https://chromium-review.googlesource.com/1080707
-Reviewed-by: Tom Sepez <tsepez@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#563282}
----
- services/network/public/cpp/cors/cors_legacy.cc | 2 --
- services/network/public/cpp/cors/cors_legacy.h | 1 +
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc
-index 8f32ac3be64e..f01af63619b5 100644
---- a/services/network/public/cpp/cors/cors_legacy.cc
-+++ b/services/network/public/cpp/cors/cors_legacy.cc
-@@ -5,8 +5,6 @@
- #include "services/network/public/cpp/cors/cors_legacy.h"
-
- #include <algorithm>
--#include <string>
--#include <vector>
-
- #include "url/gurl.h"
- #include "url/url_util.h"
-diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h
-index d2cdf026ca3a..dc9295a92c47 100644
---- a/services/network/public/cpp/cors/cors_legacy.h
-+++ b/services/network/public/cpp/cors/cors_legacy.h
-@@ -5,6 +5,7 @@
- #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
- #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
-
-+#include <string>
- #include <vector>
-
- #include "base/component_export.h"
---
-2.17.1
-
diff --git a/www-client/chromium/files/chromium-ffmpeg-r1.patch b/www-client/chromium/files/chromium-ffmpeg-r1.patch
deleted file mode 100644
index 53d61e8f38b..00000000000
--- a/www-client/chromium/files/chromium-ffmpeg-r1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/build/linux/unbundle/ffmpeg.gn
-+++ b/build/linux/unbundle/ffmpeg.gn
-@@ -14,8 +14,8 @@ pkg_config("system_ffmpeg") {
- ]
- }
-
--buildflag_header("ffmpeg_buildflags") {
-- header = "ffmpeg_buildflags.h"
-+buildflag_header("ffmpeg_features") {
-+ header = "ffmpeg_features.h"
- flags = [ "USE_SYSTEM_FFMPEG=true" ]
- }
-
-@@ -30,7 +30,7 @@ shim_headers("ffmpeg_shim") {
-
- source_set("ffmpeg") {
- deps = [
-- ":ffmpeg_buildflags",
-+ ":ffmpeg_features",
- ":ffmpeg_shim",
- ]
- public_configs = [ ":system_ffmpeg" ]
diff --git a/www-client/chromium/files/chromium-libjpeg-r0.patch b/www-client/chromium/files/chromium-libjpeg-r0.patch
deleted file mode 100644
index 5354281cace..00000000000
--- a/www-client/chromium/files/chromium-libjpeg-r0.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001
-From: Daniel Bratell <bratell@opera.com>
-Date: Mon, 28 May 2018 13:13:01 +0000
-Subject: [PATCH] Use the same libjpeg in all of blink/platform
-
-The normal libjpeg renames some symbols with macros so if its
-headers are included together with libjpeg-turbo's headers
-in the same translation unit, there will be an inconsistent
-renaming of libjpeg symbols. This happened in some extreme
-jumbo configuration and resulted in confising linker errors.
-
-This patch changes an include so that jpeglib.h becomes included
-the same way everywhere.
-
-Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e
-Reviewed-on: https://chromium-review.googlesource.com/1073423
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: Daniel Bratell <bratell@opera.com>
-Cr-Commit-Position: refs/heads/master@{#562243}
----
- .../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++
- .../renderer/platform/image-encoders/image_encoder.h | 2 --
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
-index 0c7f14c7c0e4..4c450f5d6783 100644
---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
-+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
-@@ -4,6 +4,17 @@
-
- #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
-
-+#include "build/build_config.h"
-+
-+#if defined(OS_WIN)
-+#include <basetsd.h> // Included before jpeglib.h because of INT32 clash
-+#endif // OS_WIN
-+#include <stdio.h> // Needed by jpeglib.h
-+
-+#include "jpeglib.h" // for JPEG_MAX_DIMENSION
-+
-+#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
-+
- namespace blink {
-
- bool ImageEncoder::Encode(Vector<unsigned char>* dst,
-diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-index 0d1460f34827..40306097d507 100644
---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-@@ -7,8 +7,6 @@
-
- #include "third_party/blink/renderer/platform/platform_export.h"
- #include "third_party/blink/renderer/platform/wtf/vector.h"
--#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION
--#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
- #include "third_party/skia/include/core/SkStream.h"
- #include "third_party/skia/include/encode/SkJpegEncoder.h"
- #include "third_party/skia/include/encode/SkPngEncoder.h"
---
-2.17.1
-
diff --git a/www-client/chromium/files/chromium-libwebp-shim-r0.patch b/www-client/chromium/files/chromium-libwebp-shim-r0.patch
deleted file mode 100644
index cb387a4a003..00000000000
--- a/www-client/chromium/files/chromium-libwebp-shim-r0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn
-index ab92adecf400..12574d87be58 100644
---- a/build/linux/unbundle/libwebp.gn
-+++ b/build/linux/unbundle/libwebp.gn
-@@ -2,12 +2,34 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("system_libwebp") {
-+ packages = [
-+ "libwebp",
-+ "libwebpdemux",
-+ "libwebpmux",
-+ ]
-+}
-+
-+shim_headers("libwebp_shim") {
-+ root_path = "src"
-+ headers = [
-+ "webp/decode.h",
-+ "webp/demux.h",
-+ "webp/encode.h",
-+ "webp/mux.h",
-+ "webp/mux_types.h",
-+ "webp/types.h",
-+ ]
-+}
-+
- source_set("libwebp_webp") {
-- libs = [
-- "webp",
-- "webpdemux",
-- "webpmux",
-+ deps = [
-+ ":libwebp_shim",
- ]
-+ public_configs = [ ":system_libwebp" ]
- }
-
- group("libwebp") {
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2018-08-08 16:00 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2018-08-08 16:00 UTC (permalink / raw
To: gentoo-commits
commit: e73ea9c7673f8f4af1083f3f212286bb0b459046
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug 7 19:42:54 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Aug 8 15:59:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73ea9c7
www-client/chromium: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/9497
.../chromium/files/chromium-compiler-r0.patch | 168 -------------------
.../chromium/files/chromium-compiler-r3.patch | 182 ---------------------
.../files/chromium-disable_xml_catalogs.patch | 23 ---
.../chromium/files/chromium-ffmpeg-clang.patch | 21 ---
.../chromium/files/chromium-ffmpeg-ebp-r0.patch | 18 --
5 files changed, 412 deletions(-)
diff --git a/www-client/chromium/files/chromium-compiler-r0.patch b/www-client/chromium/files/chromium-compiler-r0.patch
deleted file mode 100644
index 3c528e5e71a..00000000000
--- a/www-client/chromium/files/chromium-compiler-r0.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 71924291b586feaa7045fe0ad7874116e3d1de80 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 25 Apr 2018 13:22:49 -0400
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 61 ++++++++++------------------------
- 1 file changed, 18 insertions(+), 43 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 461e62da2d50..964d41e9c971 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -222,8 +222,6 @@ config("compiler") {
-
- configs += [
- # See the definitions below.
-- ":clang_revision",
-- ":compiler_cpu_abi",
- ":compiler_codegen",
- ]
-
-@@ -464,18 +462,6 @@ config("compiler") {
- cflags += [ "-fcolor-diagnostics" ]
- }
-
-- # TODO(hans): Remove this once Clang generates better optimized debug info by
-- # default. https://crbug.com/765793
-- if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
-- target_os != "chromeos") {
-- cflags += [
-- "-Xclang",
-- "-mllvm",
-- "-Xclang",
-- "-instcombine-lower-dbg-declare=0",
-- ]
-- }
--
- # Print absolute paths in diagnostics. There is no precedent for doing this
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
-@@ -1387,10 +1373,6 @@ config("default_warnings") {
-
- # TODO(hans): https://crbug.com/766891
- "-Wno-null-pointer-arithmetic",
--
-- # Ignore warnings about MSVC optimization pragmas.
-- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
-- "-Wno-ignored-pragma-optimize",
- ]
- if (llvm_force_head_revision) {
- cflags += [
-@@ -1440,22 +1422,6 @@ config("chromium_code") {
- "__STDC_FORMAT_MACROS",
- ]
-
-- if (!is_debug && !using_sanitizer &&
-- (!is_linux || !is_clang || is_official_build) &&
-- current_cpu != "s390x" && current_cpu != "s390" &&
-- current_cpu != "ppc64" && current_cpu != "ppc64" &&
-- current_cpu != "mips" && current_cpu != "mips64") {
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see
-- # http://llvm.org/bugs/show_bug.cgi?id=16821.
-- # It seems to work fine with Ubuntu 12 headers though, so use it in
-- # official builds.
-- #
-- # 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 || is_ios) {
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -1786,7 +1752,8 @@ config("default_stack_frames") {
- }
-
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
- if (is_win) {
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772
- if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -1820,7 +1787,8 @@ config("optimize") {
- }
-
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
- if (is_win) {
- # Favor size over speed, /O1 must be before the common flags. The GYP
- # build also specifies /Os and /GF but these are implied by /O1.
-@@ -1843,7 +1811,8 @@ config("optimize_no_wpo") {
- }
-
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
- if (is_win) {
- cflags = [
- "/Od", # Disable optimization.
-@@ -1867,7 +1836,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:
-@@ -1914,7 +1884,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:
-@@ -1952,7 +1923,8 @@ config("optimize_speed") {
- }
- }
-
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
- cflags = [ "-O1" ] + common_optimize_on_cflags
- ldflags = common_optimize_on_ldflags
- visibility = [ ":default_optimization" ]
-@@ -2034,7 +2006,8 @@ config("afdo") {
- # configs += [ "//build/config/compiler:symbols" ]
-
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
- if (is_win) {
- if (use_goma || is_clang) {
- # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2126,7 +2099,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) {
- # Linker symbols for backtraces only.
- cflags = []
-@@ -2157,7 +2131,8 @@ config("minimal_symbols") {
- }
-
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
- if (!is_win) {
- cflags = [ "-g0" ]
- asmflags = cflags
---
-2.17.0
-
diff --git a/www-client/chromium/files/chromium-compiler-r3.patch b/www-client/chromium/files/chromium-compiler-r3.patch
deleted file mode 100644
index ca41add408e..00000000000
--- a/www-client/chromium/files/chromium-compiler-r3.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From cba2fccce163bc549db529c5d6783478de908325 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 25 Apr 2018 13:22:49 -0400
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 68 +++++++++-------------------------
- 1 file changed, 18 insertions(+), 50 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 2d82ed5b4e23..23632b156900 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -225,8 +225,6 @@ config("compiler") {
-
- configs += [
- # See the definitions below.
-- ":clang_revision",
-- ":compiler_cpu_abi",
- ":compiler_codegen",
- ]
-
-@@ -488,18 +486,6 @@ config("compiler") {
- }
- }
-
-- if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
-- target_os != "chromeos") {
-- cflags += [
-- # TODO(hans): Remove this once Clang generates better optimized debug info
-- # by default. https://crbug.com/765793
-- "-Xclang",
-- "-mllvm",
-- "-Xclang",
-- "-instcombine-lower-dbg-declare=0",
-- ]
-- }
--
- # Print absolute paths in diagnostics. There is no precedent for doing this
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
-@@ -672,13 +658,6 @@ config("compiler") {
- ldflags += [ "-Wl,--no-rosegment" ]
- }
-
-- # This flag enforces that member pointer base types are complete. It helps
-- # prevent us from running into problems in the Microsoft C++ ABI (see
-- # https://crbug.com/847724).
-- if (is_clang && !is_nacl && target_os != "chromeos" && !use_xcode_clang) {
-- cflags += [ "-fcomplete-member-pointers" ]
-- }
--
- # Pass the same C/C++ flags to the objective C/C++ compiler.
- cflags_objc += cflags_c
- cflags_objcc += cflags_cc
-@@ -1467,10 +1446,6 @@ config("default_warnings") {
- cflags += [
- # TODO(thakis): https://crbug.com/753973
- "-Wno-enum-compare-switch",
--
-- # Ignore warnings about MSVC optimization pragmas.
-- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
-- "-Wno-ignored-pragma-optimize",
- ]
- }
- }
-@@ -1512,22 +1487,6 @@ config("chromium_code") {
- "__STDC_FORMAT_MACROS",
- ]
-
-- if (!is_debug && !using_sanitizer &&
-- (!is_linux || !is_clang || is_official_build) &&
-- current_cpu != "s390x" && current_cpu != "s390" &&
-- current_cpu != "ppc64" && current_cpu != "ppc64" &&
-- current_cpu != "mips" && current_cpu != "mips64") {
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see
-- # http://llvm.org/bugs/show_bug.cgi?id=16821.
-- # It seems to work fine with Ubuntu 12 headers though, so use it in
-- # official builds.
-- #
-- # 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 || is_ios) {
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -1857,7 +1816,8 @@ config("default_stack_frames") {
- }
-
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
- if (is_win) {
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772
- if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -1891,7 +1851,8 @@ config("optimize") {
- }
-
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
- if (is_win) {
- # Favor size over speed, /O1 must be before the common flags. The GYP
- # build also specifies /Os and /GF but these are implied by /O1.
-@@ -1914,7 +1875,8 @@ config("optimize_no_wpo") {
- }
-
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
- if (is_win) {
- cflags = [
- "/Od", # Disable optimization.
-@@ -1938,7 +1900,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:
-@@ -1985,7 +1948,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:
-@@ -2023,7 +1987,8 @@ config("optimize_speed") {
- }
- }
-
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
- cflags = [ "-O1" ] + common_optimize_on_cflags
- ldflags = common_optimize_on_ldflags
- visibility = [ ":default_optimization" ]
-@@ -2109,7 +2074,8 @@ config("afdo") {
- # configs += [ "//build/config/compiler:symbols" ]
-
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
- if (is_win) {
- if (use_goma || is_clang) {
- # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2207,7 +2173,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) {
- # Linker symbols for backtraces only.
- cflags = []
-@@ -2238,7 +2205,8 @@ config("minimal_symbols") {
- }
-
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
- if (!is_win) {
- cflags = [ "-g0" ]
- asmflags = cflags
---
-2.18.0.rc2
-
diff --git a/www-client/chromium/files/chromium-disable_xml_catalogs.patch b/www-client/chromium/files/chromium-disable_xml_catalogs.patch
deleted file mode 100644
index 9f57ed2261c..00000000000
--- a/www-client/chromium/files/chromium-disable_xml_catalogs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-+++ b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-@@ -28,6 +28,10 @@
-
- #include <libxml/parser.h>
- #include <libxml/parserInternals.h>
-+#include <libxml/xmlversion.h>
-+#if defined(LIBXML_CATALOG_ENABLED)
-+#include <libxml/catalog.h>
-+#endif
- #include <libxslt/xslt.h>
-
- #include <memory>
-@@ -648,6 +652,9 @@ static void InitializeLibXMLIfNecessary() {
- if (did_init)
- return;
-
-+#if defined(LIBXML_CATALOG_ENABLED)
-+ xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
-+#endif
- xmlInitParser();
- xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
- xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);
diff --git a/www-client/chromium/files/chromium-ffmpeg-clang.patch b/www-client/chromium/files/chromium-ffmpeg-clang.patch
deleted file mode 100644
index 6c5ac71323b..00000000000
--- a/www-client/chromium/files/chromium-ffmpeg-clang.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-@@ -639,18 +639,8 @@
- if 'win' not in target_os:
- configure_flags['Common'].extend([
- '--enable-pic',
-- '--cc=clang',
-- '--cxx=clang++',
-- '--ld=clang',
- ])
-
-- # Clang Linux will use the first 'ld' it finds on the path, which will
-- # typically be the system one, so explicitly configure use of Clang's
-- # ld.lld, to ensure that things like cross-compilation and LTO work.
-- # This does not work for arm64, ia32 and is always used on mac.
-- if target_arch not in ['arm64', 'ia32', 'mipsel'] and target_os != 'mac':
-- configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld')
--
- # Should be run on Mac.
- if target_os == 'mac':
- if host_os != 'mac':
diff --git a/www-client/chromium/files/chromium-ffmpeg-ebp-r0.patch b/www-client/chromium/files/chromium-ffmpeg-ebp-r0.patch
deleted file mode 100644
index cca5b84d702..00000000000
--- a/www-client/chromium/files/chromium-ffmpeg-ebp-r0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.chromium.org/p/chromium/issues/detail?id=796379
-https://bugs.gentoo.org/656902
-
---- a/third_party/ffmpeg/BUILD.gn
-+++ b/third_party/ffmpeg/BUILD.gn
-@@ -247,11 +247,7 @@
- # On POSIX x86, sanitizers will fail to compiler the H264 CABAC code due to
- # insufficient registers unless we disable EBP usage. crbug.com/786760
- if (target_cpu == "x86") {
-- if (using_sanitizer) {
-- defines += [ "HAVE_EBP_AVAILABLE=0" ]
-- } else {
-- defines += [ "HAVE_EBP_AVAILABLE=1" ]
-- }
-+ defines += [ "HAVE_EBP_AVAILABLE=0" ]
- }
-
- if (!is_clang) {
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2018-07-23 20:40 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2018-07-23 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 5c1deba75fe24d4a774903185b2ba551a6aef7b4
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 20:40:14 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 20:40:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1deba7
www-client/chromium: fix patch headers
www-client/chromium/files/chromium-ffmpeg-ebp-r0.patch | 2 +-
www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-client/chromium/files/chromium-ffmpeg-ebp-r0.patch b/www-client/chromium/files/chromium-ffmpeg-ebp-r0.patch
index e7161c6d110..cca5b84d702 100644
--- a/www-client/chromium/files/chromium-ffmpeg-ebp-r0.patch
+++ b/www-client/chromium/files/chromium-ffmpeg-ebp-r0.patch
@@ -2,7 +2,7 @@ https://bugs.chromium.org/p/chromium/issues/detail?id=796379
https://bugs.gentoo.org/656902
--- a/third_party/ffmpeg/BUILD.gn
---- b/third_party/ffmpeg/BUILD.gn
++++ b/third_party/ffmpeg/BUILD.gn
@@ -247,11 +247,7 @@
# On POSIX x86, sanitizers will fail to compiler the H264 CABAC code due to
# insufficient registers unless we disable EBP usage. crbug.com/786760
diff --git a/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch b/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch
index 5e0f151514f..20ded611e0a 100644
--- a/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch
+++ b/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch
@@ -2,7 +2,7 @@ https://bugs.chromium.org/p/chromium/issues/detail?id=796379
https://bugs.gentoo.org/656902
--- a/third_party/ffmpeg/BUILD.gn
---- b/third_party/ffmpeg/BUILD.gn
++++ b/third_party/ffmpeg/BUILD.gn
@@ -239,11 +239,7 @@
# Windows builds can't compile without EBP because we can't omit frame
# pointers like we do on posix.
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2018-06-20 21:46 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2018-06-20 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 007b95a88ae9fb283ac8855e885f619671718f0e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 15:33:19 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 21:46:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=007b95a8
www-client/chromium: update patch
.../chromium/files/chromium-disable_xml_catalogs.patch | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/www-client/chromium/files/chromium-disable_xml_catalogs.patch b/www-client/chromium/files/chromium-disable_xml_catalogs.patch
index 7aff36c782a..9f57ed2261c 100644
--- a/www-client/chromium/files/chromium-disable_xml_catalogs.patch
+++ b/www-client/chromium/files/chromium-disable_xml_catalogs.patch
@@ -11,18 +11,7 @@
#include <libxslt/xslt.h>
#include <memory>
-@@ -538,10 +542,6 @@
- static bool ShouldAllowExternalLoad(const KURL& url) {
- String url_string = url.GetString();
-
-- // libxml should not be configured with catalogs enabled, so it
-- // should not be asking to load default catalogs.
-- CHECK(!IsLibxmlDefaultCatalogFile(url));
--
- // The most common DTD. There isn't much point in hammering www.w3c.org by
- // requesting this URL for every XHTML document.
- if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml"))
-@@ -648,6 +648,9 @@
+@@ -648,6 +652,9 @@ static void InitializeLibXMLIfNecessary() {
if (did_init)
return;
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2018-03-13 21:20 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2018-03-13 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 599be358f257098e7ba29196f6fce498b0a8d208
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Mar 13 12:53:36 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 21:19:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599be358
www-client/chromium: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/7444
www-client/chromium/files/chromium-angle-r0.patch | 89 ----------------------
www-client/chromium/files/chromium-cups-r0.patch | 45 -----------
www-client/chromium/files/chromium-ffmpeg-r0.patch | 21 -----
3 files changed, 155 deletions(-)
diff --git a/www-client/chromium/files/chromium-angle-r0.patch b/www-client/chromium/files/chromium-angle-r0.patch
deleted file mode 100644
index 462b8ae4443..00000000000
--- a/www-client/chromium/files/chromium-angle-r0.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001
-From: Kai Ninomiya <kainino@chromium.org>
-Date: Wed, 06 Dec 2017 14:06:53 -0800
-Subject: [PATCH] Mark StaticType related functions as constexpr
-
-Fixes compilation on some versions of GCC and probably Clang.
-
-Follow-up to http://crrev.com/c/786317
-
-Bug: angleproject:1432
-Change-Id: I3fc3ad0f65492f9543eb27fcdce6ca29a9ad06e5
-Reviewed-on: https://chromium-review.googlesource.com/812220
-Reviewed-by: Jamie Madill <jmadill@chromium.org>
-Commit-Queue: Kai Ninomiya <kainino@chromium.org>
----
-
-diff --git a/third_party/angle/src/compiler/translator/StaticType.h b/third_party/angle/src/compiler/translator/StaticType.h
-index e26e5ff..30b391a 100644
---- a/third_party/angle/src/compiler/translator/StaticType.h
-+++ b/third_party/angle/src/compiler/translator/StaticType.h
-@@ -160,7 +160,7 @@
- TPrecision precision,
- TQualifier qualifier,
- unsigned char secondarySize>
--const TType *GetForVecMatHelper(unsigned char primarySize)
-+constexpr const TType *GetForVecMatHelper(unsigned char primarySize)
- {
- static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
- basicType == EbtBool,
-@@ -186,7 +186,7 @@
- template <TBasicType basicType,
- TPrecision precision = EbpUndefined,
- TQualifier qualifier = EvqGlobal>
--const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
-+constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
- {
- static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
- basicType == EbtBool,
-@@ -208,7 +208,7 @@
- }
-
- template <TBasicType basicType, TPrecision precision = EbpUndefined>
--const TType *GetForVec(TQualifier qualifier, unsigned char size)
-+constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)
- {
- switch (qualifier)
- {
-diff --git a/third_party/angle/src/compiler/translator/SymbolTable.cpp b/third_party/angle/src/compiler/translator/SymbolTable.cpp
-index adf1e4e..90d4c15 100644
---- a/third_party/angle/src/compiler/translator/SymbolTable.cpp
-+++ b/third_party/angle/src/compiler/translator/SymbolTable.cpp
-@@ -236,7 +236,7 @@
- pop();
- }
-
--bool IsGenType(const TType *type)
-+constexpr bool IsGenType(const TType *type)
- {
- if (type)
- {
-@@ -248,7 +248,7 @@
- return false;
- }
-
--bool IsVecType(const TType *type)
-+constexpr bool IsVecType(const TType *type)
- {
- if (type)
- {
-diff --git a/third_party/angle/src/compiler/translator/Types.h b/third_party/angle/src/compiler/translator/Types.h
-index 04f46f1..a54d447 100644
---- a/third_party/angle/src/compiler/translator/Types.h
-+++ b/third_party/angle/src/compiler/translator/Types.h
-@@ -142,13 +142,13 @@
- {
- }
-
-- TBasicType getBasicType() const { return type; }
-+ constexpr TBasicType getBasicType() const { return type; }
- void setBasicType(TBasicType t);
-
- TPrecision getPrecision() const { return precision; }
- void setPrecision(TPrecision p) { precision = p; }
-
-- TQualifier getQualifier() const { return qualifier; }
-+ constexpr TQualifier getQualifier() const { return qualifier; }
- void setQualifier(TQualifier q) { qualifier = q; }
-
- bool isInvariant() const { return invariant; }
diff --git a/www-client/chromium/files/chromium-cups-r0.patch b/www-client/chromium/files/chromium-cups-r0.patch
deleted file mode 100644
index 88ea78a81eb..00000000000
--- a/www-client/chromium/files/chromium-cups-r0.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3cf91d8d674a496d533aa106723a632b68ab26ba Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Tue, 12 Dec 2017 23:31:56 +0000
-Subject: [PATCH] Fix use_cups=false build
-
-BUG=793801
-R=thestig@chromium.org
-
-Change-Id: I60ee6ec48d2686d0b42ca25311a9b76009ce9768
-Reviewed-on: https://chromium-review.googlesource.com/823245
-Reviewed-by: Lei Zhang <thestig@chromium.org>
-Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#523602}
----
- chrome/service/cloud_print/print_system.cc | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/chrome/service/cloud_print/print_system.cc b/chrome/service/cloud_print/print_system.cc
-index ac94c804f9..4ceba96919 100644
---- a/chrome/service/cloud_print/print_system.cc
-+++ b/chrome/service/cloud_print/print_system.cc
-@@ -5,6 +5,7 @@
- #include "chrome/service/cloud_print/print_system.h"
-
- #include "base/guid.h"
-+#include "build/build_config.h"
-
- namespace cloud_print {
-
-@@ -35,5 +36,11 @@ std::string PrintSystem::GenerateProxyId() {
- return base::GenerateGUID();
- }
-
--} // namespace cloud_print
-+#if defined(OS_LINUX) && !defined(USE_CUPS)
-+scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
-+ const base::DictionaryValue*) {
-+ return nullptr;
-+}
-+#endif
-
-+} // namespace cloud_print
---
-2.15.1
-
diff --git a/www-client/chromium/files/chromium-ffmpeg-r0.patch b/www-client/chromium/files/chromium-ffmpeg-r0.patch
deleted file mode 100644
index 40632235bab..00000000000
--- a/www-client/chromium/files/chromium-ffmpeg-r0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-@@ -632,18 +632,8 @@
- if 'win' not in target_os:
- configure_flags['Common'].extend([
- '--enable-pic',
-- '--cc=clang',
-- '--cxx=clang++',
-- '--ld=clang',
- ])
-
-- # Clang Linux will use the first 'ld' it finds on the path, which will
-- # typically be the system one, so explicitly configure use of Clang's
-- # ld.lld, to ensure that things like cross-compilation and LTO work.
-- # This does not work for arm64, ia32 and is always used on mac.
-- if target_arch not in ['arm64', 'ia32'] and target_os != 'mac':
-- configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld')
--
- # Should be run on Mac.
- if target_os == 'mac':
- if host_os != 'mac':
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2018-03-02 15:01 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2018-03-02 15:01 UTC (permalink / raw
To: gentoo-commits
commit: ed1600475e8bcde7b0fe01bcdb621a5e6c8ba049
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Mar 1 20:04:04 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 15:01:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed160047
www-client/chromium: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/7329
www-client/chromium/files/chromium-gcc-r0.patch | 55 ----------
www-client/chromium/files/chromium-gcc-u2f.patch | 45 --------
www-client/chromium/files/chromium-vulkan-r0.patch | 120 ---------------------
3 files changed, 220 deletions(-)
diff --git a/www-client/chromium/files/chromium-gcc-r0.patch b/www-client/chromium/files/chromium-gcc-r0.patch
deleted file mode 100644
index b0aaae8de55..00000000000
--- a/www-client/chromium/files/chromium-gcc-r0.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 353219b1d808a8980af93eff5412ec2863557e35 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Wed, 10 Jan 2018 15:34:25 +0000
-Subject: [PATCH] GCC fixes: avoid symbol collision between Element::ComputedAccessibleNode and ComputedAccessibleNode.
-
-GCC at least fails to compile if the method has the same name of the class. To avoid
-this we rename the getter method to be prefixed with Get.
-
-Change-Id: I7f7ac2ecf0947718f72e78ccef019c3239c9b921
-Reviewed-on: https://chromium-review.googlesource.com/857716
-Reviewed-by: Daniel Cheng <dcheng@chromium.org>
-Reviewed-by: Hayato Ito <hayato@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#528322}
----
-
-diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
-index 4f50b7d..d0fa7b1 100644
---- a/third_party/WebKit/Source/core/dom/Element.cpp
-+++ b/third_party/WebKit/Source/core/dom/Element.cpp
-@@ -1276,7 +1276,7 @@
- return rare_data.EnsureAccessibleNode(this);
- }
-
--ComputedAccessibleNode* Element::ComputedAccessibleNode() {
-+ComputedAccessibleNode* Element::GetComputedAccessibleNode() {
- if (!RuntimeEnabledFeatures::AccessibilityObjectModelEnabled())
- return nullptr;
-
-diff --git a/third_party/WebKit/Source/core/dom/Element.h b/third_party/WebKit/Source/core/dom/Element.h
-index 733596b..986e31a 100644
---- a/third_party/WebKit/Source/core/dom/Element.h
-+++ b/third_party/WebKit/Source/core/dom/Element.h
-@@ -295,7 +295,7 @@
- AccessibleNode* ExistingAccessibleNode() const;
- AccessibleNode* accessibleNode();
-
-- ComputedAccessibleNode* ComputedAccessibleNode();
-+ ComputedAccessibleNode* GetComputedAccessibleNode();
-
- void DidMoveToNewDocument(Document&) override;
-
-diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
-index 642f55f..f6a8d8e 100644
---- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
-+++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
-@@ -1110,7 +1110,7 @@
- Element* element) {
- DCHECK(element);
- ComputedAccessibleNode* computed_accessible_node =
-- element->ComputedAccessibleNode();
-+ element->GetComputedAccessibleNode();
- return computed_accessible_node->ComputePromiseProperty(script_state);
- }
-
diff --git a/www-client/chromium/files/chromium-gcc-u2f.patch b/www-client/chromium/files/chromium-gcc-u2f.patch
deleted file mode 100644
index 20608da58d0..00000000000
--- a/www-client/chromium/files/chromium-gcc-u2f.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ee7f5ecc3b869660ded9882a9904cc7c6db7dc0d Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Tue, 19 Dec 2017 19:25:00 +0000
-Subject: [PATCH] GCC build: workaround GCC bad "this" handling on lambda by
- not using lambda.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a workaround for the bug in GCC "Inconsistent `this->`
-required when calling member function in a lambda
-capturing `this` through another function"
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67274
-
-This fix just replaces the foreach call using lambda with a
-regular C++ for-each-like for (:) construct in u2f discovery.
-
-Change-Id: I9ddf212a7687e02cd7d2d2b43cf76e21dd5dada2
-Reviewed-on: https://chromium-review.googlesource.com/833886
-Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#525104}
----
- device/u2f/u2f_hid_discovery.cc | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/device/u2f/u2f_hid_discovery.cc b/device/u2f/u2f_hid_discovery.cc
-index 0695778d2aab..6c4e71179ce7 100644
---- a/device/u2f/u2f_hid_discovery.cc
-+++ b/device/u2f/u2f_hid_discovery.cc
-@@ -55,9 +55,8 @@ void U2fHidDiscovery::DeviceRemoved(
-
- void U2fHidDiscovery::OnGetDevices(
- std::vector<device::mojom::HidDeviceInfoPtr> device_infos) {
-- std::for_each(
-- device_infos.begin(), device_infos.end(),
-- [this](auto& device_info) { DeviceAdded(std::move(device_info)); });
-+ for (auto& device_info : device_infos)
-+ DeviceAdded(std::move(device_info));
- NotifyDiscoveryStarted(true);
- }
-
---
-2.15.1
-
diff --git a/www-client/chromium/files/chromium-vulkan-r0.patch b/www-client/chromium/files/chromium-vulkan-r0.patch
deleted file mode 100644
index 4553bb76667..00000000000
--- a/www-client/chromium/files/chromium-vulkan-r0.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 949b4f07fd1ef5b208136fe38327c28c95f18928 Mon Sep 17 00:00:00 2001
-From: Jamie Madill <jmadill@chromium.org>
-Date: Mon, 08 Jan 2018 11:15:38 -0500
-Subject: [PATCH] Vulkan: Allow for no .git directory in build.
-
-The SPIRV-Tools 'external revision generate' script is coded such that
-it assumes a .git folder is present. This causes a problem for the
-tarball build. We can fix this by using the same tooling we use for
-ANGLE's commit id script to check if the .git directory is present
-before running the generator. If it is missing, we insert a hard-coded
-dummy header. Also use the 'DEPS' file as a placeholder for .git/HEAD
-to check if the current revision needs updating.
-
-Bug: chromium:799620
-Bug: angleproject:2237
-Change-Id: Icea8e9c66f1600df7dca2aaa45fe449f687f5b55
-Reviewed-on: https://chromium-review.googlesource.com/854255
-Reviewed-by: Jamie Madill <jmadill@chromium.org>
-Commit-Queue: Jamie Madill <jmadill@chromium.org>
----
-
-diff --git a/third_party/angle/src/commit_id.py b/third_party/angle/src/commit_id.py
-index bbdb810..57651a5 100644
---- a/third_party/angle/src/commit_id.py
-+++ b/third_party/angle/src/commit_id.py
-@@ -23,6 +23,9 @@
- print("0")
- sys.exit(0)
-
-+if len(sys.argv) < 4 or operation != 'gen':
-+ sys.exit(usage)
-+
- output_file = sys.argv[3]
- commit_id_size = 12
-
-diff --git a/third_party/angle/src/vulkan_support/BUILD.gn b/third_party/angle/src/vulkan_support/BUILD.gn
-index fe61826..24f5a3a 100644
---- a/third_party/angle/src/vulkan_support/BUILD.gn
-+++ b/third_party/angle/src/vulkan_support/BUILD.gn
-@@ -145,21 +145,40 @@
- }
- }
-
--# This could be generalized to a foreach if other revisions are added.
--action("spirv_tools_external_revision_generate") {
-- script = "$vulkan_layers_dir/scripts/external_revision_generator.py"
-- inputs = [
-- "$spirv_tools_dir/.git/HEAD",
-- "$spirv_tools_dir/.git/index",
-- ]
-- outputs = [
-- "$vulkan_gen_dir/spirv_tools_commit_id.h",
-- ]
-- args = [
-- "$raw_spirv_tools_dir",
-- "SPIRV_TOOLS_COMMIT_ID",
-- "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
-- ]
-+spirv_git_is_present = exec_script("$angle_root/src/commit_id.py",
-+ [
-+ "check",
-+ raw_spirv_tools_dir,
-+ ],
-+ "value")
-+
-+spirv_use_commit_id = spirv_git_is_present == 1
-+
-+if (spirv_use_commit_id) {
-+ # This could be generalized to a foreach if other revisions are added.
-+ action("spirv_tools_external_revision_generate") {
-+ script = "$vulkan_layers_dir/scripts/external_revision_generator.py"
-+ inputs = [
-+ "$angle_root/DEPS",
-+ ]
-+ outputs = [
-+ "$vulkan_gen_dir/spirv_tools_commit_id.h",
-+ ]
-+ args = [
-+ "$raw_spirv_tools_dir",
-+ "SPIRV_TOOLS_COMMIT_ID",
-+ "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
-+ ]
-+ }
-+} else {
-+ copy("spirv_tools_external_revision_generate") {
-+ sources = [
-+ "dummy_spirv_tools_commit_id.h",
-+ ]
-+ outputs = [
-+ "$vulkan_gen_dir/spirv_tools_commit_id.h",
-+ ]
-+ }
- }
-
- config("vulkan_generate_helper_files_config") {
-@@ -864,7 +883,7 @@
- sources += [ "$vulkan_layers_dir/layers/VkLayer_$name.def" ]
- }
- if (is_linux) {
-- ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ]
-+ ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ]
- }
- }
- }
-diff --git a/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h
-new file mode 100644
-index 0000000..e1793bd
---- /dev/null
-+++ b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h
-@@ -0,0 +1,10 @@
-+//
-+// Copyright 2018 The ANGLE Project Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+//
-+// This file is a dummy file to enable building SPIRV tools when git is absent.
-+
-+#pragma once
-+
-+#define SPIRV_TOOLS_COMMIT_ID "0000000000000000000000000000000000000000"
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2018-02-18 22:40 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2018-02-18 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 28b1a2b3ae019a1267b233d3ef559d2081d8858b
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Feb 15 18:21:46 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 22:40:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28b1a2b3
www-client/chromium: remove unused patches
www-client/chromium/files/chromium-clang-r1.patch | 21 -----
www-client/chromium/files/chromium-gcc5-r4.patch | 98 -----------------------
www-client/chromium/files/chromium-gcc5-r5.patch | 11 ---
3 files changed, 130 deletions(-)
diff --git a/www-client/chromium/files/chromium-clang-r1.patch b/www-client/chromium/files/chromium-clang-r1.patch
deleted file mode 100644
index 0fef167566a..00000000000
--- a/www-client/chromium/files/chromium-clang-r1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/build/config/compiler/BUILD.gn.orig 2017-10-04 08:50:15.014675936 +0000
-+++ b/build/config/compiler/BUILD.gn 2017-10-04 08:50:32.831024327 +0000
-@@ -429,18 +429,6 @@
- cflags += [ "-fcolor-diagnostics" ]
- }
-
-- # TODO(hans): Remove this once Clang generates better optimized debug info by
-- # default. https://crbug.com/765793
-- if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
-- target_os != "chromeos") {
-- cflags += [
-- "-Xclang",
-- "-mllvm",
-- "-Xclang",
-- "-instcombine-lower-dbg-declare=1",
-- ]
-- }
--
- # Print absolute paths in diagnostics. There is no precedent for doing this
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
diff --git a/www-client/chromium/files/chromium-gcc5-r4.patch b/www-client/chromium/files/chromium-gcc5-r4.patch
deleted file mode 100644
index cb978d58a06..00000000000
--- a/www-client/chromium/files/chromium-gcc5-r4.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
- allocation_length_(0),
- data_(data),
- data_length_(0),
-- kind_(AllocationKind::kNormal),
-+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
- deleter_(deleter) {}
- DataHandle(void* allocation_base,
- size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
- reinterpret_cast<uintptr_t>(allocation_base_) +
- allocation_length_);
- switch (kind_) {
-- case AllocationKind::kNormal:
-+ case WTF::ArrayBufferContents::AllocationKind::kNormal:
- DCHECK(deleter_);
- deleter_(data_);
- return;
-- case AllocationKind::kReservation:
-+ case WTF::ArrayBufferContents::AllocationKind::kReservation:
- ReleaseReservedMemory(allocation_base_, allocation_length_);
- return;
- }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
-
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
-
--#include <math.h>
-+#include <cmath>
- #include <numeric>
- #include <vector>
-
---- a/gpu/ipc/common/mailbox_struct_traits.h
-+++ b/gpu/ipc/common/mailbox_struct_traits.h
-@@ -15,7 +15,7 @@ namespace mojo {
- template <>
- struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
- static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
-- return mailbox.name;
-+ return base::make_span(mailbox.name);
- }
- static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
- };
---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> {
- static base::span<const float> matrix(const cc::FilterOperation& operation) {
- if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
- return base::span<const float>();
-- return operation.matrix();
-+ return base::make_span(operation.matrix());
- }
-
- static base::span<const gfx::Rect> shape(
---- a/services/viz/public/cpp/compositing/quads_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
-@@ -303,7 +303,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> {
- static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
- const viz::TextureDrawQuad* quad =
- viz::TextureDrawQuad::MaterialCast(&input);
-- return quad->vertex_opacity;
-+ return base::make_span(quad->vertex_opacity);
- }
-
- static bool y_flipped(const viz::DrawQuad& input) {
---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
-@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
-@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
diff --git a/www-client/chromium/files/chromium-gcc5-r5.patch b/www-client/chromium/files/chromium-gcc5-r5.patch
deleted file mode 100644
index a07b973d8c0..00000000000
--- a/www-client/chromium/files/chromium-gcc5-r5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/third_party/WebKit/public/web/WebFrameClient.h
-+++ b/third_party/WebKit/public/web/WebFrameClient.h
-@@ -507,7 +507,7 @@
- // Returns string to be used as a frame id in the devtools protocol.
- // It is derived from the content's devtools_frame_token, is
- // defined by the browser and passed into Blink upon frame creation.
-- virtual WebString GetInstrumentationToken() { return ""; }
-+ virtual WebString GetInstrumentationToken() { return WebString(); }
-
- // PlzNavigate
- // Called to abort a navigation that is being handled by the browser process.
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2017-12-31 17:09 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2017-12-31 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 95e019aacab7437b05ddf5a50991d66a88c10f97
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Dec 26 07:26:16 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 17:09:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95e019aa
www-client/chromium: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/6639
.../chromium/files/chromium-gn-bootstrap-r22.patch | 10 -------
.../chromium/files/chromium-math-includes-r0.patch | 31 ----------------------
2 files changed, 41 deletions(-)
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r22.patch b/www-client/chromium/files/chromium-gn-bootstrap-r22.patch
deleted file mode 100644
index 5723281cc7d..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r22.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -481,6 +481,7 @@
- 'base/metrics/sample_vector.cc',
- 'base/metrics/sparse_histogram.cc',
- 'base/metrics/statistics_recorder.cc',
-+ 'base/observer_list_threadsafe.cc',
- 'base/path_service.cc',
- 'base/pending_task.cc',
- 'base/pickle.cc',
diff --git a/www-client/chromium/files/chromium-math-includes-r0.patch b/www-client/chromium/files/chromium-math-includes-r0.patch
deleted file mode 100644
index 4d2cd324c2a..00000000000
--- a/www-client/chromium/files/chromium-math-includes-r0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c6cb5c835e12ffa75e26eaefeef631d125c4e04d Mon Sep 17 00:00:00 2001
-From: Philippe Hamel <hamelphi@chromium.org>
-Date: Wed, 1 Nov 2017 18:41:59 +0000
-Subject: [PATCH] Fix GenericLogisticRegressionInference includes.
-
-Bug: 759161
-Change-Id: I199c7604eb38fc5a1b8107710eeaa27f8e71b299
-Reviewed-on: https://chromium-review.googlesource.com/743690
-Commit-Queue: Philippe Hamel <hamelphi@chromium.org>
-Reviewed-by: Roger McFarlane <rogerm@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#513195}
----
- .../machine_intelligence/generic_logistic_regression_inference.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/components/machine_intelligence/generic_logistic_regression_inference.cc b/components/machine_intelligence/generic_logistic_regression_inference.cc
-index cf6420b85113..d085f6d1f537 100644
---- a/components/machine_intelligence/generic_logistic_regression_inference.cc
-+++ b/components/machine_intelligence/generic_logistic_regression_inference.cc
-@@ -4,6 +4,8 @@
-
- #include "components/machine_intelligence/generic_logistic_regression_inference.h"
-
-+#include <cmath>
-+
- #include "base/logging.h"
- #include "components/machine_intelligence/ranker_example_util.h"
-
---
-2.15.0
-
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2017-12-12 18:17 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2017-12-12 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 3288299f42e05335ebeb5250eec375c2452d6769
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Dec 12 16:35:01 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 18:17:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3288299f
www-client/chromium: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/6533
www-client/chromium/files/chromium-gcc5-r3.patch | 98 ---------
.../chromium/files/chromium-glibc2.26-r1.patch | 220 ---------------------
.../chromium/files/chromium-gn-bootstrap-r17.patch | 68 -------
3 files changed, 386 deletions(-)
diff --git a/www-client/chromium/files/chromium-gcc5-r3.patch b/www-client/chromium/files/chromium-gcc5-r3.patch
deleted file mode 100644
index 7605df6b145..00000000000
--- a/www-client/chromium/files/chromium-gcc5-r3.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
- allocation_length_(0),
- data_(data),
- data_length_(0),
-- kind_(AllocationKind::kNormal),
-+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
- deleter_(deleter) {}
- DataHandle(void* allocation_base,
- size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
- reinterpret_cast<uintptr_t>(allocation_base_) +
- allocation_length_);
- switch (kind_) {
-- case AllocationKind::kNormal:
-+ case WTF::ArrayBufferContents::AllocationKind::kNormal:
- DCHECK(deleter_);
- deleter_(data_);
- return;
-- case AllocationKind::kReservation:
-+ case WTF::ArrayBufferContents::AllocationKind::kReservation:
- ReleaseReservedMemory(allocation_base_, allocation_length_);
- return;
- }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
-
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
-
--#include <math.h>
-+#include <cmath>
- #include <numeric>
- #include <vector>
-
---- a/gpu/ipc/common/mailbox_struct_traits.h
-+++ b/gpu/ipc/common/mailbox_struct_traits.h
-@@ -15,7 +15,7 @@ namespace mojo {
- template <>
- struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
- static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
-- return mailbox.name;
-+ return base::make_span(mailbox.name);
- }
- static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
- };
---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
-@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> {
- static base::span<const float> matrix(const cc::FilterOperation& operation) {
- if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
- return base::span<const float>();
-- return operation.matrix();
-+ return base::make_span(operation.matrix());
- }
-
- static base::span<const gfx::Rect> shape(
---- a/services/viz/public/cpp/compositing/quads_struct_traits.h
-+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
-@@ -284,7 +284,7 @@
-
- static base::span<const float> vertex_opacity(const cc::DrawQuad& input) {
- const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input);
-- return quad->vertex_opacity;
-+ return base::make_span(quad->vertex_opacity);
- }
-
- static bool y_flipped(const cc::DrawQuad& input) {
---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp
-@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
-@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
-@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,
- }
- default:
- NOTREACHED();
-- return "";
-+ return WebString();
- }
- }
-
diff --git a/www-client/chromium/files/chromium-glibc2.26-r1.patch b/www-client/chromium/files/chromium-glibc2.26-r1.patch
deleted file mode 100644
index ec37a2816d5..00000000000
--- a/www-client/chromium/files/chromium-glibc2.26-r1.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index c80724d..052ce37 100644
---- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -36,19 +36,19 @@ namespace google_breakpad {
-
- // Minidump defines register structures which are different from the raw
- // structures which we get from the kernel. These are platform specific
--// functions to juggle the ucontext and user structures into minidump format.
-+// functions to juggle the ucontext_t and user structures into minidump format.
-
- #if defined(__i386__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_ESP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_EIP];
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fp) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
-@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-
- #elif defined(__x86_64)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_RSP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_RIP];
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fpregs) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
-@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-
- #elif defined(__ARM_EABI__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.arm_sp;
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.arm_pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- out->context_flags = MD_CONTEXT_ARM_FULL;
-
- out->iregs[0] = uc->uc_mcontext.arm_r0;
-@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-
- #elif defined(__aarch64__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.sp;
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct fpsimd_context* fpregs) {
- out->context_flags = MD_CONTEXT_ARM64_FULL;
-
-@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-
- #elif defined(__mips__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- #if _MIPS_SIM == _ABI64
- out->context_flags = MD_CONTEXT_MIPS64_FULL;
- #elif _MIPS_SIM == _ABIO32
-diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-index b6e77b4..2de80b7 100644
---- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -39,23 +39,23 @@
-
- namespace google_breakpad {
-
--// Wraps platform-dependent implementations of accessors to ucontext structs.
-+// Wraps platform-dependent implementations of accessors to ucontext_t structs.
- struct UContextReader {
-- static uintptr_t GetStackPointer(const struct ucontext* uc);
-+ static uintptr_t GetStackPointer(const ucontext_t* uc);
-
-- static uintptr_t GetInstructionPointer(const struct ucontext* uc);
-+ static uintptr_t GetInstructionPointer(const ucontext_t* uc);
-
-- // Juggle a arch-specific ucontext into a minidump format
-+ // Juggle a arch-specific ucontext_t into a minidump format
- // out: the minidump structure
- // info: the collection of register structures.
- #if defined(__i386__) || defined(__x86_64)
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fp);
- #elif defined(__aarch64__)
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct fpsimd_context* fpregs);
- #else
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
- #endif
- };
-
-diff --git a/breakpad/src/client/linux/handler/exception_handler.cc b/breakpad/src/client/linux/handler/exception_handler.cc
-index 586d84e..05936d2 100644
---- a/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
- // Fill in all the holes in the struct to make Valgrind happy.
- memset(&g_crash_context_, 0, sizeof(g_crash_context_));
- memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
-- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
-+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
- #if defined(__aarch64__)
-- struct ucontext* uc_ptr = (struct ucontext*)uc;
-+ ucontext_t* uc_ptr = (ucontext_t*)uc;
- struct fpsimd_context* fp_ptr =
- (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
- if (fp_ptr->head.magic == FPSIMD_MAGIC) {
-@@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
- }
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
- // FP state is not part of user ABI on ARM Linux.
-- // In case of MIPS Linux FP state is already part of struct ucontext
-+ // In case of MIPS Linux FP state is already part of ucontext_t
- // and 'float_state' is not a member of CrashContext.
-- struct ucontext* uc_ptr = (struct ucontext*)uc;
-+ ucontext_t* uc_ptr = (ucontext_t*)uc;
- if (uc_ptr->uc_mcontext.fpregs) {
- memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
- sizeof(g_crash_context_.float_state));
-@@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
- // ExceptionHandler::HandleSignal().
- siginfo.si_code = SI_USER;
- siginfo.si_pid = getpid();
-- struct ucontext context;
-+ ucontext_t context;
- getcontext(&context);
- return HandleSignal(sig, &siginfo, &context);
- }
-diff --git a/breakpad/src/client/linux/handler/exception_handler.h b/breakpad/src/client/linux/handler/exception_handler.h
-index daba57e..25598a2 100644
---- a/breakpad/src/client/linux/handler/exception_handler.h
-+++ b/breakpad/src/client/linux/handler/exception_handler.h
-@@ -191,11 +191,11 @@ class ExceptionHandler {
- struct CrashContext {
- siginfo_t siginfo;
- pid_t tid; // the crashing thread.
-- struct ucontext context;
-+ ucontext_t context;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- // #ifdef this out because FP state is not part of user ABI for Linux ARM.
- // In case of MIPS Linux FP state is already part of struct
-- // ucontext so 'float_state' is not required.
-+ // ucontext_t so 'float_state' is not required.
- fpstate_t float_state;
- #endif
- };
-diff --git a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-index 3764eec..80ad5c4 100644
---- a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-+++ b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-@@ -593,7 +593,7 @@ class MicrodumpWriter {
-
- void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
-
-- const struct ucontext* const ucontext_;
-+ const ucontext_t* const ucontext_;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_;
- #endif
-diff --git a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-index d11ba6e..c716143 100644
---- a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-+++ b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-@@ -1323,7 +1323,7 @@ class MinidumpWriter {
- const int fd_; // File descriptor where the minidum should be written.
- const char* path_; // Path to the file where the minidum should be written.
-
-- const struct ucontext* const ucontext_; // also from the signal handler
-+ const ucontext_t* const ucontext_; // also from the signal handler
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_; // ditto
- #endif
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r17.patch b/www-client/chromium/files/chromium-gn-bootstrap-r17.patch
deleted file mode 100644
index 6cfd08d58c2..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r17.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options):
-
- write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
- {
-+ 'ENABLE_LOCATION_SOURCE': 'false',
- 'ENABLE_PROFILING': 'false',
- 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false'
- })
-@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options):
-
- write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
- root_gen_dir, options)
-- cmd = ['ninja', '-C', tempdir]
-+ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
- if options.verbose:
- cmd.append('-v')
-
-@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/metrics/bucket_ranges.cc',
- 'base/metrics/field_trial.cc',
- 'base/metrics/field_trial_param_associator.cc',
-+ 'base/metrics/field_trial_params.cc',
- 'base/metrics/histogram.cc',
- 'base/metrics/histogram_base.cc',
- 'base/metrics/histogram_functions.cc',
-@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/task_scheduler/scheduler_lock_impl.cc',
- 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
- 'base/task_scheduler/scheduler_worker.cc',
-+ 'base/task_scheduler/scheduler_worker_pool.cc',
- 'base/task_scheduler/scheduler_worker_pool_impl.cc',
- 'base/task_scheduler/scheduler_worker_pool_params.cc',
- 'base/task_scheduler/scheduler_worker_stack.cc',
-@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/third_party/icu/icu_utf.cc',
- 'base/third_party/nspr/prtime.cc',
- 'base/threading/post_task_and_reply_impl.cc',
-+ 'base/threading/scoped_blocking_call.cc',
- 'base/threading/sequence_local_storage_map.cc',
- 'base/threading/sequenced_task_runner_handle.cc',
- 'base/threading/sequenced_worker_pool.cc',
-@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/unguessable_token.cc',
- 'base/value_iterators.cc',
- 'base/values.cc',
-- 'base/value_iterators.cc',
- 'base/vlog.cc',
- ])
-
-@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- static_libraries['base']['sources'].extend([
- 'base/memory/shared_memory_handle_posix.cc',
- 'base/memory/shared_memory_posix.cc',
-- 'base/memory/shared_memory_tracker.cc',
- 'base/nix/xdg_util.cc',
- 'base/process/internal_linux.cc',
- 'base/process/memory_linux.cc',
-@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options):
- cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args]
- check_call(cmd)
-
-- cmd = ['ninja', '-C', build_dir]
-+ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err']
- if options.verbose:
- cmd.append('-v')
- cmd.append('gn')
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2017-12-09 23:27 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2017-12-09 23:27 UTC (permalink / raw
To: gentoo-commits
commit: 2ad380a2f626a999645137a233d989d4e6bc6a7e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 23:26:37 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 23:27:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad380a2
www-client/chromium: update memcpy patch
Package-Manager: Portage-2.3.17, Repoman-2.3.6_p24
www-client/chromium/files/chromium-memcpy-r0.patch | 26 +++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/www-client/chromium/files/chromium-memcpy-r0.patch b/www-client/chromium/files/chromium-memcpy-r0.patch
index 618a2e6e0dc..dd2fd57d26a 100644
--- a/www-client/chromium/files/chromium-memcpy-r0.patch
+++ b/www-client/chromium/files/chromium-memcpy-r0.patch
@@ -1,11 +1,35 @@
+From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 2001
+From: Tomas Popela <tomas.popela@gmail.com>
+Date: Thu, 7 Dec 2017 22:33:34 +0000
+Subject: [PATCH] memcpy used without including string.h
+
+Compiling Chromium with Clang 4.0.1 and using libstdc++ will fail on using
+memcpy without including string.h.
+
+Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
+Change-Id: Idced1d5de3baf6b520d4a2d61774120642ead1a8
+Reviewed-on: https://chromium-review.googlesource.com/813737
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Reviewed-by: vmpstr <vmpstr@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#522579}
+---
+ cc/paint/raw_memory_transfer_cache_entry.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cc/paint/raw_memory_transfer_cache_entry.cc b/cc/paint/raw_memory_transfer_cache_entry.cc
+index 9e4660c685ee..95ad50b1a338 100644
--- a/cc/paint/raw_memory_transfer_cache_entry.cc
+++ b/cc/paint/raw_memory_transfer_cache_entry.cc
@@ -4,6 +4,8 @@
#include "cc/paint/raw_memory_transfer_cache_entry.h"
-+#include <cstring>
++#include <string.h>
+
namespace cc {
ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(
+--
+2.15.1
+
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2017-11-17 19:38 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2017-11-17 19:38 UTC (permalink / raw
To: gentoo-commits
commit: e5c608fdfb37c9c8abb26b19afb15ea6d22aebc9
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 19:37:45 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 19:38:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c608fd
www-client/chromium: remove old patches
Package-Manager: Portage-2.3.14_p5, Repoman-2.3.6
.../chromium-64.0.3253.3-gpu_lists_version.h.patch | 11 ----
www-client/chromium/files/chromium-atk-r1.patch | 11 ----
www-client/chromium/files/chromium-gcc-r1.patch | 14 -----
www-client/chromium/files/chromium-gcc5-r1.patch | 66 ----------------------
.../chromium/files/chromium-gn-bootstrap-r14.patch | 27 ---------
.../chromium/files/chromium-gn-bootstrap-r20.patch | 18 ------
.../chromium/files/chromium-gn-bootstrap-r21.patch | 28 ---------
www-client/chromium/files/chromium-mojo-dep.patch | 54 ------------------
8 files changed, 229 deletions(-)
diff --git a/www-client/chromium/files/chromium-64.0.3253.3-gpu_lists_version.h.patch b/www-client/chromium/files/chromium-64.0.3253.3-gpu_lists_version.h.patch
deleted file mode 100644
index c961cb6eaf5..00000000000
--- a/www-client/chromium/files/chromium-64.0.3253.3-gpu_lists_version.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /dev/null
-+++ a/gpu/config/gpu_lists_version.h
-@@ -0,0 +1,8 @@
-+/* Generated by lastchange.py, do not edit.*/
-+
-+#ifndef GPU_CONFIG_GPU_LISTS_VERSION_H_
-+#define GPU_CONFIG_GPU_LISTS_VERSION_H_
-+
-+#define GPU_LISTS_VERSION "0a025c20792ce26a88112a00c936f463f190d394"
-+
-+#endif // GPU_CONFIG_GPU_LISTS_VERSION_H_
diff --git a/www-client/chromium/files/chromium-atk-r1.patch b/www-client/chromium/files/chromium-atk-r1.patch
deleted file mode 100644
index 32fa29975b3..00000000000
--- a/www-client/chromium/files/chromium-atk-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000
-+++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000
-@@ -571,7 +571,7 @@
- // it's best to leave this out rather than break people's builds:
- #if defined(ATK_CHECK_VERSION)
- #if ATK_CHECK_VERSION(2, 16, 0)
-- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY);
-+ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY);
- #endif
- #endif
- break;
diff --git a/www-client/chromium/files/chromium-gcc-r1.patch b/www-client/chromium/files/chromium-gcc-r1.patch
deleted file mode 100644
index 2acd11ed5b0..00000000000
--- a/www-client/chromium/files/chromium-gcc-r1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
-index 99f230ce7e9a..de2415d402f5 100644
---- a/base/numerics/safe_math_shared_impl.h
-+++ b/base/numerics/safe_math_shared_impl.h
-@@ -21,8 +21,7 @@
- #if !defined(__native_client__) && \
- ((defined(__clang__) && \
- ((__clang_major__ > 3) || \
-- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
-- (defined(__GNUC__) && __GNUC__ >= 5))
-+ (__clang_major__ == 3 && __clang_minor__ >= 4))))
- #include "base/numerics/safe_math_clang_gcc_impl.h"
- #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
- #else
diff --git a/www-client/chromium/files/chromium-gcc5-r1.patch b/www-client/chromium/files/chromium-gcc5-r1.patch
deleted file mode 100644
index ec3e3e66343..00000000000
--- a/www-client/chromium/files/chromium-gcc5-r1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/chrome/browser/devtools/devtools_file_system_indexer.cc
-+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc
-@@ -34,7 +34,6 @@ using base::TimeDelta;
- using base::TimeTicks;
- using content::BrowserThread;
- using std::map;
--using std::set;
- using std::string;
- using std::vector;
-
-@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const string& query) {
- if (trigram != kUndefinedTrigram)
- trigrams.push_back(trigram);
- }
-- set<FileId> file_ids;
-+ std::set<FileId> file_ids;
- bool first = true;
- vector<Trigram>::const_iterator it = trigrams.begin();
- for (; it != trigrams.end(); ++it) {
-@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const string& query) {
- first = false;
- continue;
- }
-- set<FileId> intersection = base::STLSetIntersection<set<FileId> >(
-+ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >(
- file_ids, index_[trigram]);
- file_ids.swap(intersection);
- }
-diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-index 94bb9161ec85..e40c6387f72e 100644
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
- allocation_length_(0),
- data_(data),
- data_length_(0),
-- kind_(AllocationKind::kNormal),
-+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
- deleter_(deleter) {}
- DataHandle(void* allocation_base,
- size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
- reinterpret_cast<uintptr_t>(allocation_base_) +
- allocation_length_);
- switch (kind_) {
-- case AllocationKind::kNormal:
-+ case WTF::ArrayBufferContents::AllocationKind::kNormal:
- DCHECK(deleter_);
- deleter_(data_);
- return;
-- case AllocationKind::kReservation:
-+ case WTF::ArrayBufferContents::AllocationKind::kReservation:
- ReleaseReservedMemory(allocation_base_, allocation_length_);
- return;
- }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
-
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
-
--#include <math.h>
-+#include <cmath>
- #include <numeric>
- #include <vector>
-
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r14.patch b/www-client/chromium/files/chromium-gn-bootstrap-r14.patch
deleted file mode 100644
index 3c44c858f78..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r14.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685
-Author: Pawel Hajdan, Jr <phajdan.jr@chromium.org>
-Date: Wed Jul 26 21:51:54 2017 +0000
-
- wip
-
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 1390560f8e37..ff2ae57c46b0 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/metrics/histogram_base.cc',
- 'base/metrics/histogram_functions.cc',
- 'base/metrics/histogram_samples.cc',
-+ 'base/metrics/histogram_snapshot_manager.cc',
- 'base/metrics/metrics_hashes.cc',
- 'base/metrics/persistent_histogram_allocator.cc',
- 'base/metrics/persistent_memory_allocator.cc',
-@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
- 'base/trace_event/heap_profiler_allocation_register.cc',
- 'base/trace_event/heap_profiler_event_filter.cc',
-- 'base/trace_event/heap_profiler_event_writer.cc',
-+ 'base/trace_event/heap_profiler_heap_dump_writer.cc',
- 'base/trace_event/heap_profiler_serialization_state.cc',
- 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
- 'base/trace_event/heap_profiler_type_name_deduplicator.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r20.patch b/www-client/chromium/files/chromium-gn-bootstrap-r20.patch
deleted file mode 100644
index 4b339e03545..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r20.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -546,6 +546,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/timer/timer.cc',
- 'base/trace_event/category_registry.cc',
- 'base/trace_event/event_name_filter.cc',
-+ 'base/trace_event/freed_object_tracker.cc',
- 'base/trace_event/heap_profiler_allocation_context.cc',
- 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
- 'base/trace_event/heap_profiler_allocation_register.cc',
-@@ -605,7 +606,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/strings/string16.cc',
- 'base/synchronization/condition_variable_posix.cc',
- 'base/synchronization/lock_impl_posix.cc',
-- 'base/synchronization/read_write_lock_posix.cc',
- 'base/sys_info_posix.cc',
- 'base/task_scheduler/task_tracker_posix.cc',
- 'base/threading/platform_thread_internal_posix.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r21.patch b/www-client/chromium/files/chromium-gn-bootstrap-r21.patch
deleted file mode 100644
index f3127af09ec..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r21.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 601d5331698e..f154ed2ef3e6 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -536,7 +536,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/threading/thread_local_storage.cc',
- 'base/threading/thread_restrictions.cc',
- 'base/threading/thread_task_runner_handle.cc',
-- 'base/threading/worker_pool.cc',
- 'base/time/clock.cc',
- 'base/time/default_clock.cc',
- 'base/time/default_tick_clock.cc',
-@@ -546,7 +545,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/timer/timer.cc',
- 'base/trace_event/category_registry.cc',
- 'base/trace_event/event_name_filter.cc',
-- 'base/trace_event/freed_object_tracker.cc',
- 'base/trace_event/heap_profiler_allocation_context.cc',
- 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
- 'base/trace_event/heap_profiler_allocation_register.cc',
-@@ -611,7 +609,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/threading/platform_thread_internal_posix.cc',
- 'base/threading/platform_thread_posix.cc',
- 'base/threading/thread_local_storage_posix.cc',
-- 'base/threading/worker_pool_posix.cc',
- 'base/time/time_conversion_posix.cc',
- 'base/trace_event/heap_profiler_allocation_register_posix.cc',
- ])
diff --git a/www-client/chromium/files/chromium-mojo-dep.patch b/www-client/chromium/files/chromium-mojo-dep.patch
deleted file mode 100644
index bf618540d17..00000000000
--- a/www-client/chromium/files/chromium-mojo-dep.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From f8e2c057ec6123b0a1d08294f41e78c427636b49 Mon Sep 17 00:00:00 2001
-From: Mike Bjorge <mbjorge@chromium.org>
-Date: Mon, 7 Aug 2017 18:41:58 +0000
-Subject: [PATCH] Add mojo_blink dep from WebKit loader/.
-
-Now that loader has a direct dependency on the generated mojom-blink
-headers (https://chromium-review.googlesource.com/c/577488), the loader/
-target should have a dep on the mojo target that generates the headers,
-otherwise the build may fail depending on build order.
-
-All the other platform/ targets that depend on the mojom-blink headers
-are directly included in the platform target, which has the necessary
-dependency already.
-
-Bug: 746197
-Bug: 750883
-Change-Id: Ife1429ec649605aae3f7920560cec37f3a218154
-Reviewed-on: https://chromium-review.googlesource.com/602869
-Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
-Reviewed-by: Matt Falkenhagen <falken@chromium.org>
-Commit-Queue: Mike Bjorge <mbjorge@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#492369}
----
- third_party/WebKit/Source/platform/loader/BUILD.gn | 1 +
- third_party/WebKit/public/BUILD.gn | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/third_party/WebKit/Source/platform/loader/BUILD.gn b/third_party/WebKit/Source/platform/loader/BUILD.gn
-index d483734b21cf..409befe884a8 100644
---- a/third_party/WebKit/Source/platform/loader/BUILD.gn
-+++ b/third_party/WebKit/Source/platform/loader/BUILD.gn
-@@ -99,6 +99,7 @@ source_set("loader") {
- "//components/link_header_util:link_header_util",
- "//mojo/public/cpp/system:system",
- "//storage/public/interfaces:interfaces_blink__generator",
-+ "//third_party/WebKit/public:mojo_bindings_blink",
- ]
-
- public_deps = [
-diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn
-index 84ee3ca9136d..cc847663efc6 100644
---- a/third_party/WebKit/public/BUILD.gn
-+++ b/third_party/WebKit/public/BUILD.gn
-@@ -755,6 +755,7 @@ mojom("mojo_bindings") {
- visibility_blink = [
- "//content/common:mojo_bindings_blink",
- "//third_party/WebKit/Source/platform",
-+ "//third_party/WebKit/Source/platform/loader",
- ]
- sources = [
- "platform/display_mode.mojom",
---
-2.14.0
-
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2017-10-31 17:15 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2017-10-31 17:15 UTC (permalink / raw
To: gentoo-commits
commit: 16b0d7b614894af50c9f990e51db6cb681e2f6c6
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Oct 19 17:40:43 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 17:14:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b0d7b6
www-client/chromium: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/5986
www-client/chromium/files/chromium-gcc5-r2.patch | 36 ----------------------
.../chromium/files/chromium-gn-bootstrap-r19.patch | 10 ------
.../chromium/files/chromium-sysroot-r1.patch | 14 ---------
3 files changed, 60 deletions(-)
diff --git a/www-client/chromium/files/chromium-gcc5-r2.patch b/www-client/chromium/files/chromium-gcc5-r2.patch
deleted file mode 100644
index f2be2d5b8ae..00000000000
--- a/www-client/chromium/files/chromium-gcc5-r2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
- allocation_length_(0),
- data_(data),
- data_length_(0),
-- kind_(AllocationKind::kNormal),
-+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
- deleter_(deleter) {}
- DataHandle(void* allocation_base,
- size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
- reinterpret_cast<uintptr_t>(allocation_base_) +
- allocation_length_);
- switch (kind_) {
-- case AllocationKind::kNormal:
-+ case WTF::ArrayBufferContents::AllocationKind::kNormal:
- DCHECK(deleter_);
- deleter_(data_);
- return;
-- case AllocationKind::kReservation:
-+ case WTF::ArrayBufferContents::AllocationKind::kReservation:
- ReleaseReservedMemory(allocation_base_, allocation_length_);
- return;
- }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
-
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
-
--#include <math.h>
-+#include <cmath>
- #include <numeric>
- #include <vector>
-
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r19.patch b/www-client/chromium/files/chromium-gn-bootstrap-r19.patch
deleted file mode 100644
index 999fdb7eda7..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r19.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -576,7 +576,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/trace_event/trace_log.cc',
- 'base/trace_event/trace_log_constants.cc',
- 'base/trace_event/tracing_agent.cc',
-- 'base/tracked_objects.cc',
- 'base/unguessable_token.cc',
- 'base/value_iterators.cc',
- 'base/values.cc',
diff --git a/www-client/chromium/files/chromium-sysroot-r1.patch b/www-client/chromium/files/chromium-sysroot-r1.patch
deleted file mode 100644
index b5ff0d8cba1..00000000000
--- a/www-client/chromium/files/chromium-sysroot-r1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/chrome/installer/BUILD.gn
-+++ b/chrome/installer/BUILD.gn
-@@ -3,9 +3,10 @@
- # found in the LICENSE file.
-
- import("//build/config/chrome_build.gni")
-+import("//build/config/sysroot.gni")
-
- declare_args() {
-- enable_linux_installer = is_linux && !is_component_build
-+ enable_linux_installer = is_linux && !is_component_build && use_sysroot
- }
-
- # Meta-target that forwards to the installer of the correct type (if any).
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2017-10-02 21:26 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2017-10-02 21:26 UTC (permalink / raw
To: gentoo-commits
commit: 644e800117e287881c134deb2732fe43c0532847
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 17:36:12 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct 2 21:26:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=644e8001
www-client/chromium: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/5833
.../files/chromium-FORTIFY_SOURCE-r1.patch | 29 ---
.../chromium/files/chromium-FORTIFY_SOURCE.patch | 27 ---
.../chromium/files/chromium-dma-buf-r1.patch | 21 --
.../chromium/files/chromium-gn-bootstrap-r15.patch | 11 -
.../chromium/files/chromium-gn-bootstrap-r16.patch | 11 -
.../chromium/files/chromium-gn-bootstrap-r18.patch | 19 --
.../chromium/files/chromium-gn-bootstrap-r8.patch | 13 --
.../chromium/files/chromium-major-minor.patch | 97 ---------
.../chromium/files/chromium-system-ffmpeg-r6.patch | 43 ----
.../chromium/files/chromium-system-icu-r1.patch | 224 ---------------------
.../chromium/files/chromium-system-icu-r2.patch | 10 -
.../chromium/files/chromium-system-zlib-r1.patch | 22 --
www-client/chromium/files/skia-avx2.patch | 15 --
13 files changed, 542 deletions(-)
diff --git a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch b/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch
deleted file mode 100644
index d92863dd819..00000000000
--- a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Drop _FORTIFY_SOURCE=2 from defines
-
-Gentoo toolchains enable this by default. Removing this prevents spammy
-warnings about the macro being redefined.
-
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -1161,21 +1161,6 @@
- "__STDC_FORMAT_MACROS",
- ]
-
-- if (!is_debug && !using_sanitizer &&
-- (!is_linux || !is_clang || is_official_build) &&
-- current_cpu != "s390x" && current_cpu != "s390" &&
-- current_cpu != "ppc64" && current_cpu != "ppc64") {
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see
-- # http://llvm.org/bugs/show_bug.cgi?id=16821.
-- # It seems to work fine with Ubuntu 12 headers though, so use it in
-- # official builds.
-- #
-- # 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 || is_ios) {
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
diff --git a/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch b/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch
deleted file mode 100644
index c6477d69087..00000000000
--- a/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Drop _FORTIFY_SOURCE=2 from defines
-
-Gentoo toolchains enable this by default. Removing this prevents spammy
-warnings about the macro being redefined.
-
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -1069,19 +1069,6 @@ config("chromium_code") {
- "__STDC_FORMAT_MACROS",
- ]
-
-- if (!is_debug && !using_sanitizer &&
-- (!is_linux || !is_clang || is_official_build)) {
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see
-- # http://llvm.org/bugs/show_bug.cgi?id=16821.
-- # It seems to work fine with Ubuntu 12 headers though, so use it in
-- # official builds.
-- #
-- # 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 || is_ios) {
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
diff --git a/www-client/chromium/files/chromium-dma-buf-r1.patch b/www-client/chromium/files/chromium-dma-buf-r1.patch
deleted file mode 100644
index 6cc8d087d3f..00000000000
--- a/www-client/chromium/files/chromium-dma-buf-r1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2017-03-29 15:08:58.079790070 +0000
-+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc 2017-03-29 15:09:10.068039324 +0000
-@@ -17,7 +17,6 @@
- #include "base/strings/stringprintf.h"
- #include "base/trace_event/trace_event.h"
-
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
- #include <linux/types.h>
-
- struct local_dma_buf_sync {
-@@ -35,10 +34,6 @@
- #define LOCAL_DMA_BUF_IOCTL_SYNC \
- _IOW(LOCAL_DMA_BUF_BASE, 0, struct local_dma_buf_sync)
-
--#else
--#include <linux/dma-buf.h>
--#endif
--
- namespace gfx {
-
- namespace {
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r15.patch b/www-client/chromium/files/chromium-gn-bootstrap-r15.patch
deleted file mode 100644
index 726dca2e903..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -550,8 +550,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/trace_event/memory_peak_detector.cc',
- 'base/trace_event/memory_usage_estimator.cc',
- 'base/trace_event/process_memory_dump.cc',
-- 'base/trace_event/process_memory_maps.cc',
-- 'base/trace_event/process_memory_totals.cc',
- 'base/trace_event/sharded_allocation_register.cc',
- 'base/trace_event/trace_buffer.cc',
- 'base/trace_event/trace_config.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r16.patch b/www-client/chromium/files/chromium-gn-bootstrap-r16.patch
deleted file mode 100644
index a2b4394d251..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r16.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py.orig 2017-08-19 09:47:46.919341766 +0000
-+++ b/tools/gn/bootstrap/bootstrap.py 2017-08-19 09:48:07.307745292 +0000
-@@ -348,7 +348,7 @@
- '-pipe',
- '-fno-exceptions'
- ])
-- cflags_cc.extend(['-std=c++11', '-Wno-c++11-narrowing'])
-+ cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
- if is_aix:
- cflags.extend(['-maix64'])
- ldflags.extend([ '-maix64 -Wl,-bbigtoc' ])
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r18.patch b/www-client/chromium/files/chromium-gn-bootstrap-r18.patch
deleted file mode 100644
index 8c9c27121cd..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r18.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -481,8 +481,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/process/process_handle.cc',
- 'base/process/process_iterator.cc',
- 'base/process/process_metrics.cc',
-- 'base/profiler/scoped_profile.cc',
-- 'base/profiler/scoped_tracker.cc',
- 'base/rand_util.cc',
- 'base/run_loop.cc',
- 'base/sequence_token.cc',
-@@ -579,7 +577,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/trace_event/trace_log_constants.cc',
- 'base/trace_event/tracing_agent.cc',
- 'base/tracked_objects.cc',
-- 'base/tracking_info.cc',
- 'base/unguessable_token.cc',
- 'base/value_iterators.cc',
- 'base/values.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r8.patch b/www-client/chromium/files/chromium-gn-bootstrap-r8.patch
deleted file mode 100644
index d9f389aaf58..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/sys_info.cc',
- 'base/task_runner.cc',
- 'base/task_scheduler/delayed_task_manager.cc',
-+ 'base/task_scheduler/environment_config.cc',
- 'base/task_scheduler/post_task.cc',
- 'base/task_scheduler/priority_queue.cc',
- 'base/task_scheduler/scheduler_lock_impl.cc',
diff --git a/www-client/chromium/files/chromium-major-minor.patch b/www-client/chromium/files/chromium-major-minor.patch
deleted file mode 100644
index ab8a701c6c1..00000000000
--- a/www-client/chromium/files/chromium-major-minor.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 11e48b29d00fdd714c3ff3f8ebe0d51a2c4ce61c Mon Sep 17 00:00:00 2001
-From: Dongseong Hwang <dongseong.hwang@intel.com>
-Date: Tue, 11 Jul 2017 17:20:06 +0000
-Subject: [PATCH] ozone: drm: Remove the debug details when dmabuf mmap fails.
-
-As we fixed mmap failure, remove the redundant crash reports.
-The CL adding the info: crrev.com/2710183005
-
-BUG=629521
-
-Change-Id: I8de9f16a3fce4a42500fe9c5e2843615940e184e
-Reviewed-on: https://chromium-review.googlesource.com/565805
-Reviewed-by: Daniele Castagna <dcastagna@chromium.org>
-Reviewed-by: Robert Sesek <rsesek@chromium.org>
-Reviewed-by: Dongseong Hwang <dongseong.hwang@intel.com>
-Commit-Queue: Dongseong Hwang <dongseong.hwang@intel.com>
-Cr-Commit-Position: refs/heads/master@{#485662}
----
- chrome/common/crash_keys.cc | 5 -----
- ui/gfx/linux/client_native_pixmap_dmabuf.cc | 28 +++-------------------------
- 2 files changed, 3 insertions(+), 30 deletions(-)
-
-diff --git a/chrome/common/crash_keys.cc b/chrome/common/crash_keys.cc
-index c4b563e0309b..2f1efe6f2334 100644
---- a/chrome/common/crash_keys.cc
-+++ b/chrome/common/crash_keys.cc
-@@ -153,11 +153,6 @@ size_t RegisterChromeCrashKeys() {
- {kInputEventFilterSendFailure, kSmallSize},
- #if defined(OS_CHROMEOS)
- {kNumberOfUsers, kSmallSize},
-- // Temporary for https://crbug.com/629521
-- {"mmap_params", kSmallSize},
-- {"buffer_size", kSmallSize},
-- {"errno", kSmallSize},
-- {"number_of_fds", kSmallSize},
- #endif
- #if defined(OS_MACOSX)
- {mac::kFirstNSException, kMediumSize},
-diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc
-index 4927daf3a61d..e532686a4f5b 100644
---- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc
-+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc
-@@ -11,11 +11,9 @@
- #include <sys/mman.h>
- #include <xf86drm.h>
-
--#include "base/debug/crash_logging.h"
- #include "base/memory/ptr_util.h"
- #include "base/posix/eintr_wrapper.h"
- #include "base/process/memory.h"
--#include "base/process/process_metrics.h"
- #include "base/strings/stringprintf.h"
- #include "base/trace_event/trace_event.h"
-
-@@ -87,36 +85,16 @@ ClientNativePixmapDmaBuf::ClientNativePixmapDmaBuf(
- if (mmap_error == ENOMEM)
- base::TerminateBecauseOutOfMemory(map_size);
-
-- // TODO(dcastagna): Remove the following diagnostic information and the
-- // associated crash keys once crbug.com/629521 is fixed.
- bool fd_valid = fcntl(dmabuf_fd_.get(), F_GETFD) != -1 ||
- logging::GetLastSystemErrorCode() != EBADF;
-- int minor = -1;
-- int major = -1;
-- struct stat buf;
-- if (!fstat(dmabuf_fd_.get(), &buf)) {
-- minor = minor(buf.st_dev);
-- major = major(buf.st_dev);
-- }
--
- std::string mmap_params = base::StringPrintf(
- "(addr=nullptr, length=%zu, prot=(PROT_READ | PROT_WRITE), "
-- "flags=MAP_SHARED, fd=%d[valid=%d, minor=%d, major=%d], offset=0)",
-- map_size, dmabuf_fd_.get(), fd_valid, minor, major);
-+ "flags=MAP_SHARED, fd=%d[valid=%d], offset=0)",
-+ map_size, dmabuf_fd_.get(), fd_valid);
- std::string errno_str = logging::SystemErrorCodeToString(mmap_error);
-- std::unique_ptr<base::ProcessMetrics> process_metrics(
-- base::ProcessMetrics::CreateCurrentProcessMetrics());
-- std::string number_of_fds =
-- base::StringPrintf("%d", process_metrics->GetOpenFdCount());
-- base::debug::ScopedCrashKey params_crash_key("mmap_params", mmap_params);
-- base::debug::ScopedCrashKey size_crash_key("buffer_size", size.ToString());
-- base::debug::ScopedCrashKey errno_crash_key("errno", errno_str);
-- base::debug::ScopedCrashKey number_of_fds_crash_key("number_of_fds",
-- number_of_fds);
- LOG(ERROR) << "Failed to mmap dmabuf; mmap_params: " << mmap_params
- << ", buffer_size: (" << size.ToString()
-- << "), errno: " << errno_str
-- << " , number_of_fds: " << number_of_fds;
-+ << "), errno: " << errno_str;
- LOG(ERROR) << "NativePixmapHandle:";
- LOG(ERROR) << "Number of fds: " << handle.fds.size();
- LOG(ERROR) << "Number of planes: " << handle.planes.size();
---
-2.13.3
-
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r6.patch b/www-client/chromium/files/chromium-system-ffmpeg-r6.patch
deleted file mode 100644
index d2e0157bfe3..00000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r6.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/media/ffmpeg/ffmpeg_common.h.orig 2017-04-07 18:17:22.623538889 +0000
-+++ b/media/ffmpeg/ffmpeg_common.h 2017-04-07 18:18:16.780656283 +0000
-@@ -23,10 +23,12 @@
-
- // Include FFmpeg header files.
- extern "C" {
-+#if !defined(USE_SYSTEM_FFMPEG)
- // Disable deprecated features which result in spammy compile warnings. This
- // list of defines must mirror those in the 'defines' section of FFmpeg's
- // BUILD.gn file or the headers below will generate different structures!
- #define FF_API_CONVERGENCE_DURATION 0
-+#endif // !defined(USE_SYSTEM_FFMPEG)
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -40,7 +42,9 @@
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
-+#if !defined(USE_SYSTEM_FFMPEG)
- #include <libavformat/internal.h>
-+#endif // !defined(USE_SYSTEM_FFMPEG)
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
---- a/media/filters/ffmpeg_demuxer.cc.orig 2017-04-07 18:15:14.776901183 +0000
-+++ b/media/filters/ffmpeg_demuxer.cc 2017-04-07 18:15:54.813727201 +0000
-@@ -1223,6 +1223,7 @@
- // If no estimate is found, the stream entry will be kInfiniteDuration.
- std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
- kInfiniteDuration);
-+#if !defined(USE_SYSTEM_FFMPEG)
- const AVFormatInternal* internal = format_context->internal;
- if (internal && internal->packet_buffer &&
- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-@@ -1246,6 +1247,7 @@
- packet_buffer = packet_buffer->next;
- }
- }
-+#endif // !defined(USE_SYSTEM_FFMPEG)
-
- std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
-
diff --git a/www-client/chromium/files/chromium-system-icu-r1.patch b/www-client/chromium/files/chromium-system-icu-r1.patch
deleted file mode 100644
index 6356467c21c..00000000000
--- a/www-client/chromium/files/chromium-system-icu-r1.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-Index: third_party/WebKit/Source/platform/text/CharacterEmoji.cpp
-diff --git a/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp b/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp
-index af051b46589bed421afd1da1e44623820c8f9136..60059d25dd808a0a55481d9bec3020b95175e45c 100644
---- a/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp
-+++ b/third_party/WebKit/Source/platform/text/CharacterEmoji.cpp
-@@ -192,26 +192,26 @@ static void applyPatternAndFreeze(icu::UnicodeSet* unicodeSet,
- DCHECK_EQ(err, U_ZERO_ERROR);
- }
-
--bool Character::isEmoji(UChar32 ch) {
-- return Character::isEmojiTextDefault(ch) ||
-- Character::isEmojiEmojiDefault(ch);
-+bool Character::IsEmoji(UChar32 ch) {
-+ return Character::IsEmojiTextDefault(ch) ||
-+ Character::IsEmojiEmojiDefault(ch);
- }
-
--bool Character::isEmojiTextDefault(UChar32 ch) {
-+bool Character::IsEmojiTextDefault(UChar32 ch) {
- DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojiTextSet, ());
- if (emojiTextSet.isEmpty())
- applyPatternAndFreeze(&emojiTextSet, kEmojiTextPattern);
-- return emojiTextSet.contains(ch) && !isEmojiEmojiDefault(ch);
-+ return emojiTextSet.contains(ch) && !IsEmojiEmojiDefault(ch);
- }
-
--bool Character::isEmojiEmojiDefault(UChar32 ch) {
-+bool Character::IsEmojiEmojiDefault(UChar32 ch) {
- DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojiEmojiSet, ());
- if (emojiEmojiSet.isEmpty())
- applyPatternAndFreeze(&emojiEmojiSet, kEmojiEmojiPattern);
- return emojiEmojiSet.contains(ch);
- }
-
--bool Character::isEmojiModifierBase(UChar32 ch) {
-+bool Character::IsEmojiModifierBase(UChar32 ch) {
- DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojieModifierBaseSet, ());
- if (emojieModifierBaseSet.isEmpty())
- applyPatternAndFreeze(&emojieModifierBaseSet, kEmojiModifierBasePattern);
-Index: third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp
-diff --git a/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp b/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp
-index 55c4d36e8c217680da9131aac063e38ad3b1fe3d..f3000190d4473daf39f0bc7fe5c262c21ecca4a0 100644
---- a/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp
-+++ b/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp
-@@ -20,7 +20,7 @@
- namespace blink {
-
- #if defined(USING_SYSTEM_ICU)
--static void generate(FILE*) {}
-+static void Generate(FILE*) {}
- #else
-
- const UChar32 kMaxCodepoint = 0x10FFFF;
-Index: third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp
-diff --git a/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp b/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp
-index 6d6f6f10e73dd6a413221d1e7f2d1e2a2d674e8b..ddf01cd9e2207bace2a0c4cab461750e86e0bf0d 100644
---- a/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp
-+++ b/third_party/WebKit/Source/platform/wtf/text/TextCodecICU.cpp
-@@ -63,16 +63,16 @@ void TextCodecICU::RegisterEncodingNames(EncodingNameRegistrar registrar) {
- // apart; ICU treats these names as synonyms.
- registrar("ISO-8859-8-I", "ISO-8859-8-I");
-
-- int32_t num_encodings = ucnv_countAvailable();
-- for (int32_t i = 0; i < num_encodings; ++i) {
-+ int32_t nuencoding_s = ucnv_countAvailable();
-+ for (int32_t i = 0; i < nuencoding_s; ++i) {
- const char* name = ucnv_getAvailableName(i);
- UErrorCode error = U_ZERO_ERROR;
- #if !defined(USING_SYSTEM_ICU)
- const char* primary_standard = "HTML";
- const char* secondary_standard = "MIME";
- #else
-- const char* primaryStandard = "MIME";
-- const char* secondaryStandard = "IANA";
-+ const char* primary_standard = "MIME";
-+ const char* secondary_standard = "IANA";
- #endif
- const char* standard_name =
- ucnv_getStandardName(name, primary_standard, &error);
-@@ -94,20 +94,21 @@ void TextCodecICU::RegisterEncodingNames(EncodingNameRegistrar registrar) {
- // encoding for encoding GB_2312-80 and several others. So, we need to
- // override this behavior, too.
- #if defined(USING_SYSTEM_ICU)
-- if (!strcmp(standardName, "GB2312") || !strcmp(standardName, "GB_2312-80"))
-- standardName = "GBK";
-+ if (!strcmp(standard_name, "GB2312") || !strcmp(standard_name, "GB_2312-80")) {
-+ standard_name = "GBK";
- // Similarly, EUC-KR encodings all map to an extended version, but
- // per HTML5, the canonical name still should be EUC-KR.
-- else if (!strcmp(standardName, "EUC-KR") ||
-- !strcmp(standardName, "KSC_5601") ||
-- !strcmp(standardName, "cp1363"))
-- standardName = "EUC-KR";
-+ } else if (!strcmp(standard_name, "EUC-KR") ||
-+ !strcmp(standard_name, "KSC_5601") ||
-+ !strcmp(standard_name, "cp1363")) {
-+ standard_name = "EUC-KR";
- // And so on.
-- else if (!strcasecmp(standardName, "iso-8859-9"))
-+ } else if (!strcasecmp(standard_name, "iso-8859-9")) {
- // This name is returned in different case by ICU 3.2 and 3.6.
-- standardName = "windows-1254";
-- else if (!strcmp(standardName, "TIS-620"))
-- standardName = "windows-874";
-+ standard_name = "windows-1254";
-+ } else if (!strcmp(standard_name, "TIS-620")) {
-+ standard_name = "windows-874";
-+ }
- #endif
-
- registrar(standard_name, standard_name);
-@@ -229,8 +230,8 @@ void TextCodecICU::RegisterCodecs(TextCodecRegistrar registrar) {
- // See comment above in registerEncodingNames.
- registrar("ISO-8859-8-I", Create, 0);
-
-- int32_t num_encodings = ucnv_countAvailable();
-- for (int32_t i = 0; i < num_encodings; ++i) {
-+ int32_t nuencoding_s = ucnv_countAvailable();
-+ for (int32_t i = 0; i < nuencoding_s; ++i) {
- const char* name = ucnv_getAvailableName(i);
- UErrorCode error = U_ZERO_ERROR;
- const char* standard_name = ucnv_getStandardName(name, "MIME", &error);
-@@ -272,7 +273,7 @@ void TextCodecICU::CreateICUConverter() const {
- DCHECK(!converter_icu_);
-
- #if defined(USING_SYSTEM_ICU)
-- const char* name = m_encoding.name();
-+ const char* name = encoding_.GetName();
- m_needsGBKFallbacks =
- name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3];
- #endif
-@@ -393,16 +394,16 @@ String TextCodecICU::Decode(const char* bytes,
- // Chrome's copy of ICU does not have the issue described below.
- return result.ToString();
- #else
-- String resultString = result.toString();
-+ String resultString = result.ToString();
-
- // <http://bugs.webkit.org/show_bug.cgi?id=17014>
- // Simplified Chinese pages use the code A3A0 to mean "full-width space", but
- // ICU decodes it as U+E5E5.
-- if (!strcmp(m_encoding.name(), "GBK")) {
-- if (!strcasecmp(m_encoding.name(), "gb18030"))
-- resultString.replace(0xE5E5, ideographicSpaceCharacter);
-+ if (!strcmp(encoding_.GetName(), "GBK")) {
-+ if (!strcasecmp(encoding_.GetName(), "gb18030"))
-+ resultString.Replace(0xE5E5, ideographicSpaceCharacter);
- // Make GBK compliant to the encoding spec and align with GB18030
-- resultString.replace(0x01F9, 0xE7C8);
-+ resultString.Replace(0x01F9, 0xE7C8);
- // FIXME: Once https://www.w3.org/Bugs/Public/show_bug.cgi?id=28740#c3
- // is resolved, add U+1E3F => 0xE7C7.
- }
-@@ -506,7 +507,7 @@ static void gbkCallbackEscape(const void* context,
- ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err);
- return;
- }
-- numericEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
-+ NumericEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
- reason, err);
- }
-
-@@ -525,7 +526,7 @@ static void gbkCssEscapedEntityCallack(const void* context,
- ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err);
- return;
- }
-- cssEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
-+ CssEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
- reason, err);
- return;
- }
-@@ -548,7 +549,7 @@ static void gbkUrlEscapedEntityCallack(const void* context,
- ucnv_cbFromUWriteUChars(fromUArgs, &source, source + 1, 0, err);
- return;
- }
-- urlEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
-+ UrlEscapedEntityCallback(context, fromUArgs, codeUnits, length, codePoint,
- reason, err);
- return;
- }
-@@ -622,7 +623,7 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input,
- 0, 0, &err);
- #else
- ucnv_setFromUCallBack(
-- m_converterICU, m_needsGBKFallbacks ? gbkCallbackSubstitute
-+ converter_icu_, m_needsGBKFallbacks ? gbkCallbackSubstitute
- : UCNV_FROM_U_CALLBACK_SUBSTITUTE,
- 0, 0, 0, &err);
- #endif
-@@ -633,8 +634,8 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input,
- &err);
- #else
- ucnv_setFromUCallBack(
-- m_converterICU,
-- m_needsGBKFallbacks ? gbkCallbackEscape : numericEntityCallback, 0, 0,
-+ converter_icu_,
-+ m_needsGBKFallbacks ? gbkCallbackEscape : NumericEntityCallback, 0, 0,
- 0, &err);
- #endif
- break;
-@@ -643,9 +644,9 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input,
- ucnv_setFromUCallBack(converter_icu_, UrlEscapedEntityCallback, 0, 0, 0,
- &err);
- #else
-- ucnv_setFromUCallBack(m_converterICU,
-+ ucnv_setFromUCallBack(converter_icu_,
- m_needsGBKFallbacks ? gbkUrlEscapedEntityCallack
-- : urlEscapedEntityCallback,
-+ : UrlEscapedEntityCallback,
- 0, 0, 0, &err);
- #endif
- break;
-@@ -654,9 +655,9 @@ CString TextCodecICU::EncodeInternal(const TextCodecInput& input,
- ucnv_setFromUCallBack(converter_icu_, CssEscapedEntityCallback, 0, 0, 0,
- &err);
- #else
-- ucnv_setFromUCallBack(m_converterICU,
-+ ucnv_setFromUCallBack(converter_icu_,
- m_needsGBKFallbacks ? gbkCssEscapedEntityCallack
-- : cssEscapedEntityCallback,
-+ : CssEscapedEntityCallback,
- 0, 0, 0, &err);
- #endif
- break;
diff --git a/www-client/chromium/files/chromium-system-icu-r2.patch b/www-client/chromium/files/chromium-system-icu-r2.patch
deleted file mode 100644
index 5c12bbb7cf6..00000000000
--- a/www-client/chromium/files/chromium-system-icu-r2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/linux/unbundle/icu.gn
-+++ b/build/linux/unbundle/icu.gn
-@@ -16,6 +16,7 @@ config("icu_config") {
- defines = [
- "USING_SYSTEM_ICU=1",
- "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
-+ "UCHAR_TYPE=uint16_t",
- ]
- }
-
diff --git a/www-client/chromium/files/chromium-system-zlib-r1.patch b/www-client/chromium/files/chromium-system-zlib-r1.patch
deleted file mode 100644
index 23ee934b522..00000000000
--- a/www-client/chromium/files/chromium-system-zlib-r1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/gpu/command_buffer/service/memory_program_cache.cc
-+++ b/gpu/command_buffer/service/memory_program_cache.cc
-@@ -226,7 +226,7 @@ bool ProgramBinaryExtensionsAvailable() {
- // Returns an empty vector if compression fails.
- std::vector<uint8_t> CompressData(const std::vector<uint8_t>& data) {
- auto start_time = base::TimeTicks::Now();
-- Cr_z_uLongf compressed_size = compressBound(data.size());
-+ uLongf compressed_size = compressBound(data.size());
- std::vector<uint8_t> compressed_data(compressed_size);
- // Level indicates a trade-off between compression and speed. Level 1
- // indicates fastest speed (with worst compression).
-@@ -256,8 +256,8 @@ std::vector<uint8_t> DecompressData(const std::vector<uint8_t>& data,
- size_t max_size_bytes) {
- auto start_time = base::TimeTicks::Now();
- std::vector<uint8_t> decompressed_data(decompressed_size);
-- Cr_z_uLongf decompressed_size_out =
-- static_cast<Cr_z_uLongf>(decompressed_size);
-+ uLongf decompressed_size_out =
-+ static_cast<uLongf>(decompressed_size);
- auto result = uncompress(decompressed_data.data(), &decompressed_size_out,
- data.data(), data.size());
-
diff --git a/www-client/chromium/files/skia-avx2.patch b/www-client/chromium/files/skia-avx2.patch
deleted file mode 100644
index a1b530990c0..00000000000
--- a/www-client/chromium/files/skia-avx2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Disable AVX2 code to prevent build failure with GCC
-
-Bug: https://bugs.gentoo.org/608640
-
---- a/third_party/skia/include/core/SkPreConfig.h
-+++ b/third_party/skia/include/core/SkPreConfig.h
-@@ -125,7 +125,7 @@
- // These checks must be done in descending order to ensure we set the highest
- // available SSE level.
- #if defined(__AVX2__)
-- #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX2
-+ #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX
- #elif defined(__AVX__)
- #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_AVX
- #elif defined(__SSE4_2__)
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2017-08-09 14:30 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2017-08-09 14:30 UTC (permalink / raw
To: gentoo-commits
commit: c0643d5f577ef12288c702ac0fa086818b243567
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 9 14:29:56 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 14:29:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0643d5f
www-client/chromium: remove old patches
Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1
www-client/chromium/files/chromium-57-gcc4.patch | 22 ------
www-client/chromium/files/chromium-clang-r1.patch | 11 ---
.../chromium/files/chromium-dma-buf-r2.patch | 20 -----
.../chromium/files/chromium-gn-bootstrap-r10.patch | 18 -----
.../chromium/files/chromium-gn-bootstrap-r11.patch | 27 -------
.../chromium/files/chromium-gn-bootstrap-r12.patch | 10 ---
.../chromium/files/chromium-gn-bootstrap-r13.patch | 18 -----
.../chromium/files/chromium-gn-bootstrap-r2.patch | 13 ----
.../chromium/files/chromium-gn-bootstrap-r3.patch | 13 ----
.../chromium/files/chromium-gn-bootstrap-r4.patch | 21 -----
.../chromium/files/chromium-gn-bootstrap-r5.patch | 11 ---
.../chromium/files/chromium-gn-bootstrap-r6.patch | 18 -----
.../chromium/files/chromium-gn-bootstrap-r7.patch | 16 ----
.../chromium/files/chromium-gn-bootstrap-r9.patch | 20 -----
.../chromium/files/chromium-system-ffmpeg-r4.patch | 48 ------------
.../chromium/files/chromium-system-ffmpeg-r5.patch | 66 ----------------
.../files/chromium-system-harfbuzz-r1.patch | 25 ------
.../chromium/files/chromium-system-icu-r2.patch | 89 ----------------------
.../files/chromium-system-libjpeg-r1.patch | 9 ---
.../chromium/files/chromium-system-libpng-r1.patch | 18 -----
.../files/chromium-system-libwebp-r1.patch | 9 ---
.../chromium/files/chromium-system-opus-r1.patch | 20 -----
22 files changed, 522 deletions(-)
diff --git a/www-client/chromium/files/chromium-57-gcc4.patch b/www-client/chromium/files/chromium-57-gcc4.patch
deleted file mode 100644
index 044c8f41b9f..00000000000
--- a/www-client/chromium/files/chromium-57-gcc4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/chrome/browser/ui/libgtkui/gtk_ui.cc
-+++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
-@@ -676,7 +676,7 @@
- : nullptr);
- }
-
-- return gtk_border;
-+ return std::move(gtk_border);
- }
-
- void GtkUi::AddWindowButtonOrderObserver(
---- a/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc
-+++ b/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc
-@@ -412,7 +412,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
- return nullptr;
- }
-
-- return capturer;
-+ return std::move(capturer);
- }
-
- } // namespace webrtc
diff --git a/www-client/chromium/files/chromium-clang-r1.patch b/www-client/chromium/files/chromium-clang-r1.patch
deleted file mode 100644
index ea593200cf7..00000000000
--- a/www-client/chromium/files/chromium-clang-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/base/containers/flat_set.h.orig 2017-04-28 14:39:24.143751606 +0000
-+++ b/base/containers/flat_set.h 2017-04-28 14:39:33.815953089 +0000
-@@ -5,6 +5,8 @@
- #ifndef BASE_CONTAINERS_FLAT_SET_H_
- #define BASE_CONTAINERS_FLAT_SET_H_
-
-+#include <functional>
-+
- #include "base/containers/flat_tree.h"
-
- namespace base {
diff --git a/www-client/chromium/files/chromium-dma-buf-r2.patch b/www-client/chromium/files/chromium-dma-buf-r2.patch
deleted file mode 100644
index 2de680cf031..00000000000
--- a/www-client/chromium/files/chromium-dma-buf-r2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2017-04-28 10:27:57.890505336 +0000
-+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc 2017-04-28 10:28:17.726916569 +0000
-@@ -19,9 +19,6 @@
- #include "base/strings/stringprintf.h"
- #include "base/trace_event/trace_event.h"
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
--#include <linux/dma-buf.h>
--#else
- #include <linux/types.h>
-
- struct dma_buf_sync {
-@@ -36,7 +33,6 @@
-
- #define DMA_BUF_BASE 'b'
- #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync)
--#endif
-
- namespace gfx {
-
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r10.patch b/www-client/chromium/files/chromium-gn-bootstrap-r10.patch
deleted file mode 100644
index f27fe374eb4..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r10.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -447,6 +447,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/metrics/field_trial_param_associator.cc',
- 'base/metrics/histogram.cc',
- 'base/metrics/histogram_base.cc',
-+ 'base/metrics/histogram_functions.cc',
- 'base/metrics/histogram_samples.cc',
- 'base/metrics/metrics_hashes.cc',
- 'base/metrics/persistent_histogram_allocator.cc',
-@@ -509,6 +510,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/third_party/icu/icu_utf.cc',
- 'base/third_party/nspr/prtime.cc',
- 'base/threading/post_task_and_reply_impl.cc',
-+ 'base/threading/sequence_local_storage_map.cc',
- 'base/threading/sequenced_task_runner_handle.cc',
- 'base/threading/sequenced_worker_pool.cc',
- 'base/threading/simple_thread.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r11.patch b/www-client/chromium/files/chromium-gn-bootstrap-r11.patch
deleted file mode 100644
index a2171a2c6e8..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -447,6 +447,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/metrics/field_trial_param_associator.cc',
- 'base/metrics/histogram.cc',
- 'base/metrics/histogram_base.cc',
-+ 'base/metrics/histogram_functions.cc',
- 'base/metrics/histogram_samples.cc',
- 'base/metrics/metrics_hashes.cc',
- 'base/metrics/persistent_histogram_allocator.cc',
-@@ -509,6 +510,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/third_party/icu/icu_utf.cc',
- 'base/third_party/nspr/prtime.cc',
- 'base/threading/post_task_and_reply_impl.cc',
-+ 'base/threading/sequence_local_storage_map.cc',
- 'base/threading/sequenced_task_runner_handle.cc',
- 'base/threading/sequenced_worker_pool.cc',
- 'base/threading/simple_thread.cc',
-@@ -533,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
- 'base/trace_event/heap_profiler_allocation_register.cc',
- 'base/trace_event/heap_profiler_event_filter.cc',
-- 'base/trace_event/heap_profiler_heap_dump_writer.cc',
-+ 'base/trace_event/heap_profiler_event_writer.cc',
- 'base/trace_event/heap_profiler_serialization_state.cc',
- 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
- 'base/trace_event/heap_profiler_string_deduplicator.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r12.patch b/www-client/chromium/files/chromium-gn-bootstrap-r12.patch
deleted file mode 100644
index b5da93ec0d7..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r12.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py.orig 2017-07-12 20:37:42.619009003 +0000
-+++ b/tools/gn/bootstrap/bootstrap.py 2017-07-12 20:37:58.495342632 +0000
-@@ -467,7 +467,6 @@
- 'base/process/process_metrics.cc',
- 'base/profiler/scoped_profile.cc',
- 'base/profiler/scoped_tracker.cc',
-- 'base/profiler/tracked_time.cc',
- 'base/rand_util.cc',
- 'base/run_loop.cc',
- 'base/sequence_token.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r13.patch b/www-client/chromium/files/chromium-gn-bootstrap-r13.patch
deleted file mode 100644
index abb67a80621..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r13.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -467,7 +467,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/process/process_metrics.cc',
- 'base/profiler/scoped_profile.cc',
- 'base/profiler/scoped_tracker.cc',
-- 'base/profiler/tracked_time.cc',
- 'base/rand_util.cc',
- 'base/run_loop.cc',
- 'base/sequence_token.cc',
-@@ -567,6 +566,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/tracked_objects.cc',
- 'base/tracking_info.cc',
- 'base/unguessable_token.cc',
-+ 'base/value_iterators.cc',
- 'base/values.cc',
- 'base/vlog.cc',
- ])
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r2.patch b/www-client/chromium/files/chromium-gn-bootstrap-r2.patch
deleted file mode 100644
index 76287e1a56e..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 38cfb117d29c3895291379f00d8dc8c8b0727474..679170e610f8292bcbeb76508fd247d322a69c79 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/base_switches.cc',
- 'base/build_time.cc',
- 'base/callback_internal.cc',
-+ 'base/callback_helpers.cc',
- 'base/command_line.cc',
- 'base/debug/activity_tracker.cc',
- 'base/debug/alias.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r3.patch b/www-client/chromium/files/chromium-gn-bootstrap-r3.patch
deleted file mode 100644
index f214059d1cb..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 75e2eb4cce3ae9554c0a25193712683ac221f6c0..10dd512c085d6476fa40d28b04100dccec30b64f 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -472,6 +472,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/task_scheduler/post_task.cc',
- 'base/task_scheduler/priority_queue.cc',
- 'base/task_scheduler/scheduler_lock_impl.cc',
-+ 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
- 'base/task_scheduler/scheduler_worker.cc',
- 'base/task_scheduler/scheduler_worker_pool_impl.cc',
- 'base/task_scheduler/scheduler_worker_pool_params.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r4.patch b/www-client/chromium/files/chromium-gn-bootstrap-r4.patch
deleted file mode 100644
index 5849154b393..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 9bad2b4e6eed9a0208c300079dfff34b1f8f31f2..0bc2e4fb8701f08e6f2d5306f03c17a2f63dbd4e 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -526,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/trace_event/process_memory_totals.cc',
- 'base/trace_event/trace_buffer.cc',
- 'base/trace_event/trace_config.cc',
-+ 'base/trace_event/trace_config_category_filter.cc',
- 'base/trace_event/trace_event_argument.cc',
- 'base/trace_event/trace_event_filter.cc',
- 'base/trace_event/trace_event_impl.cc',
-@@ -612,6 +613,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/process/internal_linux.cc',
- 'base/process/memory_linux.cc',
- 'base/process/process_handle_linux.cc',
-+ 'base/process/process_info_linux.cc',
- 'base/process/process_iterator_linux.cc',
- 'base/process/process_linux.cc',
- 'base/process/process_metrics_linux.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r5.patch b/www-client/chromium/files/chromium-gn-bootstrap-r5.patch
deleted file mode 100644
index 5e95036086e..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py.orig 2017-04-28 11:27:52.844988762 +0000
-+++ b/tools/gn/bootstrap/bootstrap.py 2017-04-28 11:29:12.698642585 +0000
-@@ -503,6 +503,8 @@
- 'base/threading/thread_restrictions.cc',
- 'base/threading/thread_task_runner_handle.cc',
- 'base/threading/worker_pool.cc',
-+ 'base/time/default_tick_clock.cc',
-+ 'base/time/tick_clock.cc',
- 'base/time/time.cc',
- 'base/timer/elapsed_timer.cc',
- 'base/timer/timer.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r6.patch b/www-client/chromium/files/chromium-gn-bootstrap-r6.patch
deleted file mode 100644
index ef450ae7c0d..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py.orig 2017-05-05 10:28:25.450118804 +0000
-+++ b/tools/gn/bootstrap/bootstrap.py 2017-05-05 10:29:39.339673530 +0000
-@@ -546,6 +546,7 @@
- 'base/trace_event/memory_infra_background_whitelist.cc',
- 'base/trace_event/memory_peak_detector.cc',
- 'base/trace_event/memory_tracing_observer.cc',
-+ 'base/trace_event/memory_usage_estimator.cc',
- 'base/trace_event/process_memory_dump.cc',
- 'base/trace_event/process_memory_maps.cc',
- 'base/trace_event/process_memory_totals.cc',
-@@ -629,6 +630,7 @@
- 'tool': 'cxx',
- }
- static_libraries['base']['sources'].extend([
-+ 'base/memory/shared_memory_handle_posix.cc',
- 'base/memory/shared_memory_posix.cc',
- 'base/memory/shared_memory_tracker.cc',
- 'base/nix/xdg_util.cc',
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r7.patch b/www-client/chromium/files/chromium-gn-bootstrap-r7.patch
deleted file mode 100644
index 4fa1d9d4956..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 5e624eab4fc4294f054bece4fcbd179cd4ce996f..c52779ef4327df3e6adb76b77bc7735e2724bedc 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -600,7 +601,9 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/threading/platform_thread_posix.cc',
- 'base/threading/thread_local_storage_posix.cc',
- 'base/threading/worker_pool_posix.cc',
-- 'base/time/time_posix.cc',
-+ 'base/time/time_conversion_posix.cc',
-+ 'base/time/time_exploded_posix.cc',
-+ 'base/time/time_now_posix.cc',
- 'base/trace_event/heap_profiler_allocation_register_posix.cc',
- ])
- static_libraries['libevent'] = {
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r9.patch b/www-client/chromium/files/chromium-gn-bootstrap-r9.patch
deleted file mode 100644
index 0fc6cc160f1..00000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r9.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index e806761..dd564ac 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -410,6 +410,7 @@
- 'base/debug/dump_without_crashing.cc',
- 'base/debug/stack_trace.cc',
- 'base/debug/task_annotator.cc',
-+ 'base/debug/thread_heap_usage_tracker.cc',
- 'base/environment.cc',
- 'base/feature_list.cc',
- 'base/files/file.cc',
-@@ -507,7 +508,6 @@
- 'base/third_party/dmg_fp/g_fmt.cc',
- 'base/third_party/icu/icu_utf.cc',
- 'base/third_party/nspr/prtime.cc',
-- 'base/threading/non_thread_safe_impl.cc',
- 'base/threading/post_task_and_reply_impl.cc',
- 'base/threading/sequenced_task_runner_handle.cc',
- 'base/threading/sequenced_worker_pool.cc',
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r4.patch b/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
deleted file mode 100644
index 3abfc163e8a..00000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/media/ffmpeg/ffmpeg_common.h.orig 2016-09-09 13:16:07.757294768 +0000
-+++ b/media/ffmpeg/ffmpeg_common.h 2016-09-09 13:16:41.705989273 +0000
-@@ -22,10 +22,6 @@
-
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings. This
--// list of defines must mirror those in the 'defines' section of FFmpeg's
--// BUILD.gn file or the headers below will generate different structures!
--#define FF_API_CONVERGENCE_DURATION 0
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -35,7 +35,6 @@
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
---- a/media/filters/ffmpeg_demuxer.cc.orig 2016-09-09 14:21:40.185828912 +0000
-+++ b/media/filters/ffmpeg_demuxer.cc 2016-09-09 14:21:52.894089352 +0000
-@@ -1185,24 +1185,6 @@
- // If no estimate is found, the stream entry will be kInfiniteDuration.
- std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
- kInfiniteDuration);
-- const AVFormatInternal* internal = format_context->internal;
-- if (internal && internal->packet_buffer &&
-- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-- struct AVPacketList* packet_buffer = internal->packet_buffer;
-- while (packet_buffer != internal->packet_buffer_end) {
-- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
-- start_time_estimates.size());
-- const AVStream* stream =
-- format_context->streams[packet_buffer->pkt.stream_index];
-- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-- const base::TimeDelta packet_pts =
-- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
-- if (packet_pts < start_time_estimates[stream->index])
-- start_time_estimates[stream->index] = packet_pts;
-- }
-- packet_buffer = packet_buffer->next;
-- }
-- }
-
- std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
-
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r5.patch b/www-client/chromium/files/chromium-system-ffmpeg-r5.patch
deleted file mode 100644
index cf82dd1bb40..00000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r5.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/media/ffmpeg/ffmpeg_common.h.orig 2017-04-07 18:17:22.623538889 +0000
-+++ b/media/ffmpeg/ffmpeg_common.h 2017-04-07 18:18:16.780656283 +0000
-@@ -23,10 +23,12 @@
-
- // Include FFmpeg header files.
- extern "C" {
-+#if !defined(USE_SYSTEM_FFMPEG)
- // Disable deprecated features which result in spammy compile warnings. This
- // list of defines must mirror those in the 'defines' section of FFmpeg's
- // BUILD.gn file or the headers below will generate different structures!
- #define FF_API_CONVERGENCE_DURATION 0
-+#endif // !defined(USE_SYSTEM_FFMPEG)
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -40,7 +42,9 @@
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
-+#if !defined(USE_SYSTEM_FFMPEG)
- #include <libavformat/internal.h>
-+#endif // !defined(USE_SYSTEM_FFMPEG)
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
---- a/media/filters/ffmpeg_demuxer.cc.orig 2017-04-07 18:15:14.776901183 +0000
-+++ b/media/filters/ffmpeg_demuxer.cc 2017-04-07 18:15:54.813727201 +0000
-@@ -1223,6 +1223,7 @@
- // If no estimate is found, the stream entry will be kInfiniteDuration.
- std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
- kInfiniteDuration);
-+#if !defined(USE_SYSTEM_FFMPEG)
- const AVFormatInternal* internal = format_context->internal;
- if (internal && internal->packet_buffer &&
- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-@@ -1246,6 +1247,7 @@
- packet_buffer = packet_buffer->next;
- }
- }
-+#endif // !defined(USE_SYSTEM_FFMPEG)
-
- std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
-
---- a/build/linux/unbundle/ffmpeg.gn.orig 2017-04-07 18:18:55.793461226 +0000
-+++ b/build/linux/unbundle/ffmpeg.gn 2017-04-07 18:20:13.883072465 +0000
-@@ -13,6 +13,10 @@
- ]
- }
-
-+config("using_system_ffmpeg") {
-+ defines = [ "USE_SYSTEM_FFMPEG=1" ]
-+}
-+
- shim_headers("ffmpeg_shim") {
- root_path = "."
- headers = [
-@@ -26,5 +30,8 @@
- deps = [
- ":ffmpeg_shim",
- ]
-- public_configs = [ ":system_ffmpeg" ]
-+ public_configs = [
-+ ":system_ffmpeg",
-+ ":using_system_ffmpeg",
-+ ]
- }
diff --git a/www-client/chromium/files/chromium-system-harfbuzz-r1.patch b/www-client/chromium/files/chromium-system-harfbuzz-r1.patch
deleted file mode 100644
index 616dae026c6..00000000000
--- a/www-client/chromium/files/chromium-system-harfbuzz-r1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/build/linux/unbundle/harfbuzz-ng.gn.orig 2017-05-23 20:53:36.592001223 +0000
-+++ b/build/linux/unbundle/harfbuzz-ng.gn 2017-05-23 20:56:18.595309433 +0000
-@@ -17,7 +17,21 @@
- headers = [ "hb.h" ]
- }
-
--source_set("harfbuzz-ng") {
-+group("harfbuzz-ng") {
-+ public_deps = [
-+ ":harfbuzz-ng-ft",
-+ ":harfbuzz-ng-without-freetype",
-+ ]
-+}
-+
-+source_set("harfbuzz-ng-ft") {
-+ deps = [
-+ ":harfbuzz_shim",
-+ ]
-+ public_configs = [ ":system_harfbuzz" ]
-+}
-+
-+source_set("harfbuzz-ng-without-freetype") {
- deps = [
- ":harfbuzz_shim",
- ]
diff --git a/www-client/chromium/files/chromium-system-icu-r2.patch b/www-client/chromium/files/chromium-system-icu-r2.patch
deleted file mode 100644
index e095442ec79..00000000000
--- a/www-client/chromium/files/chromium-system-icu-r2.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Update header list for unbundling ICU 59
-
-Bug: https://bugs.gentoo.org/619796#c2
-
---- a/build/linux/unbundle/icu.gn
-+++ b/build/linux/unbundle/icu.gn
-@@ -78,7 +78,6 @@ shim_headers("icui18n_shim") {
- "unicode/fpositer.h",
- "unicode/gender.h",
- "unicode/gregocal.h",
-- "unicode/locdspnm.h",
- "unicode/measfmt.h",
- "unicode/measunit.h",
- "unicode/measure.h",
-@@ -113,15 +112,12 @@ shim_headers("icui18n_shim") {
- "unicode/ucol.h",
- "unicode/ucoleitr.h",
- "unicode/ucsdet.h",
-- "unicode/ucurr.h",
- "unicode/udat.h",
- "unicode/udateintervalformat.h",
- "unicode/udatpg.h",
-- "unicode/udisplaycontext.h",
- "unicode/ufieldpositer.h",
- "unicode/uformattable.h",
- "unicode/ugender.h",
-- "unicode/uldnames.h",
- "unicode/ulocdata.h",
- "unicode/umsg.h",
- "unicode/unirepl.h",
-@@ -130,6 +126,7 @@ shim_headers("icui18n_shim") {
- "unicode/upluralrules.h",
- "unicode/uregex.h",
- "unicode/uregion.h",
-+ "unicode/ureldatefmt.h",
- "unicode/usearch.h",
- "unicode/uspoof.h",
- "unicode/utmscale.h",
-@@ -151,10 +148,13 @@ shim_headers("icuuc_shim") {
- "unicode/bytestrie.h",
- "unicode/bytestriebuilder.h",
- "unicode/caniter.h",
-+ "unicode/casemap.h",
-+ "unicode/char16ptr.h",
- "unicode/chariter.h",
- "unicode/dbbi.h",
- "unicode/docmain.h",
- "unicode/dtintrv.h",
-+ "unicode/edits.h",
- "unicode/enumset.h",
- "unicode/errorcode.h",
- "unicode/filteredbrk.h",
-@@ -163,6 +163,7 @@ shim_headers("icuuc_shim") {
- "unicode/idna.h",
- "unicode/listformatter.h",
- "unicode/localpointer.h",
-+ "unicode/locdspnm.h",
- "unicode/locid.h",
- "unicode/messagepattern.h",
- "unicode/normalizer2.h",
-@@ -176,12 +177,14 @@ shim_headers("icuuc_shim") {
- "unicode/rep.h",
- "unicode/resbund.h",
- "unicode/schriter.h",
-+ "unicode/simpleformatter.h",
- "unicode/std_string.h",
- "unicode/strenum.h",
- "unicode/stringpiece.h",
- "unicode/stringtriebuilder.h",
- "unicode/symtable.h",
- "unicode/ubidi.h",
-+ "unicode/ubiditransform.h",
- "unicode/ubrk.h",
- "unicode/ucasemap.h",
- "unicode/ucat.h",
-@@ -195,10 +198,13 @@ shim_headers("icuuc_shim") {
- "unicode/ucnv_err.h",
- "unicode/ucnvsel.h",
- "unicode/uconfig.h",
-+ "unicode/ucurr.h",
- "unicode/udata.h",
-+ "unicode/udisplaycontext.h",
- "unicode/uenum.h",
- "unicode/uidna.h",
- "unicode/uiter.h",
-+ "unicode/uldnames.h",
- "unicode/ulistformatter.h",
- "unicode/uloc.h",
- "unicode/umachine.h",
diff --git a/www-client/chromium/files/chromium-system-libjpeg-r1.patch b/www-client/chromium/files/chromium-system-libjpeg-r1.patch
deleted file mode 100644
index 3c5d0f7d151..00000000000
--- a/www-client/chromium/files/chromium-system-libjpeg-r1.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/build/linux/unbundle/libjpeg.gn.orig 2017-04-07 18:43:28.687843142 +0000
-+++ b/build/linux/unbundle/libjpeg.gn 2017-04-07 18:43:47.156224137 +0000
-@@ -21,3 +21,6 @@
-
- source_set("simd_asm") {
- }
-+
-+config("libjpeg_config") {
-+}
diff --git a/www-client/chromium/files/chromium-system-libpng-r1.patch b/www-client/chromium/files/chromium-system-libpng-r1.patch
deleted file mode 100644
index 7c329c71f7d..00000000000
--- a/www-client/chromium/files/chromium-system-libpng-r1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/build/linux/unbundle/libpng.gn.orig 2017-05-17 09:57:24.487799547 +0000
-+++ b/build/linux/unbundle/libpng.gn 2017-05-17 09:57:47.680282784 +0000
-@@ -5,7 +5,7 @@
- import("//build/config/linux/pkg_config.gni")
- import("//build/shim_headers.gni")
-
--pkg_config("system_libpng") {
-+pkg_config("libpng_config") {
- packages = [ "libpng" ]
- }
-
-@@ -21,5 +21,5 @@
- deps = [
- ":libpng_shim",
- ]
-- public_configs = [ ":system_libpng" ]
-+ public_configs = [ ":libpng_config" ]
- }
diff --git a/www-client/chromium/files/chromium-system-libwebp-r1.patch b/www-client/chromium/files/chromium-system-libwebp-r1.patch
deleted file mode 100644
index cf8beabea24..00000000000
--- a/www-client/chromium/files/chromium-system-libwebp-r1.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/build/linux/unbundle/libwebp.gn.orig 2017-05-17 10:12:50.147089090 +0000
-+++ b/build/linux/unbundle/libwebp.gn 2017-05-17 10:13:02.763351884 +0000
-@@ -6,5 +6,6 @@
- libs = [
- "webp",
- "webpdemux",
-+ "webpmux",
- ]
- }
diff --git a/www-client/chromium/files/chromium-system-opus-r1.patch b/www-client/chromium/files/chromium-system-opus-r1.patch
deleted file mode 100644
index d1a9a131a32..00000000000
--- a/www-client/chromium/files/chromium-system-opus-r1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/build/linux/unbundle/opus.gn.orig 2017-05-05 13:40:51.267582823 +0000
-+++ b/build/linux/unbundle/opus.gn 2017-05-05 13:41:38.156561667 +0000
-@@ -5,7 +5,7 @@
- import("//build/config/linux/pkg_config.gni")
- import("//build/shim_headers.gni")
-
--pkg_config("system_opus") {
-+pkg_config("opus_config") {
- packages = [ "opus" ]
- }
-
-@@ -23,7 +23,7 @@
- deps = [
- ":opus_shim",
- ]
-- public_configs = [ ":system_opus" ]
-+ public_configs = [ ":opus_config" ]
- }
-
- source_set("opus_compare") {
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2017-06-11 16:50 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2017-06-11 16:50 UTC (permalink / raw
To: gentoo-commits
commit: f08722437ae17a266f737ab0eb5386a5928e31ce
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 16:49:27 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 16:49:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0872243
www-client/chromium: cleanup FORTIFY_SOURCE patch headers
www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch | 4 ++--
www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch b/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch
index cda19bb9239..d92863dd819 100644
--- a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch
+++ b/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch
@@ -3,8 +3,8 @@ Drop _FORTIFY_SOURCE=2 from defines
Gentoo toolchains enable this by default. Removing this prevents spammy
warnings about the macro being redefined.
---- a/build/config/compiler/BUILD.gn.orig 2017-05-17 08:37:23.147973304 +0000
-+++ b/build/config/compiler/BUILD.gn 2017-05-17 08:37:44.448414953 +0000
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
@@ -1161,21 +1161,6 @@
"__STDC_FORMAT_MACROS",
]
diff --git a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch b/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch
index 206590f1af1..8ebf42a46a8 100644
--- a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch
+++ b/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch
@@ -1,5 +1,10 @@
---- a/build/config/compiler/BUILD.gn.orig 2017-06-10 11:11:04.852935374 +0000
-+++ b/build/config/compiler/BUILD.gn 2017-06-10 11:11:12.749100346 +0000
+Drop _FORTIFY_SOURCE=2 from defines
+
+Gentoo toolchains enable this by default. Removing this prevents spammy
+warnings about the macro being redefined.
+
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
@@ -1213,22 +1213,6 @@
"__STDC_FORMAT_MACROS",
]
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2017-02-17 1:25 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2017-02-17 1:25 UTC (permalink / raw
To: gentoo-commits
commit: 1ab44e503fbfdc096bf06837956a58924129397e
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Feb 15 16:46:24 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 01:25:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab44e50
www-client/chromium: remove unused patches
www-client/chromium/files/chromium-gn-r10.patch | 22 -----------
www-client/chromium/files/chromium-gn-r11.patch | 50 -------------------------
2 files changed, 72 deletions(-)
diff --git a/www-client/chromium/files/chromium-gn-r10.patch b/www-client/chromium/files/chromium-gn-r10.patch
deleted file mode 100644
index bf3e2b1214..0000000000
--- a/www-client/chromium/files/chromium-gn-r10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -162,7 +162,7 @@ def build_gn_with_ninja_manually(tempdir, options):
- {'USE_EXPERIMENTAL_ALLOCATOR_SHIM': 'true' if is_linux else 'false'})
-
- write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
-- {'ENABLE_PROFILING': 'false'})
-+ {'ENABLE_PROFILING': 'false', 'ENABLE_MEMORY_TASK_PROFILER': 'false'})
-
- if is_mac:
- # //base/build_time.cc needs base/generated_build_date.h,
-@@ -456,6 +456,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/task_scheduler/scheduler_worker_pool_impl.cc',
- 'base/task_scheduler/scheduler_worker_pool_params.cc',
- 'base/task_scheduler/scheduler_worker_stack.cc',
-+ 'base/task_scheduler/scoped_set_task_priority_for_current_thread.cc',
- 'base/task_scheduler/sequence.cc',
- 'base/task_scheduler/sequence_sort_key.cc',
- 'base/task_scheduler/task.cc',
---
-2.11.0
-
diff --git a/www-client/chromium/files/chromium-gn-r11.patch b/www-client/chromium/files/chromium-gn-r11.patch
deleted file mode 100644
index af1216e0ef..0000000000
--- a/www-client/chromium/files/chromium-gn-r11.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 615f852746f6a8c1331eec32e8352d7cfcd63f76 Mon Sep 17 00:00:00 2001
-From: saiarcot895 <saiarcot895@gmail.com>
-Date: Mon, 19 Dec 2016 10:35:14 -0800
-Subject: [PATCH] Fix GN bootstrap.
-
-Update list of required files and compile flags.
-
-BUG=None
-
-Review-Url: https://codereview.chromium.org/2588003002
-Cr-Commit-Position: refs/heads/master@{#439509}
----
- tools/gn/bootstrap/bootstrap.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index bfdf0fc1ce64..c3642e8f487c 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -162,7 +162,10 @@ def build_gn_with_ninja_manually(tempdir, options):
- {'USE_EXPERIMENTAL_ALLOCATOR_SHIM': 'true' if is_linux else 'false'})
-
- write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
-- {'ENABLE_PROFILING': 'false'})
-+ {
-+ 'ENABLE_PROFILING': 'false',
-+ 'ENABLE_MEMORY_TASK_PROFILER': 'false'
-+ })
-
- if is_mac:
- # //base/build_time.cc needs base/generated_build_date.h,
-@@ -402,6 +405,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/memory/ref_counted.cc',
- 'base/memory/ref_counted_memory.cc',
- 'base/memory/singleton.cc',
-+ 'base/memory/shared_memory_helper.cc',
- 'base/memory/weak_ptr.cc',
- 'base/message_loop/incoming_task_queue.cc',
- 'base/message_loop/message_loop.cc',
-@@ -456,6 +460,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/task_scheduler/scheduler_worker_pool_impl.cc',
- 'base/task_scheduler/scheduler_worker_pool_params.cc',
- 'base/task_scheduler/scheduler_worker_stack.cc',
-+ 'base/task_scheduler/scoped_set_task_priority_for_current_thread.cc',
- 'base/task_scheduler/sequence.cc',
- 'base/task_scheduler/sequence_sort_key.cc',
- 'base/task_scheduler/task.cc',
---
-2.11.0
-
^ permalink raw reply related [flat|nested] 48+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
@ 2016-11-08 5:47 Mike Gilbert
0 siblings, 0 replies; 48+ messages in thread
From: Mike Gilbert @ 2016-11-08 5:47 UTC (permalink / raw
To: gentoo-commits
commit: 2ff74f5813bf508e380b19b03044d3beea24554b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 8 01:59:21 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Nov 8 05:47:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff74f58
www-client/chromium: remove obsolete patches
.../chromium-arm64-align-stack-16-bytes.patch | 69 ----------
www-client/chromium/files/chromium-cups-r0.patch | 70 ----------
.../files/chromium-ffmpeg-generate_gn.patch | 27 ----
.../files/chromium-ffmpeg-license-r0.patch | 44 ------
.../chromium/files/chromium-gcc-4.7-r0.patch | 12 --
www-client/chromium/files/chromium-gn-r0.patch | 93 -------------
www-client/chromium/files/chromium-gn-r1.patch | 45 -------
www-client/chromium/files/chromium-gn-r2.patch | 23 ----
www-client/chromium/files/chromium-gn-r3.patch | 21 ---
www-client/chromium/files/chromium-gn-r4.patch | 12 --
www-client/chromium/files/chromium-gn-r5.patch | 27 ----
www-client/chromium/files/chromium-gn-r6.patch | 13 --
www-client/chromium/files/chromium-gn-r7.patch | 29 ----
www-client/chromium/files/chromium-gnome-r0.patch | 40 ------
.../chromium/files/chromium-hotwording-2403.patch | 147 ---------------------
.../files/chromium-last-commit-position-r0.patch | 26 ----
.../files/chromium-last-commit-position-r1.patch | 26 ----
.../chromium/files/chromium-libsecret-r0.patch | 14 --
.../files/chromium-linker-warnings-r0.patch | 18 ---
www-client/chromium/files/chromium-pdfium-r0.patch | 17 ---
www-client/chromium/files/chromium-rpath-r0.patch | 72 ----------
.../files/chromium-snapshot-toolchain-r0.patch | 23 ----
.../files/chromium-snapshot-toolchain-r1.patch | 23 ----
.../chromium/files/chromium-system-ffmpeg-r0.patch | 54 --------
.../chromium/files/chromium-system-ffmpeg-r1.patch | 50 -------
.../chromium/files/chromium-system-ffmpeg-r2.patch | 50 -------
.../chromium/files/chromium-system-icu-r0.patch | 11 --
.../chromium/files/chromium-system-jinja-r10.patch | 91 -------------
.../chromium/files/chromium-system-jinja-r11.patch | 79 -----------
.../chromium/files/chromium-system-jinja-r12.patch | 79 -----------
.../chromium/files/chromium-system-jinja-r6.patch | 55 --------
.../chromium/files/chromium-system-jinja-r7.patch | 35 -----
.../chromium/files/chromium-system-jinja-r8.patch | 47 -------
.../chromium/files/chromium-system-jinja-r9.patch | 71 ----------
.../chromium/files/chromium-system-libvpx-r0.patch | 10 --
.../chromium/files/chromium-system-zlib-r0.patch | 19 ---
.../chromium/files/chromium-system-zlib-r1.patch | 9 --
.../chromium/files/chromium-tracing-r0.patch | 10 --
www-client/chromium/files/chromium-werror-r0.patch | 50 -------
.../files/chromium-whitelist-arm64-syscalls.patch | 91 -------------
www-client/chromium/files/chromium-widevine.patch | 31 -----
41 files changed, 1733 deletions(-)
diff --git a/www-client/chromium/files/chromium-arm64-align-stack-16-bytes.patch b/www-client/chromium/files/chromium-arm64-align-stack-16-bytes.patch
deleted file mode 100644
index a962f79..00000000
--- a/www-client/chromium/files/chromium-arm64-align-stack-16-bytes.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From f352d974e43a73fed311c60c8fcb4dd043b16093 Mon Sep 17 00:00:00 2001
-From: "riku.voipio" <riku.voipio@linaro.org>
-Date: Wed, 27 Jan 2016 09:13:57 -0800
-Subject: [PATCH] sandbox arm64: align stack 16 bytes
-
-chrome fails to start with user namespace sandboxing:
-
-[866:866:0120/134742:FATAL:zygote_host_impl_linux.cc(182)] Check failed: process.IsValid().
-Failed to launch zygote process
-
-With strace..
-
-clone(child_stack=0x7ffd28fd98, flags=CLONE_NEWUSER|CLONE_NEWPID|CLONE_NEWNET|SIGCHLD) = -1 EINVAL (Invalid argument)
-
-Which compared to kernel sources[1], shows that stack needs to be 16
-bytes aligned. because stack grows downward, this patch assumes
-PTHREAD_STACK_MIN is dividable by 16 too.
-
-[1] http://lxr.free-electrons.com/source/arch/arm64/kernel/process.c#L267
-
-BUG=581018
-R=keescook@chromium.org,jln@chromium.org,rsesek@chromium.org,thakis@chromium.org
-TEST=base_unittests ProcessUtilTest.* and sandbox_linux_unittests NamespaceSandboxTest.*
-
-Review URL: https://codereview.chromium.org/1617763002
-
-Cr-Commit-Position: refs/heads/master@{#371809}
----
- base/process/launch_posix.cc | 2 +-
- sandbox/linux/services/credentials.cc | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc
-index 4bd3da3..4019de5 100644
---- a/base/process/launch_posix.cc
-+++ b/base/process/launch_posix.cc
-@@ -736,7 +736,7 @@ NOINLINE pid_t CloneAndLongjmpInChild(unsigned long flags,
- // internal pid cache. The libc interface unfortunately requires
- // specifying a new stack, so we use setjmp/longjmp to emulate
- // fork-like behavior.
-- char stack_buf[PTHREAD_STACK_MIN];
-+ char stack_buf[PTHREAD_STACK_MIN] ALIGNAS(16);
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
- defined(ARCH_CPU_MIPS64_FAMILY) || defined(ARCH_CPU_MIPS_FAMILY)
- // The stack grows downward.
-diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
-index fb6b6b4..76038af 100644
---- a/sandbox/linux/services/credentials.cc
-+++ b/sandbox/linux/services/credentials.cc
-@@ -16,6 +16,7 @@
- #include <unistd.h>
-
- #include "base/bind.h"
-+#include "base/compiler_specific.h"
- #include "base/files/file_path.h"
- #include "base/files/file_util.h"
- #include "base/logging.h"
-@@ -94,7 +95,7 @@ bool ChrootToSafeEmptyDir() {
- // /proc/tid directory for the thread (since /proc may not be aware of the
- // PID namespace). With a process, we can just use /proc/self.
- pid_t pid = -1;
-- char stack_buf[PTHREAD_STACK_MIN];
-+ char stack_buf[PTHREAD_STACK_MIN] ALIGNAS(16);
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
- defined(ARCH_CPU_MIPS64_FAMILY) || defined(ARCH_CPU_MIPS_FAMILY)
- // The stack grows downward.
---
-2.7.2
-
diff --git a/www-client/chromium/files/chromium-cups-r0.patch b/www-client/chromium/files/chromium-cups-r0.patch
deleted file mode 100644
index c6c5007..00000000
--- a/www-client/chromium/files/chromium-cups-r0.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: printing/backend/print_backend.h
-diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
-index e03ef42e37cf0785ba735f4a241310f70125a6e7..a8123325a613f527ba4e91a412ba09cd3225c8ec 100644
---- a/printing/backend/print_backend.h
-+++ b/printing/backend/print_backend.h
-@@ -111,7 +111,6 @@ class PRINTING_EXPORT PrintBackend
-
- // Allocate a print backend. If |print_backend_settings| is NULL, default
- // settings will be used.
-- // Return NULL if no print backend available.
- static scoped_refptr<PrintBackend> CreateInstance(
- const base::DictionaryValue* print_backend_settings);
-
-Index: printing/backend/print_backend_dummy.cc
-diff --git a/printing/backend/print_backend_dummy.cc b/printing/backend/print_backend_dummy.cc
-index c73e5370720eda7a2f989401f37dc62c5e438e24..db269a75920d3c44381c87d67b91d923f0bfd8dc 100644
---- a/printing/backend/print_backend_dummy.cc
-+++ b/printing/backend/print_backend_dummy.cc
-@@ -13,10 +13,49 @@
-
- namespace printing {
-
-+class DummyPrintBackend : public PrintBackend {
-+ public:
-+ DummyPrintBackend() {
-+ }
-+
-+ bool EnumeratePrinters(PrinterList* printer_list) override {
-+ return false;
-+ }
-+
-+ std::string GetDefaultPrinterName() override {
-+ return std::string();
-+ }
-+
-+ bool GetPrinterSemanticCapsAndDefaults(
-+ const std::string& printer_name,
-+ PrinterSemanticCapsAndDefaults* printer_info) override {
-+ return false;
-+ }
-+
-+ bool GetPrinterCapsAndDefaults(
-+ const std::string& printer_name,
-+ PrinterCapsAndDefaults* printer_info) override {
-+ return false;
-+ }
-+
-+ std::string GetPrinterDriverInfo(
-+ const std::string& printer_name) override {
-+ return std::string();
-+ }
-+
-+ bool IsValidPrinter(const std::string& printer_name) override {
-+ return false;
-+ }
-+
-+ private:
-+ ~DummyPrintBackend() {}
-+
-+ DISALLOW_COPY_AND_ASSIGN(DummyPrintBackend);
-+};
-+
- scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
- const base::DictionaryValue* print_backend_settings) {
-- NOTREACHED();
-- return NULL;
-+ return new DummyPrintBackend();
- }
-
- } // namespace printing
diff --git a/www-client/chromium/files/chromium-ffmpeg-generate_gn.patch b/www-client/chromium/files/chromium-ffmpeg-generate_gn.patch
deleted file mode 100644
index 799e3b2..00000000
--- a/www-client/chromium/files/chromium-ffmpeg-generate_gn.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/593836
-
---- a/third_party/ffmpeg/chromium/scripts/generate_gn.py
-+++ b/third_party/ffmpeg/chromium/scripts/generate_gn.py
-@@ -662,8 +662,8 @@ RENAME_REGEX = re.compile('.*' + RENAME_PREFIX + '_.+');
-
- # Content for the rename file. #includes the original file to ensure the two
- # files stay in sync.
--RENAME_CONTENT = """// File automatically generated. See crbug.com/495833.
--{0}include "{1}"
-+RENAME_CONTENT = """{0} File automatically generated. See crbug.com/495833.
-+{1}include "{2}"
- """
-
- def GetIncludedSources(file_path, source_dir, include_set):
-@@ -827,9 +827,10 @@ def FixObjectBasenameCollisions(disjoint_sets, all_sources, do_rename_cb,
- _, old_filename = os.path.split(rename.old_path)
- _, file_extension = os.path.splitext(old_filename)
- include_prefix = '%' if (file_extension == '.asm') else '#'
-+ comment_prefix = ';' if (file_extension == '.asm') else '//'
-
- do_rename_cb(rename.old_path, rename.new_path,
-- RENAME_CONTENT.format(include_prefix, old_filename))
-+ RENAME_CONTENT.format(comment_prefix, include_prefix, old_filename))
-
- source_set.sources.remove(rename.old_path)
- source_set.sources.add(rename.new_path)
diff --git a/www-client/chromium/files/chromium-ffmpeg-license-r0.patch b/www-client/chromium/files/chromium-ffmpeg-license-r0.patch
deleted file mode 100644
index 8e44cbd..00000000
--- a/www-client/chromium/files/chromium-ffmpeg-license-r0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3c9d5afe45bf1c4656b8f630525433f29017cd08 Mon Sep 17 00:00:00 2001
-From: Chris Cunningham <chcunningham@chromium.org>
-Date: Tue, 21 Jun 2016 10:52:45 -0700
-Subject: [PATCH] Avoid ffmpeg licences/credits checking generated autorename_ files.
-
-We generated these renames as a fix for http://crbug.com/495833. The
-generated rename contains no license or credits info and should be
-skipped to avoid confusing license/credits scripts. Care must be
-taken to not also skip the underlying include file from upstream ffmpeg.
-
-Found by: Zoltan Kuscsik
-
-BUG=495833
-
-Change-Id: I3359f4de0281b5f057d4b109ab2a4f31895b5cb1
----
-
-diff --git a/chromium/scripts/generate_gyp.py b/chromium/scripts/generate_gyp.py
-index c3fd3c0..94c2aad 100755
---- a/third_party/ffmpeg/chromium/scripts/generate_gyp.py
-+++ b/third_party/ffmpeg/chromium/scripts/generate_gyp.py
-@@ -790,6 +790,9 @@
- # Prefix added to renamed files as part of
- RENAME_PREFIX = 'autorename'
-
-+# Match an absolute path to a generated auotorename_ file.
-+RENAME_REGEX = re.compile('.*' + RENAME_PREFIX + '_.+');
-+
- # Content for the rename file. #includes the original file to ensure the two
- # files stay in sync.
- RENAME_CONTENT = """// File automatically generated. See crbug.com/495833.
-@@ -1020,6 +1023,12 @@
- for source in source_set.sources:
- GetIncludedSources(source, source_dir, sources_to_check)
-
-+ # Remove autorename_ files now that we've grabbed their underlying includes.
-+ # We generated autorename_ files above and should not consider them for
-+ # licensing or credits.
-+ sources_to_check = filter(lambda s: not RENAME_REGEX.search(s),
-+ sources_to_check)
-+
- if not CheckLicensesForStaticLinking(sources_to_check, source_dir,
- options.print_licenses):
- exit('GENERATE FAILED: invalid licenses detected.')
diff --git a/www-client/chromium/files/chromium-gcc-4.7-r0.patch b/www-client/chromium/files/chromium-gcc-4.7-r0.patch
deleted file mode 100644
index 35e0bec..00000000
--- a/www-client/chromium/files/chromium-gcc-4.7-r0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mojo/public/c/system/macros.h.orig 2014-09-03 14:48:42.963665035 +0000
-+++ mojo/public/c/system/macros.h 2014-09-03 14:49:12.180255593 +0000
-@@ -76,7 +76,8 @@
- // Unlike the C++11 |alignas()|, |alignment| must be an integer. It may not be a
- // type, nor can it be an expression like |MOJO_ALIGNOF(type)| (due to the
- // non-C++11 MSVS version).
--#if __cplusplus >= 201103L
-+#if __cplusplus >= 201103L && \
-+ (defined(__clang__) || (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 >= 40800))
- #define MOJO_ALIGNAS(alignment) alignas(alignment)
- #elif defined(__GNUC__)
- #define MOJO_ALIGNAS(alignment) __attribute__((aligned(alignment)))
diff --git a/www-client/chromium/files/chromium-gn-r0.patch b/www-client/chromium/files/chromium-gn-r0.patch
deleted file mode 100644
index 4ccfb93..00000000
--- a/www-client/chromium/files/chromium-gn-r0.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index ac8adc8..f198833 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -118,6 +118,19 @@ def build_gn_with_ninja_manually(tempdir, options):
- root_gen_dir = os.path.join(tempdir, 'gen')
- mkdir_p(root_gen_dir)
-
-+ if is_linux:
-+ mkdir_p(os.path.join(root_gen_dir, 'base', 'allocator'))
-+ with tempfile.NamedTemporaryFile() as f:
-+ f.write('--flags USE_EXPERIMENTAL_ALLOCATOR_SHIM=true')
-+ f.flush()
-+
-+ check_call([
-+ os.path.join(SRC_ROOT, 'build', 'write_buildflag_header.py'),
-+ '--output', 'base/allocator/features.h',
-+ '--gen-dir', root_gen_dir,
-+ '--definitions', f.name,
-+ ])
-+
- if is_mac:
- # //base/build_time.cc needs base/generated_build_date.h,
- # and this file is only included for Mac builds.
-@@ -155,13 +168,18 @@ def write_ninja(path, root_gen_dir, options):
- else:
- cflags.extend(['-O2', '-g0'])
-
-- cflags.extend(['-D_FILE_OFFSET_BITS=64', '-pthread', '-pipe'])
-+ cflags.extend([
-+ '-D_FILE_OFFSET_BITS=64',
-+ '-pthread',
-+ '-pipe',
-+ '-fno-exceptions'
-+ ])
- cflags_cc.extend(['-std=c++11', '-Wno-c++11-narrowing'])
-
- static_libraries = {
-- 'base': {'sources': [], 'tool': 'cxx'},
-- 'dynamic_annotations': {'sources': [], 'tool': 'cc'},
-- 'gn': {'sources': [], 'tool': 'cxx'},
-+ 'base': {'sources': [], 'tool': 'cxx', 'include_dirs': []},
-+ 'dynamic_annotations': {'sources': [], 'tool': 'cc', 'include_dirs': []},
-+ 'gn': {'sources': [], 'tool': 'cxx', 'include_dirs': []},
- }
-
- for name in os.listdir(GN_ROOT):
-@@ -181,6 +199,7 @@ def write_ninja(path, root_gen_dir, options):
- ])
- static_libraries['base']['sources'].extend([
- 'base/allocator/allocator_extension.cc',
-+ 'base/allocator/allocator_shim.cc',
- 'base/at_exit.cc',
- 'base/base_paths.cc',
- 'base/base_switches.cc',
-@@ -220,10 +239,11 @@ def write_ninja(path, root_gen_dir, options):
- 'base/metrics/bucket_ranges.cc',
- 'base/metrics/histogram.cc',
- 'base/metrics/histogram_base.cc',
-- 'base/metrics/histogram_persistence.cc',
- 'base/metrics/histogram_samples.cc',
- 'base/metrics/metrics_hashes.cc',
-+ 'base/metrics/persistent_histogram_allocator.cc',
- 'base/metrics/persistent_memory_allocator.cc',
-+ 'base/metrics/persistent_sample_map.cc',
- 'base/metrics/sample_map.cc',
- 'base/metrics/sample_vector.cc',
- 'base/metrics/sparse_histogram.cc',
-@@ -276,6 +296,8 @@ def write_ninja(path, root_gen_dir, options):
- 'base/timer/timer.cc',
- 'base/trace_event/heap_profiler_allocation_context.cc',
- 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
-+ 'base/trace_event/heap_profiler_allocation_register.cc',
-+ 'base/trace_event/heap_profiler_heap_dump_writer.cc',
- 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
- 'base/trace_event/heap_profiler_type_name_deduplicator.cc',
- 'base/trace_event/memory_allocator_dump.cc',
-@@ -328,6 +350,7 @@ def write_ninja(path, root_gen_dir, options):
- 'base/threading/thread_local_storage_posix.cc',
- 'base/threading/worker_pool_posix.cc',
- 'base/time/time_posix.cc',
-+ 'base/trace_event/heap_profiler_allocation_register_posix.cc',
- ])
- static_libraries['libevent'] = {
- 'sources': [
-@@ -362,6 +385,7 @@ def write_ninja(path, root_gen_dir, options):
- 'tool': 'cxx',
- }
- static_libraries['base']['sources'].extend([
-+ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
- 'base/memory/shared_memory_posix.cc',
- 'base/nix/xdg_util.cc',
- 'base/process/internal_linux.cc',
diff --git a/www-client/chromium/files/chromium-gn-r1.patch b/www-client/chromium/files/chromium-gn-r1.patch
deleted file mode 100644
index d892941..00000000
--- a/www-client/chromium/files/chromium-gn-r1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 2262ab4a801745012ebe7da7ae15bafdf0bc2f79..3d996366f36ce052f57f2430dfe396dc5285cc59 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -291,6 +291,7 @@ def write_ninja(path, root_gen_dir, options):
- 'base/thread_task_runner_handle.cc',
- 'base/threading/non_thread_safe_impl.cc',
- 'base/threading/post_task_and_reply_impl.cc',
-+ 'base/threading/sequenced_task_runner_handle.cc',
- 'base/threading/sequenced_worker_pool.cc',
- 'base/threading/simple_thread.cc',
- 'base/threading/thread.cc',
---- a/build/toolchain/gcc_toolchain.gni.orig 2016-05-06 10:44:53.493297905 +0000
-+++ b/build/toolchain/gcc_toolchain.gni 2016-05-06 10:46:27.391223437 +0000
-@@ -410,13 +410,6 @@
- target_os = target_os
- target_cpu = target_cpu
-
-- forward_variables_from(invoker,
-- [
-- "use_allocator",
-- "use_gold",
-- "symbol_level",
-- ])
--
- if (defined(invoker.is_clang)) {
- is_clang = invoker.is_clang
- }
-@@ -426,6 +419,15 @@
- if (defined(invoker.is_nacl_glibc)) {
- is_nacl_glibc = invoker.is_nacl_glibc
- }
-+ if (defined(invoker.symbol_level)) {
-+ symbol_level = invoker.symbol_level
-+ }
-+ if (defined(invoker.use_allocator)) {
-+ use_allocator = invoker.use_allocator
-+ }
-+ if (defined(invoker.use_gold)) {
-+ use_gold = invoker.use_gold
-+ }
-
- if (defined(invoker.clear_sanitizers) && invoker.clear_sanitizers) {
- is_asan = false
diff --git a/www-client/chromium/files/chromium-gn-r2.patch b/www-client/chromium/files/chromium-gn-r2.patch
deleted file mode 100644
index e304829..00000000
--- a/www-client/chromium/files/chromium-gn-r2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Patch by saiarcot895, https://codereview.chromium.org/2059803002
-
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 4648b540acbbba5666ea6a1c4b832e3706f7e642..72ffd6093d22dfa993f523ed425bcec8d3320b02 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -316,6 +316,7 @@ def write_ninja(path, root_gen_dir, options):
- 'base/trace_event/memory_dump_manager.cc',
- 'base/trace_event/memory_dump_request_args.cc',
- 'base/trace_event/memory_dump_session_state.cc',
-+ 'base/trace_event/memory_infra_background_whitelist.cc',
- 'base/trace_event/process_memory_dump.cc',
- 'base/trace_event/process_memory_maps.cc',
- 'base/trace_event/process_memory_totals.cc',
-@@ -353,6 +354,7 @@ def write_ninja(path, root_gen_dir, options):
- 'base/process/process_posix.cc',
- 'base/synchronization/condition_variable_posix.cc',
- 'base/synchronization/lock_impl_posix.cc',
-+ 'base/synchronization/read_write_lock_posix.cc',
- 'base/synchronization/waitable_event_posix.cc',
- 'base/sys_info_posix.cc',
- 'base/threading/platform_thread_internal_posix.cc',
diff --git a/www-client/chromium/files/chromium-gn-r3.patch b/www-client/chromium/files/chromium-gn-r3.patch
deleted file mode 100644
index b29a6ae..00000000
--- a/www-client/chromium/files/chromium-gn-r3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 9a3740e8..fa81d10 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -427,6 +427,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/profiler/scoped_tracker.cc',
- 'base/profiler/tracked_time.cc',
- 'base/run_loop.cc',
-+ 'base/sequence_token.cc',
- 'base/sequence_checker_impl.cc',
- 'base/sequenced_task_runner.cc',
- 'base/sha1.cc',
-@@ -439,7 +440,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/strings/stringprintf.cc',
- 'base/strings/utf_string_conversion_utils.cc',
- 'base/strings/utf_string_conversions.cc',
-- 'base/synchronization/cancellation_flag.cc',
-+ 'base/synchronization/atomic_flag.cc',
- 'base/synchronization/lock.cc',
- 'base/sys_info.cc',
- 'base/task_runner.cc',
diff --git a/www-client/chromium/files/chromium-gn-r4.patch b/www-client/chromium/files/chromium-gn-r4.patch
deleted file mode 100644
index 53f208b..00000000
--- a/www-client/chromium/files/chromium-gn-r4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index fa81d10..aab92c2 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -373,6 +373,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/base_switches.cc',
- 'base/callback_internal.cc',
- 'base/command_line.cc',
-+ 'base/debug/activity_tracker.cc',
- 'base/debug/alias.cc',
- 'base/debug/stack_trace.cc',
- 'base/debug/task_annotator.cc',
diff --git a/www-client/chromium/files/chromium-gn-r5.patch b/www-client/chromium/files/chromium-gn-r5.patch
deleted file mode 100644
index beb844f..00000000
--- a/www-client/chromium/files/chromium-gn-r5.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index aab92c243167769cb7ccbb2bd50672800ab43e3e..b07fd0a8eaf139e4d09e1641ce265353a3cd3ee5 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -445,6 +445,21 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/synchronization/lock.cc',
- 'base/sys_info.cc',
- 'base/task_runner.cc',
-+ 'base/task_scheduler/delayed_task_manager.cc',
-+ 'base/task_scheduler/post_task.cc',
-+ 'base/task_scheduler/priority_queue.cc',
-+ 'base/task_scheduler/scheduler_lock_impl.cc',
-+ 'base/task_scheduler/scheduler_service_thread.cc',
-+ 'base/task_scheduler/scheduler_worker.cc',
-+ 'base/task_scheduler/scheduler_worker_pool_impl.cc',
-+ 'base/task_scheduler/scheduler_worker_stack.cc',
-+ 'base/task_scheduler/sequence.cc',
-+ 'base/task_scheduler/sequence_sort_key.cc',
-+ 'base/task_scheduler/task.cc',
-+ 'base/task_scheduler/task_scheduler.cc',
-+ 'base/task_scheduler/task_scheduler_impl.cc',
-+ 'base/task_scheduler/task_tracker.cc',
-+ 'base/task_scheduler/task_traits.cc',
- 'base/third_party/dmg_fp/dtoa_wrapper.cc',
- 'base/third_party/dmg_fp/g_fmt.cc',
- 'base/third_party/icu/icu_utf.cc',
diff --git a/www-client/chromium/files/chromium-gn-r6.patch b/www-client/chromium/files/chromium-gn-r6.patch
deleted file mode 100644
index 0273f4e..00000000
--- a/www-client/chromium/files/chromium-gn-r6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index b07fd0a8eaf139e4d09e1641ce265353a3cd3ee5..e8304549335350915380731713643cd57ec70407 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -397,7 +397,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/location.cc',
- 'base/logging.cc',
- 'base/md5.cc',
-- 'base/memory/ref_counted.cc',
- 'base/memory/ref_counted_memory.cc',
- 'base/memory/singleton.cc',
- 'base/memory/weak_ptr.cc',
diff --git a/www-client/chromium/files/chromium-gn-r7.patch b/www-client/chromium/files/chromium-gn-r7.patch
deleted file mode 100644
index dc57ccc..00000000
--- a/www-client/chromium/files/chromium-gn-r7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index e8304549335350915380731713643cd57ec70407..b6a113d390d61db32736333c312f90124a44086c 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -379,6 +379,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/debug/task_annotator.cc',
- 'base/environment.cc',
- 'base/files/file.cc',
-+ 'base/files/file_descriptor_watcher_posix.cc',
- 'base/files/file_enumerator.cc',
- 'base/files/file_path.cc',
- 'base/files/file_path_constants.cc',
-@@ -397,6 +398,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/location.cc',
- 'base/logging.cc',
- 'base/md5.cc',
-+ 'base/memory/ref_counted.cc',
- 'base/memory/ref_counted_memory.cc',
- 'base/memory/singleton.cc',
- 'base/memory/weak_ptr.cc',
-@@ -685,7 +687,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/timer/hi_res_timer_manager_win.cc',
- 'base/trace_event/heap_profiler_allocation_register_win.cc',
- 'base/trace_event/trace_event_etw_export_win.cc',
-- 'base/trace_event/winheap_dump_provider_win.cc',
- 'base/win/enum_variant.cc',
- 'base/win/event_trace_controller.cc',
- 'base/win/event_trace_provider.cc',
diff --git a/www-client/chromium/files/chromium-gnome-r0.patch b/www-client/chromium/files/chromium-gnome-r0.patch
deleted file mode 100644
index 7a8c0a9..00000000
--- a/www-client/chromium/files/chromium-gnome-r0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: ui/accessibility/platform/atk_util_auralinux.cc
-diff --git a/ui/accessibility/platform/atk_util_auralinux.cc b/ui/accessibility/platform/atk_util_auralinux.cc
-index a15df08137d874609305f90a6bca6e5c15e5c213..7fcaf219351289fe7eba1f670d7a6743a8b40ddc 100644
---- a/ui/accessibility/platform/atk_util_auralinux.cc
-+++ b/ui/accessibility/platform/atk_util_auralinux.cc
-@@ -3,7 +3,9 @@
- // found in the LICENSE file.
-
- #include <atk/atk.h>
-+#if defined(USE_GCONF)
- #include <gconf/gconf-client.h>
-+#endif
- #include <glib-2.0/gmodule.h>
-
- #include "base/files/file_path.h"
-@@ -14,6 +16,8 @@
-
- namespace {
-
-+#if defined(USE_GCONF)
-+
- const char kGnomeAccessibilityEnabledKey[] =
- "/desktop/gnome/interface/accessibility";
-
-@@ -39,6 +43,15 @@ bool ShouldEnableAccessibility() {
- return value;
- }
-
-+#else // !defined(USE_GCONF)
-+
-+bool ShouldEnableAccessibility() {
-+ // TODO(k.czech): implement this for non-GNOME desktops.
-+ return false;
-+}
-+
-+#endif // defined(USE_GCONF)
-+
- } // namespace
-
- G_BEGIN_DECLS
diff --git a/www-client/chromium/files/chromium-hotwording-2403.patch b/www-client/chromium/files/chromium-hotwording-2403.patch
deleted file mode 100644
index a3904ad..00000000
--- a/www-client/chromium/files/chromium-hotwording-2403.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From c2a0c6df7d468da9864c56f2099aa947b07e2535 Mon Sep 17 00:00:00 2001
-From: amistry <amistry@chromium.org>
-Date: Tue, 9 Jun 2015 12:18:39 -0700
-Subject: [PATCH] Add build flag to disable hotwording.
-
-Hotwording downloads a shared module from the web store containing a NaCl module. There is a desire to build and distribute Chromium without this happening. This change adds an "enable_hotwording" build flag that is enabled by default, but can be disabled at compile time.
-
-BUG=491435
-
-Review URL: https://codereview.chromium.org/1160243004
-
-Cr-Commit-Position: refs/heads/master@{#333548}
-
-Conflicts:
- chrome/browser/search/hotword_service.cc
----
- build/common.gypi | 4 ++++
- chrome/browser/BUILD.gn | 9 +++++++++
- chrome/browser/search/hotword_service.cc | 4 ++++
- chrome/browser/search/hotword_service_unittest.cc | 4 ++++
- chrome/chrome_browser.gypi | 3 +++
- 5 files changed, 24 insertions(+)
-
-diff --git a/build/common.gypi b/build/common.gypi
-index 339cc75..ddb075c 100644
---- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -381,6 +381,9 @@
- # Web speech is enabled by default. Set to 0 to disable.
- 'enable_web_speech%': 1,
-
-+ # 'Ok Google' hotwording is enabled by default. Set to 0 to disable.
-+ 'enable_hotwording%': 1,
-+
- # Notifications are compiled in by default. Set to 0 to disable.
- 'notifications%' : 1,
-
-@@ -1134,6 +1137,7 @@
- 'configuration_policy%': '<(configuration_policy)',
- 'safe_browsing%': '<(safe_browsing)',
- 'enable_web_speech%': '<(enable_web_speech)',
-+ 'enable_hotwording%': '<(enable_hotwording)',
- 'notifications%': '<(notifications)',
- 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
- 'mac_want_real_dsym%': '<(mac_want_real_dsym)',
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 5152d83..6ccb079 100644
---- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -18,6 +18,11 @@ if (is_desktop_linux) {
- import("//build/config/linux/pkg_config.gni")
- }
-
-+declare_args() {
-+ # 'Ok Google' hotwording is enabled.
-+ enable_hotwording = true
-+}
-+
- about_credits_file = "$target_gen_dir/about_credits.html"
- additional_modules_list_file =
- "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
-@@ -455,6 +460,10 @@ source_set("browser") {
- }
- }
-
-+ if (enable_hotwording) {
-+ defines += [ "ENABLE_HOTWORDING" ]
-+ }
-+
- if (is_linux) {
- deps += [
- "//device/media_transfer_protocol",
-diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
-index 0cf3c60..e93789b 100644
---- a/chrome/browser/search/hotword_service.cc
-+++ b/chrome/browser/search/hotword_service.cc
-@@ -642,6 +642,7 @@ bool HotwordService::IsServiceAvailable() {
- }
-
- bool HotwordService::IsHotwordAllowed() {
-+#if defined(ENABLE_HOTWORDING)
- std::string group = base::FieldTrialList::FindFullName(
- hotword_internal::kHotwordFieldTrialName);
- // Allow hotwording by default, and only disable if the field trial has been
-@@ -650,6 +651,9 @@ bool HotwordService::IsHotwordAllowed() {
- return false;
-
- return DoesHotwordSupportLanguage(profile_);
-+#else
-+ return false;
-+#endif
- }
-
- bool HotwordService::IsOptedIntoAudioLogging() {
-diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
-index a3aef47..b0b5927 100644
---- a/chrome/browser/search/hotword_service_unittest.cc
-+++ b/chrome/browser/search/hotword_service_unittest.cc
-@@ -216,6 +216,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedInvalidFieldTrial) {
- }
-
- TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
-+#if defined(ENABLE_HOTWORDING)
- TestingProfile::Builder profile_builder;
- scoped_ptr<TestingProfile> profile = profile_builder.Build();
-
-@@ -246,6 +247,7 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
- Profile* otr_profile = profile->GetOffTheRecordProfile();
- SetApplicationLocale(otr_profile, "en");
- EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(otr_profile));
-+#endif // defined(ENABLE_HOTWORDING)
- }
-
- TEST_P(HotwordServiceTest, ShouldReinstallExtension) {
-@@ -302,6 +304,7 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) {
- }
-
- TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
-+#if defined(ENABLE_HOTWORDING)
- InitializeEmptyExtensionService();
- service_->Init();
-
-@@ -372,6 +375,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
- EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile()));
- EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
- EXPECT_EQ(1, hotword_service->uninstall_count()); // no change
-+#endif // defined(ENABLE_HOTWORDING)
- }
-
- TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) {
-diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
-index 6d323eb..1aaedba 100644
---- a/chrome/chrome_browser.gypi
-+++ b/chrome/chrome_browser.gypi
-@@ -3529,6 +3529,9 @@
- ['enable_session_service==1', {
- 'sources': [ '<@(chrome_browser_session_service_sources)' ],
- }],
-+ ['enable_hotwording==1', {
-+ 'defines': [ 'ENABLE_HOTWORDING' ],
-+ }],
- ['OS!="android" and OS!="ios" and chromeos==0', {
- 'sources': [ '<@(chrome_browser_desktop_sources)' ],
- }],
---
-2.4.4
-
diff --git a/www-client/chromium/files/chromium-last-commit-position-r0.patch b/www-client/chromium/files/chromium-last-commit-position-r0.patch
deleted file mode 100644
index 344ed4c..00000000
--- a/www-client/chromium/files/chromium-last-commit-position-r0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- tools/gn/gn_main.cc.orig 2015-11-12 11:49:56.260549036 +0000
-+++ tools/gn/gn_main.cc 2015-11-12 11:50:14.780931485 +0000
-@@ -11,13 +11,7 @@
- #include "tools/gn/standard_out.h"
- #include "tools/gn/switches.h"
-
--// Only the GN-generated build makes this header for now.
--// TODO(brettw) consider adding this if we need it in GYP.
--#if defined(GN_BUILD)
--#include "tools/gn/last_commit_position.h"
--#else
- #define LAST_COMMIT_POSITION "UNKNOWN"
--#endif
-
- namespace {
-
---- tools/gn/BUILD.gn.orig 2015-11-12 11:50:43.513524769 +0000
-+++ tools/gn/BUILD.gn 2015-11-12 11:50:57.697817632 +0000
-@@ -227,7 +227,6 @@
-
- deps = [
- ":gn_lib",
-- ":last_commit_position",
- "//base",
- "//build/config/sanitizers:deps",
- ]
diff --git a/www-client/chromium/files/chromium-last-commit-position-r1.patch b/www-client/chromium/files/chromium-last-commit-position-r1.patch
deleted file mode 100644
index 700a86e..00000000
--- a/www-client/chromium/files/chromium-last-commit-position-r1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/tools/gn/gn_main.cc.orig 2015-11-12 11:49:56.260549036 +0000
-+++ b/tools/gn/gn_main.cc 2015-11-12 11:50:14.780931485 +0000
-@@ -11,13 +11,7 @@
- #include "tools/gn/standard_out.h"
- #include "tools/gn/switches.h"
-
--// Only the GN-generated build makes this header for now.
--// TODO(brettw) consider adding this if we need it in GYP.
--#if defined(GN_BUILD)
--#include "tools/gn/last_commit_position.h"
--#else
- #define LAST_COMMIT_POSITION "UNKNOWN"
--#endif
-
- namespace {
-
---- a/tools/gn/BUILD.gn.orig 2015-11-12 11:50:43.513524769 +0000
-+++ b/tools/gn/BUILD.gn 2015-11-12 11:50:57.697817632 +0000
-@@ -227,7 +227,6 @@
-
- deps = [
- ":gn_lib",
-- ":last_commit_position",
- "//base",
- "//build/config/sanitizers:deps",
- ]
diff --git a/www-client/chromium/files/chromium-libsecret-r0.patch b/www-client/chromium/files/chromium-libsecret-r0.patch
deleted file mode 100644
index e55b0f7..00000000
--- a/www-client/chromium/files/chromium-libsecret-r0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
-index af7c775..e32fd13 100644
---- a/chrome/chrome_browser.gypi
-+++ b/chrome/chrome_browser.gypi
-@@ -3246,6 +3246,9 @@
- 'defines': [
- 'USE_LIBSECRET',
- ],
-+ 'cflags': [
-+ '<!@(pkg-config --cflags libsecret-1)',
-+ ],
- }],
- ['use_aura==1', {
- 'sources': [ '<@(chrome_browser_aura_sources)' ],
diff --git a/www-client/chromium/files/chromium-linker-warnings-r0.patch b/www-client/chromium/files/chromium-linker-warnings-r0.patch
deleted file mode 100644
index 97d5e16..00000000
--- a/www-client/chromium/files/chromium-linker-warnings-r0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- build/config/compiler/BUILD.gn.orig 2016-05-30 13:50:15.341749039 +0000
-+++ build/config/compiler/BUILD.gn 2016-05-30 13:50:30.502061407 +0000
-@@ -203,15 +203,6 @@
- cflags += [ "-fstack-protector" ]
- }
- }
--
-- # Linker warnings.
-- if (!(is_chromeos && current_cpu == "arm") &&
-- !(is_android && use_order_profiling) && !is_mac && !is_ios) {
-- # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
-- # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
-- # crbug.com/485542
-- ldflags += [ "-Wl,--fatal-warnings" ]
-- }
- }
-
- if (is_clang && is_debug) {
diff --git a/www-client/chromium/files/chromium-pdfium-r0.patch b/www-client/chromium/files/chromium-pdfium-r0.patch
deleted file mode 100644
index 2ba2684..00000000
--- a/www-client/chromium/files/chromium-pdfium-r0.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- third_party/pdfium/xfa/fxbarcode/utils.h.orig 2016-05-30 10:24:54.071773744 +0000
-+++ third_party/pdfium/xfa/fxbarcode/utils.h 2016-05-30 10:25:15.808219373 +0000
-@@ -26,12 +26,10 @@
- #endif
- #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_)
- #define FXSYS_isnan(x) _isnan(x)
--#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_)
-+#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_ || \
-+ _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_)
- #include <cmath>
- #define FXSYS_isnan(x) std::isnan(x)
--#elif(_FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_)
--#include <math.h>
--#define FXSYS_isnan(x) isnan(x)
- #endif
- #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_)
- #define FXSYS_nan() (std::numeric_limits<float>::quiet_NaN())
diff --git a/www-client/chromium/files/chromium-rpath-r0.patch b/www-client/chromium/files/chromium-rpath-r0.patch
deleted file mode 100644
index 244e012..00000000
--- a/www-client/chromium/files/chromium-rpath-r0.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Index: base/BUILD.gn
-diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 9e4270d26009f853e37dc7af883bed4cb43705c8..7d67f62a688b0214bd3eb95a3cd4612bdd273b6d 100644
---- a/base/BUILD.gn
-+++ b/base/BUILD.gn
-@@ -1562,11 +1562,18 @@ test("base_unittests") {
- if (is_linux) {
- sources -= [ "file_version_info_unittest.cc" ]
- sources += [ "nix/xdg_util_unittest.cc" ]
-+
- deps += [ "//base/test:malloc_wrapper" ]
-
- if (use_glib) {
- configs += [ "//build/config/linux:glib" ]
- }
-+
-+ if (!is_component_build) {
-+ # Set rpath so that we find libmalloc_wrapper.so
-+ # even in a non-component build.
-+ configs += [ "//build/config/gcc:rpath_link" ]
-+ }
- }
-
- if (!is_linux || use_ozone) {
-Index: build/config/gcc/BUILD.gn
-diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn
-index b6ab1d4b96ba7ba9a39409006f949569551f92d2..9bc16d9e0d918096cec7124ccf20f145643824b8 100644
---- a/build/config/gcc/BUILD.gn
-+++ b/build/config/gcc/BUILD.gn
-@@ -20,14 +20,8 @@ config("symbol_visibility_hidden") {
- cflags = [ "-fvisibility=hidden" ]
- }
-
--# Settings for executables and shared libraries.
--config("executable_ldconfig") {
-- if (is_android) {
-- ldflags = [
-- "-Bdynamic",
-- "-Wl,-z,nocopyreloc",
-- ]
-- } else {
-+config("rpath_link") {
-+ if (!is_android) {
- # Note: Android doesn't support rpath.
- rpath_link = ""
- if (shlib_subdir != ".") {
-@@ -37,7 +31,25 @@ config("executable_ldconfig") {
- # Want to pass "\$". GN will re-escape as required for ninja.
- "-Wl,-rpath=\$ORIGIN/${rpath_link}",
- "-Wl,-rpath-link=${rpath_link}",
-+ ]
-+ }
-+}
-
-+# Settings for executables and shared libraries.
-+config("executable_ldconfig") {
-+ if (is_android) {
-+ ldflags = [
-+ "-Bdynamic",
-+ "-Wl,-z,nocopyreloc",
-+ ]
-+ } else {
-+ if (is_component_build) {
-+ configs += [ ":rpath_link" ]
-+ }
-+
-+ ldflags = [
-+ # TODO(GYP): Do we need a check on the binutils version here?
-+ #
- # Newer binutils don't set DT_RPATH unless you disable "new" dtags
- # and the new DT_RUNPATH doesn't work without --no-as-needed flag.
- "-Wl,--disable-new-dtags",
diff --git a/www-client/chromium/files/chromium-snapshot-toolchain-r0.patch b/www-client/chromium/files/chromium-snapshot-toolchain-r0.patch
deleted file mode 100644
index 629ef80..00000000
--- a/www-client/chromium/files/chromium-snapshot-toolchain-r0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- v8/snapshot_toolchain.gni.orig 2015-11-12 15:24:59.332391956 +0000
-+++ v8/snapshot_toolchain.gni 2015-11-12 15:25:23.280889700 +0000
-@@ -28,19 +28,4 @@
- # The snapshot needs to be compiled for the host, but compiled with
- # a toolchain that matches the bit-width of the target.
-
--# TODO(GYP): For now we only support 32-bit little-endian target builds from an
--# x64 Linux host. Eventually we need to support all of the host/target
--# configurations v8 runs on.
--if (host_cpu == "x64" && host_os == "linux") {
-- if (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu == "x86") {
-- snapshot_toolchain = "//build/toolchain/linux:clang_x86"
-- } else if (target_cpu == "x64") {
-- snapshot_toolchain = "//build/toolchain/linux:clang_x64"
-- } else {
-- assert(false, "Need environment for this arch")
-- }
--} else {
-- snapshot_toolchain = default_toolchain
--}
--
--
-+snapshot_toolchain = default_toolchain
diff --git a/www-client/chromium/files/chromium-snapshot-toolchain-r1.patch b/www-client/chromium/files/chromium-snapshot-toolchain-r1.patch
deleted file mode 100644
index 56f35b3..00000000
--- a/www-client/chromium/files/chromium-snapshot-toolchain-r1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- v8/snapshot_toolchain.gni.orig 2016-01-07 15:47:46.772435180 +0000
-+++ v8/snapshot_toolchain.gni 2016-01-07 15:48:06.144841801 +0000
-@@ -28,19 +28,4 @@
- # The snapshot needs to be compiled for the host, but compiled with
- # a toolchain that matches the bit-width of the target.
-
--# TODO(GYP): For now we only support 32-bit little-endian target builds from an
--# x64 Linux host. Eventually we need to support all of the host/target
--# configurations v8 runs on.
--if (host_cpu == "x64" && host_os == "linux") {
-- if (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu == "x86") {
-- snapshot_toolchain = "//build/toolchain/linux:clang_x86"
-- } else if (target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "mips64el") {
-- snapshot_toolchain = "//build/toolchain/linux:clang_x64"
-- } else {
-- assert(false, "Need environment for this arch: $target_cpu")
-- }
--} else {
-- snapshot_toolchain = default_toolchain
--}
--
--
-+snapshot_toolchain = default_toolchain
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r0.patch b/www-client/chromium/files/chromium-system-ffmpeg-r0.patch
deleted file mode 100644
index 667e0ec..00000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
-index 677bd76..23a21f8 100644
---- a/media/ffmpeg/ffmpeg_common.h
-+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -19,20 +19,12 @@
-
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings. This
--// list of defines must mirror those in the 'defines' section of the ffmpeg.gyp
--// file or the headers below will generate different structures.
--#define FF_API_PIX_FMT_DESC 0
--#define FF_API_OLD_DECODE_AUDIO 0
--#define FF_API_DESTRUCT_PACKET 0
--#define FF_API_GET_BUFFER 0
-
- // Temporarily disable possible loss of data warning.
- // TODO(scherkus): fix and upstream the compiler warnings.
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index 155e980..7ba327a 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -966,24 +966,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb,
- // If no estimate is found, the stream entry will be kInfiniteDuration().
- std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
- kInfiniteDuration());
-- const AVFormatInternal* internal = format_context->internal;
-- if (internal && internal->packet_buffer &&
-- format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) {
-- struct AVPacketList* packet_buffer = internal->packet_buffer;
-- while (packet_buffer != internal->packet_buffer_end) {
-- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
-- start_time_estimates.size());
-- const AVStream* stream =
-- format_context->streams[packet_buffer->pkt.stream_index];
-- if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) {
-- const base::TimeDelta packet_pts =
-- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
-- if (packet_pts < start_time_estimates[stream->index])
-- start_time_estimates[stream->index] = packet_pts;
-- }
-- packet_buffer = packet_buffer->next;
-- }
-- }
-
- AVStream* audio_stream = NULL;
- AudioDecoderConfig audio_config;
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r1.patch b/www-client/chromium/files/chromium-system-ffmpeg-r1.patch
deleted file mode 100644
index c9f6ce0..00000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:01:56.155462264 +0000
-+++ b/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:03:03.348846300 +0000
-@@ -19,10 +19,6 @@
-
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings. This
--// list of defines must mirror those in the 'defines' section of BUILD.gn file &
--// ffmpeg.gyp file or the headers below will generate different structures!
--#define FF_API_CONVERGENCE_DURATION 0
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -36,7 +32,6 @@
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index 155e980..7ba327a 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -966,24 +966,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb,
- // If no estimate is found, the stream entry will be kInfiniteDuration().
- std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
- kInfiniteDuration());
-- const AVFormatInternal* internal = format_context->internal;
-- if (internal && internal->packet_buffer &&
-- format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) {
-- struct AVPacketList* packet_buffer = internal->packet_buffer;
-- while (packet_buffer != internal->packet_buffer_end) {
-- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
-- start_time_estimates.size());
-- const AVStream* stream =
-- format_context->streams[packet_buffer->pkt.stream_index];
-- if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) {
-- const base::TimeDelta packet_pts =
-- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
-- if (packet_pts < start_time_estimates[stream->index])
-- start_time_estimates[stream->index] = packet_pts;
-- }
-- packet_buffer = packet_buffer->next;
-- }
-- }
-
- AVStream* audio_stream = NULL;
- AudioDecoderConfig audio_config;
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r2.patch b/www-client/chromium/files/chromium-system-ffmpeg-r2.patch
deleted file mode 100644
index 8d67ef3..00000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:01:56.155462264 +0000
-+++ b/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:03:03.348846300 +0000
-@@ -19,10 +19,6 @@
-
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings. This
--// list of defines must mirror those in the 'defines' section of BUILD.gn file &
--// ffmpeg.gyp file or the headers below will generate different structures!
--#define FF_API_CONVERGENCE_DURATION 0
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -36,7 +32,6 @@
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index 155e980..7ba327a 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -1034,24 +1034,6 @@
- // If no estimate is found, the stream entry will be kInfiniteDuration().
- std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
- kInfiniteDuration());
-- const AVFormatInternal* internal = format_context->internal;
-- if (internal && internal->packet_buffer &&
-- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-- struct AVPacketList* packet_buffer = internal->packet_buffer;
-- while (packet_buffer != internal->packet_buffer_end) {
-- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
-- start_time_estimates.size());
-- const AVStream* stream =
-- format_context->streams[packet_buffer->pkt.stream_index];
-- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
-- const base::TimeDelta packet_pts =
-- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
-- if (packet_pts < start_time_estimates[stream->index])
-- start_time_estimates[stream->index] = packet_pts;
-- }
-- packet_buffer = packet_buffer->next;
-- }
-- }
-
- AVStream* audio_stream = NULL;
- AudioDecoderConfig audio_config;
diff --git a/www-client/chromium/files/chromium-system-icu-r0.patch b/www-client/chromium/files/chromium-system-icu-r0.patch
deleted file mode 100644
index e1e2135..00000000
--- a/www-client/chromium/files/chromium-system-icu-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/autofill/core/common/autofill_l10n_util.cc.orig 2015-12-07 11:46:37.738740329 +0000
-+++ components/autofill/core/common/autofill_l10n_util.cc 2015-12-07 11:46:44.574878953 +0000
-@@ -22,7 +22,7 @@
- // library. This could be due to a device-specific issue (has been seen in
- // the wild on Android devices). In the failure case, |collator_| will be
- // null. See http://crbug.com/558625.
-- icu_54::UnicodeString name;
-+ icu::UnicodeString name;
- std::string locale_name;
- locale.getDisplayName(name).toUTF8String(locale_name);
- LOG(ERROR) << "Failed to initialize the ICU Collator for "
diff --git a/www-client/chromium/files/chromium-system-jinja-r10.patch b/www-client/chromium/files/chromium-system-jinja-r10.patch
deleted file mode 100644
index ee00b60..00000000
--- a/www-client/chromium/files/chromium-system-jinja-r10.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
- 'actions': [{
- 'action_name': 'cache_jinja_templates',
- 'inputs': [
-- '<@(jinja_module_files)',
- 'code_generator_v8.py',
- '<@(code_generator_template_files)',
- ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
- 'variables': {
- 'scripts_for_in_files': [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- 'hasher.py',
- 'in_file.py',
- 'in_generator.py',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- 'idl_lexer_parser_files': [
-- # PLY (Python Lex-Yacc)
-- '<(DEPTH)/third_party/ply/lex.py',
-- '<(DEPTH)/third_party/ply/yacc.py',
- # Web IDL lexer/parser (base parser)
- '<(DEPTH)/tools/idl_parser/idl_lexer.py',
- '<(DEPTH)/tools/idl_parser/idl_node.py',
---- third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp.orig 2016-03-23 15:10:41.522637837 +0000
-+++ third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp 2016-03-23 15:10:56.938953740 +0000
-@@ -6,9 +6,6 @@
- 'variables': {
- 'blink_platform_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/platform',
- 'jinja_module_files': [
-- # jinja2/__init__.py contains version string, so sufficient for package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- },
-
---- third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000
-@@ -9,10 +9,6 @@
- _scripts_dir = "//third_party/WebKit/Source/build/scripts"
-
- scripts_for_in_files = [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- "//third_party/jinja2/__init__.py",
-- "//third_party/markupsafe/__init__.py", # jinja2 dep
- "$_scripts_dir/hasher.py",
- "$_scripts_dir/in_file.py",
- "$_scripts_dir/in_generator.py",
---- third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000
-+++ third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02 10:03:13.240907715 +0000
-@@ -36,7 +36,7 @@
- action("cached_jinja_templates") {
- script = "code_generator_v8.py"
-
-- inputs = jinja_module_files + [ "code_generator_v8.py" ] +
-+ inputs = [ "code_generator_v8.py" ] +
- code_generator_template_files
-
- # Dummy file to track dependency.
---- third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp.orig 2016-06-03 12:31:49.844954196 +0000
-+++ third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp 2016-06-03 12:32:01.869198425 +0000
-@@ -60,7 +60,6 @@
- {
- 'action_name': 'generateV8InspectorProtocolBackendSources',
- 'inputs': [
-- '<@(jinja_module_files)',
- # The python script in action below.
- '../inspector_protocol/CodeGenerator.py',
- # Input files for the script.
---- third_party/WebKit/Source/core/inspector/inspector.gyp.orig 2016-06-03 12:38:20.712891692 +0000
-+++ third_party/WebKit/Source/core/inspector/inspector.gyp 2016-06-03 12:38:31.197104557 +0000
-@@ -52,7 +52,6 @@
- {
- 'action_name': 'generateInspectorProtocolBackendSources',
- 'inputs': [
-- '<@(jinja_module_files)',
- # The python script in action below.
- '../../platform/inspector_protocol/CodeGenerator.py',
- # Input files for the script.
diff --git a/www-client/chromium/files/chromium-system-jinja-r11.patch b/www-client/chromium/files/chromium-system-jinja-r11.patch
deleted file mode 100644
index 0b3c9b7..00000000
--- a/www-client/chromium/files/chromium-system-jinja-r11.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
- 'actions': [{
- 'action_name': 'cache_jinja_templates',
- 'inputs': [
-- '<@(jinja_module_files)',
- 'code_generator_v8.py',
- '<@(code_generator_template_files)',
- ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
- 'variables': {
- 'scripts_for_in_files': [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- 'hasher.py',
- 'in_file.py',
- 'in_generator.py',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- 'idl_lexer_parser_files': [
-- # PLY (Python Lex-Yacc)
-- '<(DEPTH)/third_party/ply/lex.py',
-- '<(DEPTH)/third_party/ply/yacc.py',
- # Web IDL lexer/parser (base parser)
- '<(DEPTH)/tools/idl_parser/idl_lexer.py',
- '<(DEPTH)/tools/idl_parser/idl_node.py',
---- third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000
-@@ -9,10 +9,6 @@
- _scripts_dir = "//third_party/WebKit/Source/build/scripts"
-
- scripts_for_in_files = [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- "//third_party/jinja2/__init__.py",
-- "//third_party/markupsafe/__init__.py", # jinja2 dep
- "$_scripts_dir/hasher.py",
- "$_scripts_dir/in_file.py",
- "$_scripts_dir/in_generator.py",
---- third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000
-+++ third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02 10:03:13.240907715 +0000
-@@ -36,7 +36,7 @@
- action("cached_jinja_templates") {
- script = "code_generator_v8.py"
-
-- inputs = jinja_module_files + [ "code_generator_v8.py" ] +
-+ inputs = [ "code_generator_v8.py" ] +
- code_generator_template_files
-
- # Dummy file to track dependency.
---- third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp.orig 2016-06-03 12:31:49.844954196 +0000
-+++ third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp 2016-06-03 12:32:01.869198425 +0000
-@@ -60,7 +60,6 @@
- {
- 'action_name': 'generateV8InspectorProtocolBackendSources',
- 'inputs': [
-- '<@(jinja_module_files)',
- # The python script in action below.
- '../inspector_protocol/CodeGenerator.py',
- # Input files for the script.
---- third_party/WebKit/Source/core/inspector/inspector.gyp.orig 2016-06-03 12:38:20.712891692 +0000
-+++ third_party/WebKit/Source/core/inspector/inspector.gyp 2016-06-03 12:38:31.197104557 +0000
-@@ -52,7 +52,6 @@
- {
- 'action_name': 'generateInspectorProtocolBackendSources',
- 'inputs': [
-- '<@(jinja_module_files)',
- # The python script in action below.
- '../../platform/inspector_protocol/CodeGenerator.py',
- # Input files for the script.
diff --git a/www-client/chromium/files/chromium-system-jinja-r12.patch b/www-client/chromium/files/chromium-system-jinja-r12.patch
deleted file mode 100644
index 869cef9..00000000
--- a/www-client/chromium/files/chromium-system-jinja-r12.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
- 'actions': [{
- 'action_name': 'cache_jinja_templates',
- 'inputs': [
-- '<@(jinja_module_files)',
- 'code_generator_v8.py',
- '<@(code_generator_template_files)',
- ],
---- a/third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000
-+++ b/third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
- 'variables': {
- 'scripts_for_in_files': [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- 'hasher.py',
- 'in_file.py',
- 'in_generator.py',
---- a/third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- 'idl_lexer_parser_files': [
-- # PLY (Python Lex-Yacc)
-- '<(DEPTH)/third_party/ply/lex.py',
-- '<(DEPTH)/third_party/ply/yacc.py',
- # Web IDL lexer/parser (base parser)
- '<(DEPTH)/tools/idl_parser/idl_lexer.py',
- '<(DEPTH)/tools/idl_parser/idl_node.py',
---- a/third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000
-+++ b/third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000
-@@ -9,10 +9,6 @@
- _scripts_dir = "//third_party/WebKit/Source/build/scripts"
-
- scripts_for_in_files = [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- "//third_party/jinja2/__init__.py",
-- "//third_party/markupsafe/__init__.py", # jinja2 dep
- "$_scripts_dir/hasher.py",
- "$_scripts_dir/in_file.py",
- "$_scripts_dir/in_generator.py",
---- a/third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000
-+++ b/third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02 10:03:13.240907715 +0000
-@@ -36,7 +36,7 @@
- action("cached_jinja_templates") {
- script = "code_generator_v8.py"
-
-- inputs = jinja_module_files + [ "code_generator_v8.py" ] +
-+ inputs = [ "code_generator_v8.py" ] +
- code_generator_template_files
-
- # Dummy file to track dependency.
---- a/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp.orig 2016-06-03 12:31:49.844954196 +0000
-+++ b/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp 2016-06-03 12:32:01.869198425 +0000
-@@ -60,7 +60,6 @@
- {
- 'action_name': 'generateV8InspectorProtocolBackendSources',
- 'inputs': [
-- '<@(jinja_module_files)',
- # The python script in action below.
- '../inspector_protocol/CodeGenerator.py',
- # Input files for the script.
---- a/third_party/WebKit/Source/core/inspector/inspector.gyp.orig 2016-06-03 12:38:20.712891692 +0000
-+++ b/third_party/WebKit/Source/core/inspector/inspector.gyp 2016-06-03 12:38:31.197104557 +0000
-@@ -52,7 +52,6 @@
- {
- 'action_name': 'generateInspectorProtocolBackendSources',
- 'inputs': [
-- '<@(jinja_module_files)',
- # The python script in action below.
- '../../platform/inspector_protocol/CodeGenerator.py',
- # Input files for the script.
diff --git a/www-client/chromium/files/chromium-system-jinja-r6.patch b/www-client/chromium/files/chromium-system-jinja-r6.patch
deleted file mode 100644
index 6a3ae46..00000000
--- a/www-client/chromium/files/chromium-system-jinja-r6.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
- 'actions': [{
- 'action_name': 'cache_jinja_templates',
- 'inputs': [
-- '<@(jinja_module_files)',
- 'code_generator_v8.py',
- '<@(code_generator_template_files)',
- ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
- 'variables': {
- 'scripts_for_in_files': [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- 'hasher.py',
- 'in_file.py',
- 'in_generator.py',
---- third_party/WebKit/Source/bindings/core/v8/generated.gyp.orig 2014-08-19 10:15:53.874850750 +0000
-+++ third_party/WebKit/Source/bindings/core/v8/generated.gyp 2014-08-19 10:16:04.163050746 +0000
-@@ -80,7 +80,6 @@
- # Update that regex if command line changes (other than changing flags)
- 'action': [
- 'python',
-- '-S', # skip 'import site' to speed up startup
- '<(bindings_scripts_dir)/idl_compiler.py',
- '--cache-dir',
- '<(bindings_scripts_output_dir)',
---- third_party/WebKit/Source/bindings/modules/v8/generated.gyp.orig 2014-08-19 10:17:07.340279760 +0000
-+++ third_party/WebKit/Source/bindings/modules/v8/generated.gyp 2014-08-19 10:17:13.556400768 +0000
-@@ -68,7 +68,6 @@
- # Update that regex if command line changes (other than changing flags)
- 'action': [
- 'python',
-- '-S', # skip 'import site' to speed up startup
- '<(bindings_scripts_dir)/idl_compiler.py',
- '--cache-dir',
- '<(bindings_scripts_output_dir)',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- 'idl_lexer_parser_files': [
-- # PLY (Python Lex-Yacc)
-- '<(DEPTH)/third_party/ply/lex.py',
-- '<(DEPTH)/third_party/ply/yacc.py',
- # Web IDL lexer/parser (base parser)
- '<(DEPTH)/tools/idl_parser/idl_lexer.py',
- '<(DEPTH)/tools/idl_parser/idl_node.py',
diff --git a/www-client/chromium/files/chromium-system-jinja-r7.patch b/www-client/chromium/files/chromium-system-jinja-r7.patch
deleted file mode 100644
index fe28e12..00000000
--- a/www-client/chromium/files/chromium-system-jinja-r7.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
- 'actions': [{
- 'action_name': 'cache_jinja_templates',
- 'inputs': [
-- '<@(jinja_module_files)',
- 'code_generator_v8.py',
- '<@(code_generator_template_files)',
- ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
- 'variables': {
- 'scripts_for_in_files': [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- 'hasher.py',
- 'in_file.py',
- 'in_generator.py',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- 'idl_lexer_parser_files': [
-- # PLY (Python Lex-Yacc)
-- '<(DEPTH)/third_party/ply/lex.py',
-- '<(DEPTH)/third_party/ply/yacc.py',
- # Web IDL lexer/parser (base parser)
- '<(DEPTH)/tools/idl_parser/idl_lexer.py',
- '<(DEPTH)/tools/idl_parser/idl_node.py',
diff --git a/www-client/chromium/files/chromium-system-jinja-r8.patch b/www-client/chromium/files/chromium-system-jinja-r8.patch
deleted file mode 100644
index e1576ae..00000000
--- a/www-client/chromium/files/chromium-system-jinja-r8.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
- 'actions': [{
- 'action_name': 'cache_jinja_templates',
- 'inputs': [
-- '<@(jinja_module_files)',
- 'code_generator_v8.py',
- '<@(code_generator_template_files)',
- ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
- 'variables': {
- 'scripts_for_in_files': [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- 'hasher.py',
- 'in_file.py',
- 'in_generator.py',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- 'idl_lexer_parser_files': [
-- # PLY (Python Lex-Yacc)
-- '<(DEPTH)/third_party/ply/lex.py',
-- '<(DEPTH)/third_party/ply/yacc.py',
- # Web IDL lexer/parser (base parser)
- '<(DEPTH)/tools/idl_parser/idl_lexer.py',
- '<(DEPTH)/tools/idl_parser/idl_node.py',
---- third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp.orig 2016-03-23 15:10:41.522637837 +0000
-+++ third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp 2016-03-23 15:10:56.938953740 +0000
-@@ -6,9 +6,6 @@
- 'variables': {
- 'blink_platform_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/platform',
- 'jinja_module_files': [
-- # jinja2/__init__.py contains version string, so sufficient for package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- },
-
diff --git a/www-client/chromium/files/chromium-system-jinja-r9.patch b/www-client/chromium/files/chromium-system-jinja-r9.patch
deleted file mode 100644
index 1de9083..00000000
--- a/www-client/chromium/files/chromium-system-jinja-r9.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000
-@@ -54,7 +54,6 @@
- 'actions': [{
- 'action_name': 'cache_jinja_templates',
- 'inputs': [
-- '<@(jinja_module_files)',
- 'code_generator_v8.py',
- '<@(code_generator_template_files)',
- ],
---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000
-@@ -2,10 +2,6 @@
- {
- 'variables': {
- 'scripts_for_in_files': [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- 'hasher.py',
- 'in_file.py',
- 'in_generator.py',
---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000
-+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000
-@@ -12,9 +12,6 @@
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- 'idl_lexer_parser_files': [
-- # PLY (Python Lex-Yacc)
-- '<(DEPTH)/third_party/ply/lex.py',
-- '<(DEPTH)/third_party/ply/yacc.py',
- # Web IDL lexer/parser (base parser)
- '<(DEPTH)/tools/idl_parser/idl_lexer.py',
- '<(DEPTH)/tools/idl_parser/idl_node.py',
---- third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp.orig 2016-03-23 15:10:41.522637837 +0000
-+++ third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp 2016-03-23 15:10:56.938953740 +0000
-@@ -6,9 +6,6 @@
- 'variables': {
- 'blink_platform_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/platform',
- 'jinja_module_files': [
-- # jinja2/__init__.py contains version string, so sufficient for package
-- '<(DEPTH)/third_party/jinja2/__init__.py',
-- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
- ],
- },
-
---- third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000
-+++ third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000
-@@ -9,10 +9,6 @@
- _scripts_dir = "//third_party/WebKit/Source/build/scripts"
-
- scripts_for_in_files = [
-- # jinja2/__init__.py contains version string, so sufficient as
-- # dependency for whole jinja2 package
-- "//third_party/jinja2/__init__.py",
-- "//third_party/markupsafe/__init__.py", # jinja2 dep
- "$_scripts_dir/hasher.py",
- "$_scripts_dir/in_file.py",
- "$_scripts_dir/in_generator.py",
---- third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000
-+++ third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02 10:03:13.240907715 +0000
-@@ -36,7 +36,7 @@
- action("cached_jinja_templates") {
- script = "code_generator_v8.py"
-
-- inputs = jinja_module_files + [ "code_generator_v8.py" ] +
-+ inputs = [ "code_generator_v8.py" ] +
- code_generator_template_files
-
- # Dummy file to track dependency.
diff --git a/www-client/chromium/files/chromium-system-libvpx-r0.patch b/www-client/chromium/files/chromium-system-libvpx-r0.patch
deleted file mode 100644
index d9a3425..00000000
--- a/www-client/chromium/files/chromium-system-libvpx-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/linux/unbundle/libvpx.gyp.orig 2015-04-08 09:25:29.605925761 +0000
-+++ build/linux/unbundle/libvpx.gyp 2015-04-08 09:27:19.932142216 +0000
-@@ -24,6 +24,7 @@
- 'vpx/vpx_integer.h',
- 'vpx/vp8dx.h',
- 'vpx/vpx_encoder.h',
-+ 'vpx/vpx_frame_buffer.h',
- ],
- },
- 'includes': [
diff --git a/www-client/chromium/files/chromium-system-zlib-r0.patch b/www-client/chromium/files/chromium-system-zlib-r0.patch
deleted file mode 100644
index 3bf38e5..00000000
--- a/www-client/chromium/files/chromium-system-zlib-r0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- build/linux/unbundle/zlib.gn.orig 2016-05-30 13:09:56.987716771 +0000
-+++ build/linux/unbundle/zlib.gn 2016-05-30 13:12:36.879014187 +0000
-@@ -9,11 +9,16 @@
- headers = [ "zlib.h" ]
- }
-
-+config("system_zlib") {
-+ defines = [ "USE_SYSTEM_ZLIB=1" ]
-+}
-+
- source_set("zlib") {
- deps = [
- ":zlib_shim",
- ]
- libs = [ "z" ]
-+ public_configs = [ ":system_zlib" ]
- }
-
- shim_headers("minizip_shim") {
diff --git a/www-client/chromium/files/chromium-system-zlib-r1.patch b/www-client/chromium/files/chromium-system-zlib-r1.patch
deleted file mode 100644
index c6a6c40..00000000
--- a/www-client/chromium/files/chromium-system-zlib-r1.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/extensions/browser/api/cast_channel/BUILD.gn.orig 2016-09-23 21:35:47.685867065 +0000
-+++ b/extensions/browser/api/cast_channel/BUILD.gn 2016-09-23 21:36:29.986723126 +0000
-@@ -27,5 +27,6 @@
- deps = [
- "//extensions/common/api",
- "//extensions/common/api/cast_channel:cast_channel_proto",
-+ "//third_party/zlib",
- ]
- }
diff --git a/www-client/chromium/files/chromium-tracing-r0.patch b/www-client/chromium/files/chromium-tracing-r0.patch
deleted file mode 100644
index 7312116..00000000
--- a/www-client/chromium/files/chromium-tracing-r0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/trace-viewer/tracing/build/generate_about_tracing_contents.orig 2015-09-08 13:14:21.048113295 +0000
-+++ third_party/trace-viewer/tracing/build/generate_about_tracing_contents 2015-09-08 13:14:34.232384815 +0000
-@@ -8,6 +8,6 @@
-
- if __name__ == '__main__':
- top_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
-- sys.path.append(top_dir)
-+ sys.path.insert(0, top_dir)
- from tracing.build import generate_about_tracing_contents
- sys.exit(generate_about_tracing_contents.main(sys.argv))
diff --git a/www-client/chromium/files/chromium-werror-r0.patch b/www-client/chromium/files/chromium-werror-r0.patch
deleted file mode 100644
index be0649b..00000000
--- a/www-client/chromium/files/chromium-werror-r0.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: build/config/compiler/BUILD.gn
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 4d3c6ba0c09093bd5137cd32c4d37cdee1db6d40..71d9dc345f89f0f86e0e4e079f3124b682f558c1 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -22,6 +22,11 @@ if (is_win) {
- }
-
- declare_args() {
-+ # Default to warnings as errors for default workflow, where we catch
-+ # warnings with known toolchains. Allow overriding this e.g. for Chromium
-+ # builds on Linux that could use a different version of the compiler.
-+ treat_warnings_as_errors = true
-+
- # Normally, Android builds are lightly optimized, even for debug builds, to
- # keep binary size down. Setting this flag to true disables such optimization
- android_full_debug = false
-@@ -601,10 +606,11 @@ config("default_warnings") {
- cflags_cc = []
-
- if (is_win) {
-- cflags += [
-- # Treat warnings as errors.
-- "/WX",
-+ if (treat_warnings_as_errors) {
-+ cflags += [ "/WX" ]
-+ }
-
-+ cflags += [
- # Warnings permanently disabled:
-
- # C4127: conditional expression is constant
-@@ -704,13 +710,16 @@ config("default_warnings") {
- cflags += [
- # Enables.
- "-Wendif-labels", # Weird old-style text after an #endif.
-- "-Werror", # Warnings as errors.
-
- # Disables.
- "-Wno-missing-field-initializers", # "struct foo f = {0};"
- "-Wno-unused-parameter", # Unused function parameters.
- ]
-
-+ if (treat_warnings_as_errors) {
-+ cflags += [ "-Werror" ]
-+ }
-+
- if (is_mac) {
- cflags += [ "-Wnewline-eof" ]
- if (!is_nacl) {
diff --git a/www-client/chromium/files/chromium-whitelist-arm64-syscalls.patch b/www-client/chromium/files/chromium-whitelist-arm64-syscalls.patch
deleted file mode 100644
index 125f77d..00000000
--- a/www-client/chromium/files/chromium-whitelist-arm64-syscalls.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 4e8083b4ab953ba298aedfc4e79d464be15e4012 Mon Sep 17 00:00:00 2001
-From: "riku.voipio" <riku.voipio@linaro.org>
-Date: Tue, 1 Mar 2016 08:02:43 -0800
-Subject: [PATCH] Linux Sandbox: whitelist arm64 syscalls
-
-On debian/arm64, two syscalls needed whitelisting for chromium to work with seccomp:
-
-epoll_pwait, replacing epoll_wait which is a legacy syscall not available on arm64. epoll_wait implmentation in glibc calls epoll_pwait behind scenes, so this needs to be enabled.
-
-getrlimit, missing #ifdef for arm64 in several policy definitions. test for arm64 added for each case.
-
-BUG=581018
-R=keescook@chromium.org,jln@chromium.org,rsesek@chromium.org
-TEST=Start chrome on arm64 with seccomp enabled kernel
-
-Review URL: https://codereview.chromium.org/1613883002
-
-Cr-Commit-Position: refs/heads/master@{#378440}
----
- components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc | 3 ++-
- content/common/sandbox_linux/bpf_renderer_policy_linux.cc | 3 ++-
- content/common/sandbox_linux/bpf_utility_policy_linux.cc | 3 ++-
- mojo/shell/runner/host/linux_sandbox.cc | 5 ++++-
- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc | 2 +-
- 5 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc b/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
-index 66a606a..3e88304 100644
---- a/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
-+++ b/components/nacl/loader/sandbox_linux/nacl_bpf_sandbox_linux.cc
-@@ -106,7 +106,8 @@ ResultExpr NaClBPFSandboxPolicy::EvaluateSyscall(int sysno) const {
- // NaCl uses custom signal stacks.
- case __NR_sigaltstack:
- // Below is fairly similar to the policy for a Chromium renderer.
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__aarch64__)
- case __NR_getrlimit:
- #endif
- #if defined(__i386__) || defined(__arm__)
-diff --git a/content/common/sandbox_linux/bpf_renderer_policy_linux.cc b/content/common/sandbox_linux/bpf_renderer_policy_linux.cc
-index e799273..993e2a5 100644
---- a/content/common/sandbox_linux/bpf_renderer_policy_linux.cc
-+++ b/content/common/sandbox_linux/bpf_renderer_policy_linux.cc
-@@ -60,7 +60,8 @@ ResultExpr RendererProcessPolicy::EvaluateSyscall(int sysno) const {
- // Allow the system calls below.
- case __NR_fdatasync:
- case __NR_fsync:
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__aarch64__)
- case __NR_getrlimit:
- #endif
- #if defined(__i386__) || defined(__arm__)
-diff --git a/content/common/sandbox_linux/bpf_utility_policy_linux.cc b/content/common/sandbox_linux/bpf_utility_policy_linux.cc
-index 3ead1c8..1336796 100644
---- a/content/common/sandbox_linux/bpf_utility_policy_linux.cc
-+++ b/content/common/sandbox_linux/bpf_utility_policy_linux.cc
-@@ -32,7 +32,8 @@ ResultExpr UtilityProcessPolicy::EvaluateSyscall(int sysno) const {
- // Allow the system calls below.
- case __NR_fdatasync:
- case __NR_fsync:
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+ defined(__aarch64__)
- case __NR_getrlimit:
- #endif
- #if defined(__i386__) || defined(__arm__)
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index 10278dc..b30b3e6 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -414,6 +414,7 @@ bool SyscallSets::IsAllowedEpoll(int sysno) {
- case __NR_epoll_create:
- case __NR_epoll_wait:
- #endif
-+ case __NR_epoll_pwait:
- case __NR_epoll_create1:
- case __NR_epoll_ctl:
- return true;
-@@ -421,7 +422,6 @@ bool SyscallSets::IsAllowedEpoll(int sysno) {
- #if defined(__x86_64__)
- case __NR_epoll_ctl_old:
- #endif
-- case __NR_epoll_pwait:
- #if defined(__x86_64__)
- case __NR_epoll_wait_old:
- #endif
---
-2.7.2
-
diff --git a/www-client/chromium/files/chromium-widevine.patch b/www-client/chromium/files/chromium-widevine.patch
deleted file mode 100644
index 04e560e..00000000
--- a/www-client/chromium/files/chromium-widevine.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h.orig 2014-12-10 05:36:13.000000000 +0100
-+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm_version.h 2014-12-28 20:47:39.080795240 +0100
-@@ -14,4 +14,8 @@
- // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
- // as a string, e.g., "1.0.123.456").
-
-+#include "third_party/widevine/cdm/widevine_cdm_common.h"
-+#define WIDEVINE_CDM_AVAILABLE
-+#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
-+
- #endif // WIDEVINE_CDM_VERSION_H_
---- chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp.orig 2014-12-10 05:54:35.000000000 +0100
-+++ chromium-39.0.2171.95/third_party/widevine/cdm/widevine_cdm.gyp 2014-12-28 20:50:48.163269989 +0100
-@@ -7,7 +7,7 @@
- 'widevine_cdm_version_h_file%': 'widevine_cdm_version.h',
- 'widevine_cdm_binary_files%': [],
- 'conditions': [
-- [ 'branding == "Chrome"', {
-+ [ 'branding == "Chromium"', {
- 'conditions': [
- [ 'chromeos == 1', {
- 'widevine_cdm_version_h_file%':
-@@ -54,7 +54,7 @@
- 'target_name': 'widevinecdmadapter',
- 'type': 'none',
- 'conditions': [
-- [ 'branding == "Chrome" and enable_pepper_cdms==1', {
-+ [ 'branding == "Chromium" and enable_pepper_cdms==1', {
- 'dependencies': [
- '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
- '<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',
^ permalink raw reply related [flat|nested] 48+ messages in thread
end of thread, other threads:[~2025-03-05 2:53 UTC | newest]
Thread overview: 48+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-04 22:43 [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2025-03-05 2:53 Matt Jolly
2025-01-20 21:57 Conrad Kostecki
2025-01-04 22:47 Conrad Kostecki
2024-12-06 23:12 Conrad Kostecki
2024-10-15 21:46 Conrad Kostecki
2024-06-27 15:40 Conrad Kostecki
2024-06-22 18:54 Conrad Kostecki
2024-04-18 19:32 Conrad Kostecki
2024-03-27 7:55 Matt Jolly
2024-03-05 9:18 Petr Vaněk
2023-10-04 21:45 Conrad Kostecki
2023-09-13 18:43 Conrad Kostecki
2023-07-02 1:43 Conrad Kostecki
2023-06-30 19:03 Stephan Hartmann
2023-05-07 18:22 Mike Gilbert
2023-05-02 20:05 Mike Gilbert
2023-04-23 14:46 Mike Gilbert
2023-01-01 18:16 Conrad Kostecki
2022-12-22 19:54 Stephan Hartmann
2022-02-03 9:18 Stephan Hartmann
2021-11-20 10:08 Stephan Hartmann
2021-08-28 19:43 Stephan Hartmann
2021-07-03 7:51 Stephan Hartmann
2020-07-14 17:32 Mike Gilbert
2020-02-28 14:39 Mike Gilbert
2020-01-30 16:17 Mike Gilbert
2019-06-28 15:30 Mike Gilbert
2019-06-20 14:49 Mike Gilbert
2018-12-29 18:50 Mike Gilbert
2018-11-05 3:30 Mike Gilbert
2018-09-30 21:28 Mike Gilbert
2018-08-08 16:00 Mike Gilbert
2018-07-23 20:40 Mike Gilbert
2018-06-20 21:46 Mike Gilbert
2018-03-13 21:20 Mike Gilbert
2018-03-02 15:01 Mike Gilbert
2018-02-18 22:40 Mike Gilbert
2017-12-31 17:09 Mike Gilbert
2017-12-12 18:17 Mike Gilbert
2017-12-09 23:27 Mike Gilbert
2017-11-17 19:38 Mike Gilbert
2017-10-31 17:15 Mike Gilbert
2017-10-02 21:26 Mike Gilbert
2017-08-09 14:30 Mike Gilbert
2017-06-11 16:50 Mike Gilbert
2017-02-17 1:25 Mike Gilbert
2016-11-08 5:47 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox