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 <floppymas...@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";,
- },
-]
