1 |
commit: 6c14e1728eaab2fcc6dd3d7f1c33debb44d0c8c2 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 5 03:30:43 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 5 03:30:43 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c14e172 |
7 |
|
8 |
www-client/chromium: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-2.3.51_p9, Repoman-2.3.12 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
www-client/chromium/files/chromium-ceil-r0.patch | 59 -------- |
14 |
.../chromium/files/chromium-compiler-r5.patch | 167 --------------------- |
15 |
.../chromium/files/chromium-ffmpeg-ebp-r1.patch | 18 --- |
16 |
3 files changed, 244 deletions(-) |
17 |
|
18 |
diff --git a/www-client/chromium/files/chromium-ceil-r0.patch b/www-client/chromium/files/chromium-ceil-r0.patch |
19 |
deleted file mode 100644 |
20 |
index 9e7f2a7392e..00000000000 |
21 |
--- a/www-client/chromium/files/chromium-ceil-r0.patch |
22 |
+++ /dev/null |
23 |
@@ -1,59 +0,0 @@ |
24 |
-From cc843eb64f6599d9ede176f711fe6355015c30b1 Mon Sep 17 00:00:00 2001 |
25 |
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
26 |
-Date: Mon, 8 Oct 2018 22:33:38 +0000 |
27 |
-Subject: [PATCH] PictureLayerImpl: Use ceil() instead of ceilf() |
28 |
-MIME-Version: 1.0 |
29 |
-Content-Type: text/plain; charset=UTF-8 |
30 |
-Content-Transfer-Encoding: 8bit |
31 |
- |
32 |
-ceilf() is only formally mentioned in C++17, even though previous versions |
33 |
-of the standard say <cmath> should have the same contents as C's math.h. |
34 |
- |
35 |
-libstdc++ does not ship ceilf() in its cmath, but the ceil(float) overload |
36 |
-that _is_ in the standard is available everywhere, so use that instead. |
37 |
- |
38 |
-This fixes the build with libstdc++ after 77b67445ba ("Elements with fixed |
39 |
-bottom and top stick to top"): |
40 |
- |
41 |
- ../../cc/layers/picture_layer_impl.cc: In member function ‘void cc::PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace()’: |
42 |
- ../../cc/layers/picture_layer_impl.cc:738:16: error: ‘ceilf’ is not a member of ‘std’ |
43 |
- std::ceilf(-total_controls_height * hidden_ratio)); // bottom |
44 |
- ^~~~~ |
45 |
- ../../cc/layers/picture_layer_impl.cc:738:16: note: suggested alternative: ‘ceil’ |
46 |
- std::ceilf(-total_controls_height * hidden_ratio)); // bottom |
47 |
- ^~~~~ |
48 |
- ceil |
49 |
- |
50 |
-Bug: 819294 |
51 |
-Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel |
52 |
-Change-Id: Ida69eb3127ca132e7090c9aad0dd17dc314b6992 |
53 |
-Reviewed-on: https://chromium-review.googlesource.com/c/1264537 |
54 |
-Commit-Queue: David Bokan <bokan@××××××××.org> |
55 |
-Reviewed-by: David Bokan <bokan@××××××××.org> |
56 |
-Cr-Commit-Position: refs/heads/master@{#597709} |
57 |
---- |
58 |
- cc/layers/picture_layer_impl.cc | 8 ++++---- |
59 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
60 |
- |
61 |
-diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc |
62 |
-index 937255884a6e..020bcee55201 100644 |
63 |
---- a/cc/layers/picture_layer_impl.cc |
64 |
-+++ b/cc/layers/picture_layer_impl.cc |
65 |
-@@ -727,10 +727,10 @@ void PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace() { |
66 |
- 1.f - layer_tree_impl()->CurrentBrowserControlsShownRatio(); |
67 |
- |
68 |
- viewport_rect_for_tile_priority_in_content_space_.Inset( |
69 |
-- 0, // left |
70 |
-- 0, // top, |
71 |
-- 0, // right, |
72 |
-- std::ceilf(-total_controls_height * hidden_ratio)); // bottom |
73 |
-+ 0, // left |
74 |
-+ 0, // top, |
75 |
-+ 0, // right, |
76 |
-+ std::ceil(-total_controls_height * hidden_ratio)); // bottom |
77 |
- } |
78 |
- } |
79 |
- } |
80 |
--- |
81 |
-2.19.1 |
82 |
- |
83 |
|
84 |
diff --git a/www-client/chromium/files/chromium-compiler-r5.patch b/www-client/chromium/files/chromium-compiler-r5.patch |
85 |
deleted file mode 100644 |
86 |
index 6d6b980b168..00000000000 |
87 |
--- a/www-client/chromium/files/chromium-compiler-r5.patch |
88 |
+++ /dev/null |
89 |
@@ -1,167 +0,0 @@ |
90 |
-From 07fa6b9176dfd1acd4eb6706323ab4823f530432 Mon Sep 17 00:00:00 2001 |
91 |
-From: Mike Gilbert <floppym@g.o> |
92 |
-Date: Wed, 25 Apr 2018 13:22:49 -0400 |
93 |
-Subject: [PATCH] Disable various compiler configs |
94 |
- |
95 |
---- |
96 |
- build/config/compiler/BUILD.gn | 60 ++++++++++------------------------ |
97 |
- 1 file changed, 18 insertions(+), 42 deletions(-) |
98 |
- |
99 |
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
100 |
-index 0e796978d479..fa77c2476e4e 100644 |
101 |
---- a/build/config/compiler/BUILD.gn |
102 |
-+++ b/build/config/compiler/BUILD.gn |
103 |
-@@ -235,8 +235,6 @@ config("compiler") { |
104 |
- |
105 |
- configs += [ |
106 |
- # See the definitions below. |
107 |
-- ":clang_revision", |
108 |
-- ":compiler_cpu_abi", |
109 |
- ":compiler_codegen", |
110 |
- ] |
111 |
- |
112 |
-@@ -501,17 +499,6 @@ config("compiler") { |
113 |
- } |
114 |
- } |
115 |
- |
116 |
-- if (is_clang && !is_nacl && !use_xcode_clang) { |
117 |
-- cflags += [ |
118 |
-- # TODO(hans): Remove this once Clang generates better optimized debug info |
119 |
-- # by default. https://crbug.com/765793 |
120 |
-- "-Xclang", |
121 |
-- "-mllvm", |
122 |
-- "-Xclang", |
123 |
-- "-instcombine-lower-dbg-declare=0", |
124 |
-- ] |
125 |
-- } |
126 |
-- |
127 |
- # Print absolute paths in diagnostics. There is no precedent for doing this |
128 |
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and |
129 |
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows. |
130 |
-@@ -1510,10 +1497,6 @@ config("default_warnings") { |
131 |
- cflags += [ |
132 |
- # TODO(thakis): https://crbug.com/753973 |
133 |
- "-Wno-enum-compare-switch", |
134 |
-- |
135 |
-- # Ignore warnings about MSVC optimization pragmas. |
136 |
-- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 |
137 |
-- "-Wno-ignored-pragma-optimize", |
138 |
- ] |
139 |
- } |
140 |
- } |
141 |
-@@ -1555,22 +1538,6 @@ config("chromium_code") { |
142 |
- "__STDC_FORMAT_MACROS", |
143 |
- ] |
144 |
- |
145 |
-- if (!is_debug && !using_sanitizer && |
146 |
-- (!is_linux || !is_clang || is_official_build) && |
147 |
-- current_cpu != "s390x" && current_cpu != "s390" && |
148 |
-- current_cpu != "ppc64" && current_cpu != "ppc64" && |
149 |
-- current_cpu != "mips" && current_cpu != "mips64") { |
150 |
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see |
151 |
-- # http://llvm.org/bugs/show_bug.cgi?id=16821. |
152 |
-- # It seems to work fine with Ubuntu 12 headers though, so use it in |
153 |
-- # official builds. |
154 |
-- # |
155 |
-- # Non-chromium code is not guaranteed to compile cleanly with |
156 |
-- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are |
157 |
-- # disabled, so only do that for Release build. |
158 |
-- defines += [ "_FORTIFY_SOURCE=2" ] |
159 |
-- } |
160 |
-- |
161 |
- if (is_mac) { |
162 |
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ] |
163 |
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] |
164 |
-@@ -1940,7 +1907,8 @@ config("default_stack_frames") { |
165 |
- } |
166 |
- |
167 |
- # Default "optimization on" config. |
168 |
--config("optimize") { |
169 |
-+config("optimize") { } |
170 |
-+config("xoptimize") { |
171 |
- if (is_win) { |
172 |
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772 |
173 |
- if (is_official_build && full_wpo_on_official && !is_clang) { |
174 |
-@@ -1974,7 +1942,8 @@ config("optimize") { |
175 |
- } |
176 |
- |
177 |
- # Same config as 'optimize' but without the WPO flag. |
178 |
--config("optimize_no_wpo") { |
179 |
-+config("optimize_no_wpo") { } |
180 |
-+config("xoptimize_no_wpo") { |
181 |
- if (is_win) { |
182 |
- # Favor size over speed, /O1 must be before the common flags. The GYP |
183 |
- # build also specifies /Os and /GF but these are implied by /O1. |
184 |
-@@ -1997,7 +1966,8 @@ config("optimize_no_wpo") { |
185 |
- } |
186 |
- |
187 |
- # Turn off optimizations. |
188 |
--config("no_optimize") { |
189 |
-+config("no_optimize") { } |
190 |
-+config("xno_optimize") { |
191 |
- if (is_win) { |
192 |
- cflags = [ |
193 |
- "/Od", # Disable optimization. |
194 |
-@@ -2021,7 +1991,8 @@ config("no_optimize") { |
195 |
- # Turns up the optimization level. On Windows, this implies whole program |
196 |
- # optimization and link-time code generation which is very expensive and should |
197 |
- # be used sparingly. |
198 |
--config("optimize_max") { |
199 |
-+config("optimize_max") { } |
200 |
-+config("xoptimize_max") { |
201 |
- if (is_nacl && is_nacl_irt) { |
202 |
- # The NaCl IRT is a special case and always wants its own config. |
203 |
- # Various components do: |
204 |
-@@ -2068,7 +2039,8 @@ config("optimize_max") { |
205 |
- # |
206 |
- # TODO(crbug.com/621335) - rework how all of these configs are related |
207 |
- # so that we don't need this disclaimer. |
208 |
--config("optimize_speed") { |
209 |
-+config("optimize_speed") { } |
210 |
-+config("xoptimize_speed") { |
211 |
- if (is_nacl && is_nacl_irt) { |
212 |
- # The NaCl IRT is a special case and always wants its own config. |
213 |
- # Various components do: |
214 |
-@@ -2106,7 +2078,8 @@ config("optimize_speed") { |
215 |
- } |
216 |
- } |
217 |
- |
218 |
--config("optimize_fuzzing") { |
219 |
-+config("optimize_fuzzing") { } |
220 |
-+config("xoptimize_fuzzing") { |
221 |
- cflags = [ "-O1" ] + common_optimize_on_cflags |
222 |
- ldflags = common_optimize_on_ldflags |
223 |
- visibility = [ ":default_optimization" ] |
224 |
-@@ -2192,7 +2165,8 @@ config("afdo") { |
225 |
- # configs += [ "//build/config/compiler:symbols" ] |
226 |
- |
227 |
- # Full symbols. |
228 |
--config("symbols") { |
229 |
-+config("symbols") { } |
230 |
-+config("xsymbols") { |
231 |
- if (is_win) { |
232 |
- if (use_goma || is_clang) { |
233 |
- # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. |
234 |
-@@ -2290,7 +2264,8 @@ config("symbols") { |
235 |
- # Minimal symbols. |
236 |
- # This config guarantees to hold symbol for stack trace which are shown to user |
237 |
- # when crash happens in unittests running on buildbot. |
238 |
--config("minimal_symbols") { |
239 |
-+config("minimal_symbols") { } |
240 |
-+config("xminimal_symbols") { |
241 |
- if (is_win) { |
242 |
- # Linker symbols for backtraces only. |
243 |
- cflags = [] |
244 |
-@@ -2330,7 +2305,8 @@ config("minimal_symbols") { |
245 |
- } |
246 |
- |
247 |
- # No symbols. |
248 |
--config("no_symbols") { |
249 |
-+config("no_symbols") { } |
250 |
-+config("xno_symbols") { |
251 |
- if (!is_win) { |
252 |
- cflags = [ "-g0" ] |
253 |
- asmflags = cflags |
254 |
--- |
255 |
-2.19.0 |
256 |
- |
257 |
|
258 |
diff --git a/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch b/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch |
259 |
deleted file mode 100644 |
260 |
index 20ded611e0a..00000000000 |
261 |
--- a/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch |
262 |
+++ /dev/null |
263 |
@@ -1,18 +0,0 @@ |
264 |
-https://bugs.chromium.org/p/chromium/issues/detail?id=796379 |
265 |
-https://bugs.gentoo.org/656902 |
266 |
- |
267 |
---- a/third_party/ffmpeg/BUILD.gn |
268 |
-+++ b/third_party/ffmpeg/BUILD.gn |
269 |
-@@ -239,11 +239,7 @@ |
270 |
- # Windows builds can't compile without EBP because we can't omit frame |
271 |
- # pointers like we do on posix. |
272 |
- if (target_cpu == "x86") { |
273 |
-- if (using_sanitizer || is_win) { |
274 |
-- defines += [ "HAVE_EBP_AVAILABLE=0" ] |
275 |
-- } else { |
276 |
-- defines += [ "HAVE_EBP_AVAILABLE=1" ] |
277 |
-- } |
278 |
-+ defines += [ "HAVE_EBP_AVAILABLE=0" ] |
279 |
- } |
280 |
- |
281 |
- if (is_posix || is_fuchsia) { |