diff options
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r-- | www-client/chromium/files/chromium-compiler-r5.patch (renamed from www-client/chromium/files/chromium-compiler-r2.patch) | 59 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-cors-string-r0.patch | 51 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-ffmpeg-r1.patch | 22 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-libjpeg-r0.patch | 62 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-libwebp-shim-r0.patch | 43 |
5 files changed, 29 insertions, 208 deletions
diff --git a/www-client/chromium/files/chromium-compiler-r2.patch b/www-client/chromium/files/chromium-compiler-r5.patch index 3ac2eb81f4cb..6d6b980b1687 100644 --- a/www-client/chromium/files/chromium-compiler-r2.patch +++ b/www-client/chromium/files/chromium-compiler-r5.patch @@ -1,17 +1,17 @@ -From 4310db462fab74bf14066f2a6f7cf250ecba0cf1 Mon Sep 17 00:00:00 2001 +From 07fa6b9176dfd1acd4eb6706323ab4823f530432 Mon Sep 17 00:00:00 2001 From: Mike Gilbert <floppym@gentoo.org> Date: Wed, 25 Apr 2018 13:22:49 -0400 Subject: [PATCH] Disable various compiler configs --- - build/config/compiler/BUILD.gn | 61 ++++++++++------------------------ - 1 file changed, 18 insertions(+), 43 deletions(-) + build/config/compiler/BUILD.gn | 60 ++++++++++------------------------ + 1 file changed, 18 insertions(+), 42 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 83337d52e4b9..f2c192fc31ca 100644 +index 0e796978d479..fa77c2476e4e 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -228,8 +228,6 @@ config("compiler") { +@@ -235,8 +235,6 @@ config("compiler") { configs += [ # See the definitions below. @@ -20,12 +20,11 @@ index 83337d52e4b9..f2c192fc31ca 100644 ":compiler_codegen", ] -@@ -488,18 +486,6 @@ config("compiler") { +@@ -501,17 +499,6 @@ config("compiler") { } } -- if (is_clang && !is_nacl && current_toolchain == host_toolchain && -- target_os != "chromeos") { +- if (is_clang && !is_nacl && !use_xcode_clang) { - cflags += [ - # TODO(hans): Remove this once Clang generates better optimized debug info - # by default. https://crbug.com/765793 @@ -39,18 +38,18 @@ index 83337d52e4b9..f2c192fc31ca 100644 # Print absolute paths in diagnostics. There is no precedent for doing this # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and # Windows developers rely on it (crbug.com/636109) so only do this on Windows. -@@ -1415,10 +1401,6 @@ config("default_warnings") { - - # TODO(hans): https://crbug.com/766891 - "-Wno-null-pointer-arithmetic", +@@ -1510,10 +1497,6 @@ config("default_warnings") { + cflags += [ + # TODO(thakis): https://crbug.com/753973 + "-Wno-enum-compare-switch", - -- # Ignore warnings about MSVC optimization pragmas. -- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 -- "-Wno-ignored-pragma-optimize", - ] - } else if (use_xcode_clang) { - cflags += [ -@@ -1462,22 +1444,6 @@ config("chromium_code") { +- # Ignore warnings about MSVC optimization pragmas. +- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 +- "-Wno-ignored-pragma-optimize", + ] + } + } +@@ -1555,22 +1538,6 @@ config("chromium_code") { "__STDC_FORMAT_MACROS", ] @@ -70,10 +69,10 @@ index 83337d52e4b9..f2c192fc31ca 100644 - defines += [ "_FORTIFY_SOURCE=2" ] - } - - if (is_mac || is_ios) { + if (is_mac) { cflags_objc = [ "-Wobjc-missing-property-synthesis" ] cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -1807,7 +1773,8 @@ config("default_stack_frames") { +@@ -1940,7 +1907,8 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -83,7 +82,7 @@ index 83337d52e4b9..f2c192fc31ca 100644 if (is_win) { # TODO(thakis): Remove is_clang here, https://crbug.com/598772 if (is_official_build && full_wpo_on_official && !is_clang) { -@@ -1841,7 +1808,8 @@ config("optimize") { +@@ -1974,7 +1942,8 @@ config("optimize") { } # Same config as 'optimize' but without the WPO flag. @@ -93,7 +92,7 @@ index 83337d52e4b9..f2c192fc31ca 100644 if (is_win) { # Favor size over speed, /O1 must be before the common flags. The GYP # build also specifies /Os and /GF but these are implied by /O1. -@@ -1864,7 +1832,8 @@ config("optimize_no_wpo") { +@@ -1997,7 +1966,8 @@ config("optimize_no_wpo") { } # Turn off optimizations. @@ -103,7 +102,7 @@ index 83337d52e4b9..f2c192fc31ca 100644 if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -1888,7 +1857,8 @@ config("no_optimize") { +@@ -2021,7 +1991,8 @@ config("no_optimize") { # Turns up the optimization level. On Windows, this implies whole program # optimization and link-time code generation which is very expensive and should # be used sparingly. @@ -113,7 +112,7 @@ index 83337d52e4b9..f2c192fc31ca 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -1935,7 +1905,8 @@ config("optimize_max") { +@@ -2068,7 +2039,8 @@ config("optimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -123,7 +122,7 @@ index 83337d52e4b9..f2c192fc31ca 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -1973,7 +1944,8 @@ config("optimize_speed") { +@@ -2106,7 +2078,8 @@ config("optimize_speed") { } } @@ -133,7 +132,7 @@ index 83337d52e4b9..f2c192fc31ca 100644 cflags = [ "-O1" ] + common_optimize_on_cflags ldflags = common_optimize_on_ldflags visibility = [ ":default_optimization" ] -@@ -2057,7 +2029,8 @@ config("afdo") { +@@ -2192,7 +2165,8 @@ config("afdo") { # configs += [ "//build/config/compiler:symbols" ] # Full symbols. @@ -143,7 +142,7 @@ index 83337d52e4b9..f2c192fc31ca 100644 if (is_win) { if (use_goma || is_clang) { # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. -@@ -2155,7 +2128,8 @@ config("symbols") { +@@ -2290,7 +2264,8 @@ config("symbols") { # Minimal symbols. # This config guarantees to hold symbol for stack trace which are shown to user # when crash happens in unittests running on buildbot. @@ -153,7 +152,7 @@ index 83337d52e4b9..f2c192fc31ca 100644 if (is_win) { # Linker symbols for backtraces only. cflags = [] -@@ -2186,7 +2160,8 @@ config("minimal_symbols") { +@@ -2330,7 +2305,8 @@ config("minimal_symbols") { } # No symbols. @@ -164,5 +163,5 @@ index 83337d52e4b9..f2c192fc31ca 100644 cflags = [ "-g0" ] asmflags = cflags -- -2.17.0 +2.19.0 diff --git a/www-client/chromium/files/chromium-cors-string-r0.patch b/www-client/chromium/files/chromium-cors-string-r0.patch deleted file mode 100644 index b724cd44df70..000000000000 --- a/www-client/chromium/files/chromium-cors-string-r0.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jose.dapena@lge.com> -Date: Thu, 31 May 2018 17:03:37 +0000 -Subject: [PATCH] CORS legacy: add missing string include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The cors_legacy.h file includes declarations using std::string, but -it is not declared due to missing #include <string>. - -Also drop unneeded declarations in .cpp file. - -Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd -Reviewed-on: https://chromium-review.googlesource.com/1080707 -Reviewed-by: Tom Sepez <tsepez@chromium.org> -Commit-Queue: José Dapena Paz <jose.dapena@lge.com> -Cr-Commit-Position: refs/heads/master@{#563282} ---- - services/network/public/cpp/cors/cors_legacy.cc | 2 -- - services/network/public/cpp/cors/cors_legacy.h | 1 + - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc -index 8f32ac3be64e..f01af63619b5 100644 ---- a/services/network/public/cpp/cors/cors_legacy.cc -+++ b/services/network/public/cpp/cors/cors_legacy.cc -@@ -5,8 +5,6 @@ - #include "services/network/public/cpp/cors/cors_legacy.h" - - #include <algorithm> --#include <string> --#include <vector> - - #include "url/gurl.h" - #include "url/url_util.h" -diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h -index d2cdf026ca3a..dc9295a92c47 100644 ---- a/services/network/public/cpp/cors/cors_legacy.h -+++ b/services/network/public/cpp/cors/cors_legacy.h -@@ -5,6 +5,7 @@ - #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ - #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ - -+#include <string> - #include <vector> - - #include "base/component_export.h" --- -2.17.1 - diff --git a/www-client/chromium/files/chromium-ffmpeg-r1.patch b/www-client/chromium/files/chromium-ffmpeg-r1.patch deleted file mode 100644 index 53d61e8f38b8..000000000000 --- a/www-client/chromium/files/chromium-ffmpeg-r1.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/build/linux/unbundle/ffmpeg.gn -+++ b/build/linux/unbundle/ffmpeg.gn -@@ -14,8 +14,8 @@ pkg_config("system_ffmpeg") { - ] - } - --buildflag_header("ffmpeg_buildflags") { -- header = "ffmpeg_buildflags.h" -+buildflag_header("ffmpeg_features") { -+ header = "ffmpeg_features.h" - flags = [ "USE_SYSTEM_FFMPEG=true" ] - } - -@@ -30,7 +30,7 @@ shim_headers("ffmpeg_shim") { - - source_set("ffmpeg") { - deps = [ -- ":ffmpeg_buildflags", -+ ":ffmpeg_features", - ":ffmpeg_shim", - ] - public_configs = [ ":system_ffmpeg" ] diff --git a/www-client/chromium/files/chromium-libjpeg-r0.patch b/www-client/chromium/files/chromium-libjpeg-r0.patch deleted file mode 100644 index 5354281caced..000000000000 --- a/www-client/chromium/files/chromium-libjpeg-r0.patch +++ /dev/null @@ -1,62 +0,0 @@ -From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001 -From: Daniel Bratell <bratell@opera.com> -Date: Mon, 28 May 2018 13:13:01 +0000 -Subject: [PATCH] Use the same libjpeg in all of blink/platform - -The normal libjpeg renames some symbols with macros so if its -headers are included together with libjpeg-turbo's headers -in the same translation unit, there will be an inconsistent -renaming of libjpeg symbols. This happened in some extreme -jumbo configuration and resulted in confising linker errors. - -This patch changes an include so that jpeglib.h becomes included -the same way everywhere. - -Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e -Reviewed-on: https://chromium-review.googlesource.com/1073423 -Reviewed-by: Kentaro Hara <haraken@chromium.org> -Commit-Queue: Daniel Bratell <bratell@opera.com> -Cr-Commit-Position: refs/heads/master@{#562243} ---- - .../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++ - .../renderer/platform/image-encoders/image_encoder.h | 2 -- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -index 0c7f14c7c0e4..4c450f5d6783 100644 ---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -@@ -4,6 +4,17 @@ - - #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h" - -+#include "build/build_config.h" -+ -+#if defined(OS_WIN) -+#include <basetsd.h> // Included before jpeglib.h because of INT32 clash -+#endif // OS_WIN -+#include <stdio.h> // Needed by jpeglib.h -+ -+#include "jpeglib.h" // for JPEG_MAX_DIMENSION -+ -+#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION -+ - namespace blink { - - bool ImageEncoder::Encode(Vector<unsigned char>* dst, -diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h -index 0d1460f34827..40306097d507 100644 ---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h -+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h -@@ -7,8 +7,6 @@ - - #include "third_party/blink/renderer/platform/platform_export.h" - #include "third_party/blink/renderer/platform/wtf/vector.h" --#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION --#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION - #include "third_party/skia/include/core/SkStream.h" - #include "third_party/skia/include/encode/SkJpegEncoder.h" - #include "third_party/skia/include/encode/SkPngEncoder.h" --- -2.17.1 - diff --git a/www-client/chromium/files/chromium-libwebp-shim-r0.patch b/www-client/chromium/files/chromium-libwebp-shim-r0.patch deleted file mode 100644 index cb387a4a0030..000000000000 --- a/www-client/chromium/files/chromium-libwebp-shim-r0.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn -index ab92adecf400..12574d87be58 100644 ---- a/build/linux/unbundle/libwebp.gn -+++ b/build/linux/unbundle/libwebp.gn -@@ -2,12 +2,34 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") -+ -+pkg_config("system_libwebp") { -+ packages = [ -+ "libwebp", -+ "libwebpdemux", -+ "libwebpmux", -+ ] -+} -+ -+shim_headers("libwebp_shim") { -+ root_path = "src" -+ headers = [ -+ "webp/decode.h", -+ "webp/demux.h", -+ "webp/encode.h", -+ "webp/mux.h", -+ "webp/mux_types.h", -+ "webp/types.h", -+ ] -+} -+ - source_set("libwebp_webp") { -- libs = [ -- "webp", -- "webpdemux", -- "webpmux", -+ deps = [ -+ ":libwebp_shim", - ] -+ public_configs = [ ":system_libwebp" ] - } - - group("libwebp") { |