[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/

[Mike Gilbert]

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") {