1 |
commit: 16b0d7b614894af50c9f990e51db6cb681e2f6c6 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Oct 19 17:40:43 2017 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 31 17:14:34 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b0d7b6 |
7 |
|
8 |
www-client/chromium: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/5986 |
11 |
|
12 |
www-client/chromium/files/chromium-gcc5-r2.patch | 36 ---------------------- |
13 |
.../chromium/files/chromium-gn-bootstrap-r19.patch | 10 ------ |
14 |
.../chromium/files/chromium-sysroot-r1.patch | 14 --------- |
15 |
3 files changed, 60 deletions(-) |
16 |
|
17 |
diff --git a/www-client/chromium/files/chromium-gcc5-r2.patch b/www-client/chromium/files/chromium-gcc5-r2.patch |
18 |
deleted file mode 100644 |
19 |
index f2be2d5b8ae..00000000000 |
20 |
--- a/www-client/chromium/files/chromium-gcc5-r2.patch |
21 |
+++ /dev/null |
22 |
@@ -1,36 +0,0 @@ |
23 |
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h |
24 |
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h |
25 |
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { |
26 |
- allocation_length_(0), |
27 |
- data_(data), |
28 |
- data_length_(0), |
29 |
-- kind_(AllocationKind::kNormal), |
30 |
-+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), |
31 |
- deleter_(deleter) {} |
32 |
- DataHandle(void* allocation_base, |
33 |
- size_t allocation_length, |
34 |
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { |
35 |
- reinterpret_cast<uintptr_t>(allocation_base_) + |
36 |
- allocation_length_); |
37 |
- switch (kind_) { |
38 |
-- case AllocationKind::kNormal: |
39 |
-+ case WTF::ArrayBufferContents::AllocationKind::kNormal: |
40 |
- DCHECK(deleter_); |
41 |
- deleter_(data_); |
42 |
- return; |
43 |
-- case AllocationKind::kReservation: |
44 |
-+ case WTF::ArrayBufferContents::AllocationKind::kReservation: |
45 |
- ReleaseReservedMemory(allocation_base_, allocation_length_); |
46 |
- return; |
47 |
- } |
48 |
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 |
49 |
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 |
50 |
-@@ -10,7 +10,7 @@ |
51 |
- |
52 |
- #include "webrtc/modules/audio_processing/aec3/aec_state.h" |
53 |
- |
54 |
--#include <math.h> |
55 |
-+#include <cmath> |
56 |
- #include <numeric> |
57 |
- #include <vector> |
58 |
- |
59 |
|
60 |
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r19.patch b/www-client/chromium/files/chromium-gn-bootstrap-r19.patch |
61 |
deleted file mode 100644 |
62 |
index 999fdb7eda7..00000000000 |
63 |
--- a/www-client/chromium/files/chromium-gn-bootstrap-r19.patch |
64 |
+++ /dev/null |
65 |
@@ -1,10 +0,0 @@ |
66 |
---- a/tools/gn/bootstrap/bootstrap.py |
67 |
-+++ b/tools/gn/bootstrap/bootstrap.py |
68 |
-@@ -576,7 +576,6 @@ def write_gn_ninja(path, root_gen_dir, options): |
69 |
- 'base/trace_event/trace_log.cc', |
70 |
- 'base/trace_event/trace_log_constants.cc', |
71 |
- 'base/trace_event/tracing_agent.cc', |
72 |
-- 'base/tracked_objects.cc', |
73 |
- 'base/unguessable_token.cc', |
74 |
- 'base/value_iterators.cc', |
75 |
- 'base/values.cc', |
76 |
|
77 |
diff --git a/www-client/chromium/files/chromium-sysroot-r1.patch b/www-client/chromium/files/chromium-sysroot-r1.patch |
78 |
deleted file mode 100644 |
79 |
index b5ff0d8cba1..00000000000 |
80 |
--- a/www-client/chromium/files/chromium-sysroot-r1.patch |
81 |
+++ /dev/null |
82 |
@@ -1,14 +0,0 @@ |
83 |
---- a/chrome/installer/BUILD.gn |
84 |
-+++ b/chrome/installer/BUILD.gn |
85 |
-@@ -3,9 +3,10 @@ |
86 |
- # found in the LICENSE file. |
87 |
- |
88 |
- import("//build/config/chrome_build.gni") |
89 |
-+import("//build/config/sysroot.gni") |
90 |
- |
91 |
- declare_args() { |
92 |
-- enable_linux_installer = is_linux && !is_component_build |
93 |
-+ enable_linux_installer = is_linux && !is_component_build && use_sysroot |
94 |
- } |
95 |
- |
96 |
- # Meta-target that forwards to the installer of the correct type (if any). |