1 |
commit: 69f59621a66e0141cb6321ecbccc1d94fc24c8d8 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 30 21:27:55 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 30 21:28:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f59621 |
7 |
|
8 |
www-client/chromium: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-2.3.50_p10, Repoman-2.3.11_p17 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
.../chromium/files/chromium-compiler-r2.patch | 168 --------------------- |
14 |
.../chromium/files/chromium-cors-string-r0.patch | 51 ------- |
15 |
www-client/chromium/files/chromium-ffmpeg-r1.patch | 22 --- |
16 |
.../chromium/files/chromium-libjpeg-r0.patch | 62 -------- |
17 |
.../chromium/files/chromium-libwebp-shim-r0.patch | 43 ------ |
18 |
5 files changed, 346 deletions(-) |
19 |
|
20 |
diff --git a/www-client/chromium/files/chromium-compiler-r2.patch b/www-client/chromium/files/chromium-compiler-r2.patch |
21 |
deleted file mode 100644 |
22 |
index 3ac2eb81f4c..00000000000 |
23 |
--- a/www-client/chromium/files/chromium-compiler-r2.patch |
24 |
+++ /dev/null |
25 |
@@ -1,168 +0,0 @@ |
26 |
-From 4310db462fab74bf14066f2a6f7cf250ecba0cf1 Mon Sep 17 00:00:00 2001 |
27 |
-From: Mike Gilbert <floppym@g.o> |
28 |
-Date: Wed, 25 Apr 2018 13:22:49 -0400 |
29 |
-Subject: [PATCH] Disable various compiler configs |
30 |
- |
31 |
---- |
32 |
- build/config/compiler/BUILD.gn | 61 ++++++++++------------------------ |
33 |
- 1 file changed, 18 insertions(+), 43 deletions(-) |
34 |
- |
35 |
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
36 |
-index 83337d52e4b9..f2c192fc31ca 100644 |
37 |
---- a/build/config/compiler/BUILD.gn |
38 |
-+++ b/build/config/compiler/BUILD.gn |
39 |
-@@ -228,8 +228,6 @@ config("compiler") { |
40 |
- |
41 |
- configs += [ |
42 |
- # See the definitions below. |
43 |
-- ":clang_revision", |
44 |
-- ":compiler_cpu_abi", |
45 |
- ":compiler_codegen", |
46 |
- ] |
47 |
- |
48 |
-@@ -488,18 +486,6 @@ config("compiler") { |
49 |
- } |
50 |
- } |
51 |
- |
52 |
-- if (is_clang && !is_nacl && current_toolchain == host_toolchain && |
53 |
-- target_os != "chromeos") { |
54 |
-- cflags += [ |
55 |
-- # TODO(hans): Remove this once Clang generates better optimized debug info |
56 |
-- # by default. https://crbug.com/765793 |
57 |
-- "-Xclang", |
58 |
-- "-mllvm", |
59 |
-- "-Xclang", |
60 |
-- "-instcombine-lower-dbg-declare=0", |
61 |
-- ] |
62 |
-- } |
63 |
-- |
64 |
- # Print absolute paths in diagnostics. There is no precedent for doing this |
65 |
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and |
66 |
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows. |
67 |
-@@ -1415,10 +1401,6 @@ config("default_warnings") { |
68 |
- |
69 |
- # TODO(hans): https://crbug.com/766891 |
70 |
- "-Wno-null-pointer-arithmetic", |
71 |
-- |
72 |
-- # Ignore warnings about MSVC optimization pragmas. |
73 |
-- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 |
74 |
-- "-Wno-ignored-pragma-optimize", |
75 |
- ] |
76 |
- } else if (use_xcode_clang) { |
77 |
- cflags += [ |
78 |
-@@ -1462,22 +1444,6 @@ config("chromium_code") { |
79 |
- "__STDC_FORMAT_MACROS", |
80 |
- ] |
81 |
- |
82 |
-- if (!is_debug && !using_sanitizer && |
83 |
-- (!is_linux || !is_clang || is_official_build) && |
84 |
-- current_cpu != "s390x" && current_cpu != "s390" && |
85 |
-- current_cpu != "ppc64" && current_cpu != "ppc64" && |
86 |
-- current_cpu != "mips" && current_cpu != "mips64") { |
87 |
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see |
88 |
-- # http://llvm.org/bugs/show_bug.cgi?id=16821. |
89 |
-- # It seems to work fine with Ubuntu 12 headers though, so use it in |
90 |
-- # official builds. |
91 |
-- # |
92 |
-- # Non-chromium code is not guaranteed to compile cleanly with |
93 |
-- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are |
94 |
-- # disabled, so only do that for Release build. |
95 |
-- defines += [ "_FORTIFY_SOURCE=2" ] |
96 |
-- } |
97 |
-- |
98 |
- if (is_mac || is_ios) { |
99 |
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ] |
100 |
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] |
101 |
-@@ -1807,7 +1773,8 @@ config("default_stack_frames") { |
102 |
- } |
103 |
- |
104 |
- # Default "optimization on" config. |
105 |
--config("optimize") { |
106 |
-+config("optimize") { } |
107 |
-+config("xoptimize") { |
108 |
- if (is_win) { |
109 |
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772 |
110 |
- if (is_official_build && full_wpo_on_official && !is_clang) { |
111 |
-@@ -1841,7 +1808,8 @@ config("optimize") { |
112 |
- } |
113 |
- |
114 |
- # Same config as 'optimize' but without the WPO flag. |
115 |
--config("optimize_no_wpo") { |
116 |
-+config("optimize_no_wpo") { } |
117 |
-+config("xoptimize_no_wpo") { |
118 |
- if (is_win) { |
119 |
- # Favor size over speed, /O1 must be before the common flags. The GYP |
120 |
- # build also specifies /Os and /GF but these are implied by /O1. |
121 |
-@@ -1864,7 +1832,8 @@ config("optimize_no_wpo") { |
122 |
- } |
123 |
- |
124 |
- # Turn off optimizations. |
125 |
--config("no_optimize") { |
126 |
-+config("no_optimize") { } |
127 |
-+config("xno_optimize") { |
128 |
- if (is_win) { |
129 |
- cflags = [ |
130 |
- "/Od", # Disable optimization. |
131 |
-@@ -1888,7 +1857,8 @@ config("no_optimize") { |
132 |
- # Turns up the optimization level. On Windows, this implies whole program |
133 |
- # optimization and link-time code generation which is very expensive and should |
134 |
- # be used sparingly. |
135 |
--config("optimize_max") { |
136 |
-+config("optimize_max") { } |
137 |
-+config("xoptimize_max") { |
138 |
- if (is_nacl && is_nacl_irt) { |
139 |
- # The NaCl IRT is a special case and always wants its own config. |
140 |
- # Various components do: |
141 |
-@@ -1935,7 +1905,8 @@ config("optimize_max") { |
142 |
- # |
143 |
- # TODO(crbug.com/621335) - rework how all of these configs are related |
144 |
- # so that we don't need this disclaimer. |
145 |
--config("optimize_speed") { |
146 |
-+config("optimize_speed") { } |
147 |
-+config("xoptimize_speed") { |
148 |
- if (is_nacl && is_nacl_irt) { |
149 |
- # The NaCl IRT is a special case and always wants its own config. |
150 |
- # Various components do: |
151 |
-@@ -1973,7 +1944,8 @@ config("optimize_speed") { |
152 |
- } |
153 |
- } |
154 |
- |
155 |
--config("optimize_fuzzing") { |
156 |
-+config("optimize_fuzzing") { } |
157 |
-+config("xoptimize_fuzzing") { |
158 |
- cflags = [ "-O1" ] + common_optimize_on_cflags |
159 |
- ldflags = common_optimize_on_ldflags |
160 |
- visibility = [ ":default_optimization" ] |
161 |
-@@ -2057,7 +2029,8 @@ config("afdo") { |
162 |
- # configs += [ "//build/config/compiler:symbols" ] |
163 |
- |
164 |
- # Full symbols. |
165 |
--config("symbols") { |
166 |
-+config("symbols") { } |
167 |
-+config("xsymbols") { |
168 |
- if (is_win) { |
169 |
- if (use_goma || is_clang) { |
170 |
- # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. |
171 |
-@@ -2155,7 +2128,8 @@ config("symbols") { |
172 |
- # Minimal symbols. |
173 |
- # This config guarantees to hold symbol for stack trace which are shown to user |
174 |
- # when crash happens in unittests running on buildbot. |
175 |
--config("minimal_symbols") { |
176 |
-+config("minimal_symbols") { } |
177 |
-+config("xminimal_symbols") { |
178 |
- if (is_win) { |
179 |
- # Linker symbols for backtraces only. |
180 |
- cflags = [] |
181 |
-@@ -2186,7 +2160,8 @@ config("minimal_symbols") { |
182 |
- } |
183 |
- |
184 |
- # No symbols. |
185 |
--config("no_symbols") { |
186 |
-+config("no_symbols") { } |
187 |
-+config("xno_symbols") { |
188 |
- if (!is_win) { |
189 |
- cflags = [ "-g0" ] |
190 |
- asmflags = cflags |
191 |
--- |
192 |
-2.17.0 |
193 |
- |
194 |
|
195 |
diff --git a/www-client/chromium/files/chromium-cors-string-r0.patch b/www-client/chromium/files/chromium-cors-string-r0.patch |
196 |
deleted file mode 100644 |
197 |
index b724cd44df7..00000000000 |
198 |
--- a/www-client/chromium/files/chromium-cors-string-r0.patch |
199 |
+++ /dev/null |
200 |
@@ -1,51 +0,0 @@ |
201 |
-From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001 |
202 |
-From: Jose Dapena Paz <jose.dapena@×××.com> |
203 |
-Date: Thu, 31 May 2018 17:03:37 +0000 |
204 |
-Subject: [PATCH] CORS legacy: add missing string include |
205 |
-MIME-Version: 1.0 |
206 |
-Content-Type: text/plain; charset=UTF-8 |
207 |
-Content-Transfer-Encoding: 8bit |
208 |
- |
209 |
-The cors_legacy.h file includes declarations using std::string, but |
210 |
-it is not declared due to missing #include <string>. |
211 |
- |
212 |
-Also drop unneeded declarations in .cpp file. |
213 |
- |
214 |
-Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd |
215 |
-Reviewed-on: https://chromium-review.googlesource.com/1080707 |
216 |
-Reviewed-by: Tom Sepez <tsepez@××××××××.org> |
217 |
-Commit-Queue: José Dapena Paz <jose.dapena@×××.com> |
218 |
-Cr-Commit-Position: refs/heads/master@{#563282} |
219 |
---- |
220 |
- services/network/public/cpp/cors/cors_legacy.cc | 2 -- |
221 |
- services/network/public/cpp/cors/cors_legacy.h | 1 + |
222 |
- 2 files changed, 1 insertion(+), 2 deletions(-) |
223 |
- |
224 |
-diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc |
225 |
-index 8f32ac3be64e..f01af63619b5 100644 |
226 |
---- a/services/network/public/cpp/cors/cors_legacy.cc |
227 |
-+++ b/services/network/public/cpp/cors/cors_legacy.cc |
228 |
-@@ -5,8 +5,6 @@ |
229 |
- #include "services/network/public/cpp/cors/cors_legacy.h" |
230 |
- |
231 |
- #include <algorithm> |
232 |
--#include <string> |
233 |
--#include <vector> |
234 |
- |
235 |
- #include "url/gurl.h" |
236 |
- #include "url/url_util.h" |
237 |
-diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h |
238 |
-index d2cdf026ca3a..dc9295a92c47 100644 |
239 |
---- a/services/network/public/cpp/cors/cors_legacy.h |
240 |
-+++ b/services/network/public/cpp/cors/cors_legacy.h |
241 |
-@@ -5,6 +5,7 @@ |
242 |
- #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ |
243 |
- #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ |
244 |
- |
245 |
-+#include <string> |
246 |
- #include <vector> |
247 |
- |
248 |
- #include "base/component_export.h" |
249 |
--- |
250 |
-2.17.1 |
251 |
- |
252 |
|
253 |
diff --git a/www-client/chromium/files/chromium-ffmpeg-r1.patch b/www-client/chromium/files/chromium-ffmpeg-r1.patch |
254 |
deleted file mode 100644 |
255 |
index 53d61e8f38b..00000000000 |
256 |
--- a/www-client/chromium/files/chromium-ffmpeg-r1.patch |
257 |
+++ /dev/null |
258 |
@@ -1,22 +0,0 @@ |
259 |
---- a/build/linux/unbundle/ffmpeg.gn |
260 |
-+++ b/build/linux/unbundle/ffmpeg.gn |
261 |
-@@ -14,8 +14,8 @@ pkg_config("system_ffmpeg") { |
262 |
- ] |
263 |
- } |
264 |
- |
265 |
--buildflag_header("ffmpeg_buildflags") { |
266 |
-- header = "ffmpeg_buildflags.h" |
267 |
-+buildflag_header("ffmpeg_features") { |
268 |
-+ header = "ffmpeg_features.h" |
269 |
- flags = [ "USE_SYSTEM_FFMPEG=true" ] |
270 |
- } |
271 |
- |
272 |
-@@ -30,7 +30,7 @@ shim_headers("ffmpeg_shim") { |
273 |
- |
274 |
- source_set("ffmpeg") { |
275 |
- deps = [ |
276 |
-- ":ffmpeg_buildflags", |
277 |
-+ ":ffmpeg_features", |
278 |
- ":ffmpeg_shim", |
279 |
- ] |
280 |
- public_configs = [ ":system_ffmpeg" ] |
281 |
|
282 |
diff --git a/www-client/chromium/files/chromium-libjpeg-r0.patch b/www-client/chromium/files/chromium-libjpeg-r0.patch |
283 |
deleted file mode 100644 |
284 |
index 5354281cace..00000000000 |
285 |
--- a/www-client/chromium/files/chromium-libjpeg-r0.patch |
286 |
+++ /dev/null |
287 |
@@ -1,62 +0,0 @@ |
288 |
-From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001 |
289 |
-From: Daniel Bratell <bratell@×××××.com> |
290 |
-Date: Mon, 28 May 2018 13:13:01 +0000 |
291 |
-Subject: [PATCH] Use the same libjpeg in all of blink/platform |
292 |
- |
293 |
-The normal libjpeg renames some symbols with macros so if its |
294 |
-headers are included together with libjpeg-turbo's headers |
295 |
-in the same translation unit, there will be an inconsistent |
296 |
-renaming of libjpeg symbols. This happened in some extreme |
297 |
-jumbo configuration and resulted in confising linker errors. |
298 |
- |
299 |
-This patch changes an include so that jpeglib.h becomes included |
300 |
-the same way everywhere. |
301 |
- |
302 |
-Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e |
303 |
-Reviewed-on: https://chromium-review.googlesource.com/1073423 |
304 |
-Reviewed-by: Kentaro Hara <haraken@××××××××.org> |
305 |
-Commit-Queue: Daniel Bratell <bratell@×××××.com> |
306 |
-Cr-Commit-Position: refs/heads/master@{#562243} |
307 |
---- |
308 |
- .../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++ |
309 |
- .../renderer/platform/image-encoders/image_encoder.h | 2 -- |
310 |
- 2 files changed, 11 insertions(+), 2 deletions(-) |
311 |
- |
312 |
-diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc |
313 |
-index 0c7f14c7c0e4..4c450f5d6783 100644 |
314 |
---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc |
315 |
-+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc |
316 |
-@@ -4,6 +4,17 @@ |
317 |
- |
318 |
- #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h" |
319 |
- |
320 |
-+#include "build/build_config.h" |
321 |
-+ |
322 |
-+#if defined(OS_WIN) |
323 |
-+#include <basetsd.h> // Included before jpeglib.h because of INT32 clash |
324 |
-+#endif // OS_WIN |
325 |
-+#include <stdio.h> // Needed by jpeglib.h |
326 |
-+ |
327 |
-+#include "jpeglib.h" // for JPEG_MAX_DIMENSION |
328 |
-+ |
329 |
-+#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION |
330 |
-+ |
331 |
- namespace blink { |
332 |
- |
333 |
- bool ImageEncoder::Encode(Vector<unsigned char>* dst, |
334 |
-diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h |
335 |
-index 0d1460f34827..40306097d507 100644 |
336 |
---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h |
337 |
-+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h |
338 |
-@@ -7,8 +7,6 @@ |
339 |
- |
340 |
- #include "third_party/blink/renderer/platform/platform_export.h" |
341 |
- #include "third_party/blink/renderer/platform/wtf/vector.h" |
342 |
--#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION |
343 |
--#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION |
344 |
- #include "third_party/skia/include/core/SkStream.h" |
345 |
- #include "third_party/skia/include/encode/SkJpegEncoder.h" |
346 |
- #include "third_party/skia/include/encode/SkPngEncoder.h" |
347 |
--- |
348 |
-2.17.1 |
349 |
- |
350 |
|
351 |
diff --git a/www-client/chromium/files/chromium-libwebp-shim-r0.patch b/www-client/chromium/files/chromium-libwebp-shim-r0.patch |
352 |
deleted file mode 100644 |
353 |
index cb387a4a003..00000000000 |
354 |
--- a/www-client/chromium/files/chromium-libwebp-shim-r0.patch |
355 |
+++ /dev/null |
356 |
@@ -1,43 +0,0 @@ |
357 |
-diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn |
358 |
-index ab92adecf400..12574d87be58 100644 |
359 |
---- a/build/linux/unbundle/libwebp.gn |
360 |
-+++ b/build/linux/unbundle/libwebp.gn |
361 |
-@@ -2,12 +2,34 @@ |
362 |
- # Use of this source code is governed by a BSD-style license that can be |
363 |
- # found in the LICENSE file. |
364 |
- |
365 |
-+import("//build/config/linux/pkg_config.gni") |
366 |
-+import("//build/shim_headers.gni") |
367 |
-+ |
368 |
-+pkg_config("system_libwebp") { |
369 |
-+ packages = [ |
370 |
-+ "libwebp", |
371 |
-+ "libwebpdemux", |
372 |
-+ "libwebpmux", |
373 |
-+ ] |
374 |
-+} |
375 |
-+ |
376 |
-+shim_headers("libwebp_shim") { |
377 |
-+ root_path = "src" |
378 |
-+ headers = [ |
379 |
-+ "webp/decode.h", |
380 |
-+ "webp/demux.h", |
381 |
-+ "webp/encode.h", |
382 |
-+ "webp/mux.h", |
383 |
-+ "webp/mux_types.h", |
384 |
-+ "webp/types.h", |
385 |
-+ ] |
386 |
-+} |
387 |
-+ |
388 |
- source_set("libwebp_webp") { |
389 |
-- libs = [ |
390 |
-- "webp", |
391 |
-- "webpdemux", |
392 |
-- "webpmux", |
393 |
-+ deps = [ |
394 |
-+ ":libwebp_shim", |
395 |
- ] |
396 |
-+ public_configs = [ ":system_libwebp" ] |
397 |
- } |
398 |
- |
399 |
- group("libwebp") { |