commit: 6c14e1728eaab2fcc6dd3d7f1c33debb44d0c8c2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Nov 5 03:30:43 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Nov 5 03:30:43 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c14e172
www-client/chromium: remove unused patches Package-Manager: Portage-2.3.51_p9, Repoman-2.3.12 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> www-client/chromium/files/chromium-ceil-r0.patch | 59 -------- .../chromium/files/chromium-compiler-r5.patch | 167 --------------------- .../chromium/files/chromium-ffmpeg-ebp-r1.patch | 18 --- 3 files changed, 244 deletions(-) diff --git a/www-client/chromium/files/chromium-ceil-r0.patch b/www-client/chromium/files/chromium-ceil-r0.patch deleted file mode 100644 index 9e7f2a7392e..00000000000 --- a/www-client/chromium/files/chromium-ceil-r0.patch +++ /dev/null @@ -1,59 +0,0 @@ -From cc843eb64f6599d9ede176f711fe6355015c30b1 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa <[email protected]> -Date: Mon, 8 Oct 2018 22:33:38 +0000 -Subject: [PATCH] PictureLayerImpl: Use ceil() instead of ceilf() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -ceilf() is only formally mentioned in C++17, even though previous versions -of the standard say <cmath> should have the same contents as C's math.h. - -libstdc++ does not ship ceilf() in its cmath, but the ceil(float) overload -that _is_ in the standard is available everywhere, so use that instead. - -This fixes the build with libstdc++ after 77b67445ba ("Elements with fixed -bottom and top stick to top"): - - ../../cc/layers/picture_layer_impl.cc: In member function ‘void cc::PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace()’: - ../../cc/layers/picture_layer_impl.cc:738:16: error: ‘ceilf’ is not a member of ‘std’ - std::ceilf(-total_controls_height * hidden_ratio)); // bottom - ^~~~~ - ../../cc/layers/picture_layer_impl.cc:738:16: note: suggested alternative: ‘ceil’ - std::ceilf(-total_controls_height * hidden_ratio)); // bottom - ^~~~~ - ceil - -Bug: 819294 -Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel -Change-Id: Ida69eb3127ca132e7090c9aad0dd17dc314b6992 -Reviewed-on: https://chromium-review.googlesource.com/c/1264537 -Commit-Queue: David Bokan <[email protected]> -Reviewed-by: David Bokan <[email protected]> -Cr-Commit-Position: refs/heads/master@{#597709} ---- - cc/layers/picture_layer_impl.cc | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc -index 937255884a6e..020bcee55201 100644 ---- a/cc/layers/picture_layer_impl.cc -+++ b/cc/layers/picture_layer_impl.cc -@@ -727,10 +727,10 @@ void PictureLayerImpl::UpdateViewportRectForTilePriorityInContentSpace() { - 1.f - layer_tree_impl()->CurrentBrowserControlsShownRatio(); - - viewport_rect_for_tile_priority_in_content_space_.Inset( -- 0, // left -- 0, // top, -- 0, // right, -- std::ceilf(-total_controls_height * hidden_ratio)); // bottom -+ 0, // left -+ 0, // top, -+ 0, // right, -+ std::ceil(-total_controls_height * hidden_ratio)); // bottom - } - } - } --- -2.19.1 - diff --git a/www-client/chromium/files/chromium-compiler-r5.patch b/www-client/chromium/files/chromium-compiler-r5.patch deleted file mode 100644 index 6d6b980b168..00000000000 --- a/www-client/chromium/files/chromium-compiler-r5.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 07fa6b9176dfd1acd4eb6706323ab4823f530432 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Wed, 25 Apr 2018 13:22:49 -0400 -Subject: [PATCH] Disable various compiler configs - ---- - 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 0e796978d479..fa77c2476e4e 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -235,8 +235,6 @@ config("compiler") { - - configs += [ - # See the definitions below. -- ":clang_revision", -- ":compiler_cpu_abi", - ":compiler_codegen", - ] - -@@ -501,17 +499,6 @@ config("compiler") { - } - } - -- 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 -- "-Xclang", -- "-mllvm", -- "-Xclang", -- "-instcombine-lower-dbg-declare=0", -- ] -- } -- - # 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. -@@ -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", - ] - } - } -@@ -1555,22 +1538,6 @@ config("chromium_code") { - "__STDC_FORMAT_MACROS", - ] - -- if (!is_debug && !using_sanitizer && -- (!is_linux || !is_clang || is_official_build) && -- current_cpu != "s390x" && current_cpu != "s390" && -- current_cpu != "ppc64" && current_cpu != "ppc64" && -- current_cpu != "mips" && current_cpu != "mips64") { -- # _FORTIFY_SOURCE isn't really supported by Clang now, see -- # http://llvm.org/bugs/show_bug.cgi?id=16821. -- # It seems to work fine with Ubuntu 12 headers though, so use it in -- # official builds. -- # -- # Non-chromium code is not guaranteed to compile cleanly with -- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are -- # disabled, so only do that for Release build. -- defines += [ "_FORTIFY_SOURCE=2" ] -- } -- - if (is_mac) { - cflags_objc = [ "-Wobjc-missing-property-synthesis" ] - cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -1940,7 +1907,8 @@ config("default_stack_frames") { - } - - # Default "optimization on" config. --config("optimize") { -+config("optimize") { } -+config("xoptimize") { - if (is_win) { - # TODO(thakis): Remove is_clang here, https://crbug.com/598772 - if (is_official_build && full_wpo_on_official && !is_clang) { -@@ -1974,7 +1942,8 @@ config("optimize") { - } - - # Same config as 'optimize' but without the WPO flag. --config("optimize_no_wpo") { -+config("optimize_no_wpo") { } -+config("xoptimize_no_wpo") { - 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. -@@ -1997,7 +1966,8 @@ config("optimize_no_wpo") { - } - - # Turn off optimizations. --config("no_optimize") { -+config("no_optimize") { } -+config("xno_optimize") { - if (is_win) { - cflags = [ - "/Od", # Disable optimization. -@@ -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. --config("optimize_max") { -+config("optimize_max") { } -+config("xoptimize_max") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -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. --config("optimize_speed") { -+config("optimize_speed") { } -+config("xoptimize_speed") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -2106,7 +2078,8 @@ config("optimize_speed") { - } - } - --config("optimize_fuzzing") { -+config("optimize_fuzzing") { } -+config("xoptimize_fuzzing") { - cflags = [ "-O1" ] + common_optimize_on_cflags - ldflags = common_optimize_on_ldflags - visibility = [ ":default_optimization" ] -@@ -2192,7 +2165,8 @@ config("afdo") { - # configs += [ "//build/config/compiler:symbols" ] - - # Full symbols. --config("symbols") { -+config("symbols") { } -+config("xsymbols") { - if (is_win) { - if (use_goma || is_clang) { - # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. -@@ -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. --config("minimal_symbols") { -+config("minimal_symbols") { } -+config("xminimal_symbols") { - if (is_win) { - # Linker symbols for backtraces only. - cflags = [] -@@ -2330,7 +2305,8 @@ config("minimal_symbols") { - } - - # No symbols. --config("no_symbols") { -+config("no_symbols") { } -+config("xno_symbols") { - if (!is_win) { - cflags = [ "-g0" ] - asmflags = cflags --- -2.19.0 - diff --git a/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch b/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch deleted file mode 100644 index 20ded611e0a..00000000000 --- a/www-client/chromium/files/chromium-ffmpeg-ebp-r1.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://bugs.chromium.org/p/chromium/issues/detail?id=796379 -https://bugs.gentoo.org/656902 - ---- a/third_party/ffmpeg/BUILD.gn -+++ b/third_party/ffmpeg/BUILD.gn -@@ -239,11 +239,7 @@ - # Windows builds can't compile without EBP because we can't omit frame - # pointers like we do on posix. - if (target_cpu == "x86") { -- if (using_sanitizer || is_win) { -- defines += [ "HAVE_EBP_AVAILABLE=0" ] -- } else { -- defines += [ "HAVE_EBP_AVAILABLE=1" ] -- } -+ defines += [ "HAVE_EBP_AVAILABLE=0" ] - } - - if (is_posix || is_fuchsia) {
