From c20c59aaf8fe205ccbb4f162f552b17904632e68 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 13 Mar 2021 18:46:44 +0300 Subject: [PATCH] rm not used patch Commit 6aceefa0d998a switched it off, I forgot to delete it. --- chromium-browser-stable.spec | 5 -- chromium-compiler-r4.patch | 124 ----------------------------------- 2 files changed, 129 deletions(-) delete mode 100644 chromium-compiler-r4.patch diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 55e1c32..9ebd365 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -121,8 +121,6 @@ Patch600: chromium-buildname-60.0.3112.90.patch # Patch to fix build Patch601: chromium-62-include-cstdlib.patch -# https://mirror.yandex.ru/gentoo-portage/www-client/chromium/files/ -Patch604: chromium-compiler-r4.patch # Add "ROSA" to the user agent string # Fix build /sandbox/policy/linux/bpf_gpu_policy_linux.cc on rosa2016.1 Patch637: chromium-86.0.4240.80-fcntl-h.patch @@ -359,9 +357,6 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori %patch600 -p1 %patch601 -p1 - -#patch604 -p1 - %patch627 -p1 %patch637 -p1 %patch639 -p1 diff --git a/chromium-compiler-r4.patch b/chromium-compiler-r4.patch deleted file mode 100644 index fd9fca1..0000000 --- a/chromium-compiler-r4.patch +++ /dev/null @@ -1,124 +0,0 @@ -From a1207cc75454e653030716948d27ec27412f6fe8 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sat, 16 Jun 2019 15:43:27 +0100 -Subject: [PATCH] Disable various compiler configs - ---- - build/config/compiler/BUILD.gn | 64 +++++++++++++--------------------- - 1 file changed, 25 insertions(+), 39 deletions(-) - -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -254,8 +254,6 @@ - - configs += [ - # See the definitions below. -- ":clang_revision", -- ":compiler_cpu_abi", - ":compiler_codegen", - ":compiler_deterministic", - ] -@@ -476,17 +474,6 @@ - # platforms can be added later if needed. - if ((is_linux || is_chromeos) && use_lld && use_text_section_splitting) { - ldflags += [ "-Wl,-z,keep-text-section-prefix" ] -- } -- -- if (is_clang && !is_nacl && !use_xcode_clang) { -- cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] -- -- cflags += [ -- # TODO(hans): Remove this once Clang generates better optimized debug info -- # by default. https://crbug.com/765793 -- "-mllvm", -- "-instcombine-lower-dbg-declare=0", -- ] - } - - # C11/C++11 compiler flags setup. -@@ -1514,11 +1501,6 @@ - # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not - # recognize. - cflags += [ -- # An ABI compat warning we don't care about, https://crbug.com/1102157 -- # TODO(thakis): Push this to the (few) targets that need it, -- # instead of having a global flag. -- "-Wno-psabi", -- - # Ignore warnings about MSVC optimization pragmas. - # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662 - "-Wno-ignored-pragma-optimize", -@@ -1534,9 +1516,6 @@ - - # TODO(https://crbug.com/1028110): Evaluate and possible enable. - "-Wno-deprecated-copy", -- -- # TODO(https://crbug.com/1050281): Clean up, enable. -- "-Wno-non-c-typedef-for-linkage", - ] - - cflags_c += [ -@@ -1548,13 +1527,6 @@ - # TODO(https://crbug.com/1143700): Clean up and re-enable. - cflags_objc = [ "-Wno-gnu-folding-constant" ] - } -- -- if (enable_wmax_tokens) { -- cflags += [ "-Wmax-tokens" ] -- } else { -- # TODO(https://crbug.com/1049569): Remove after Clang 87b235db. -- cflags += [ "-Wno-max-tokens" ] -- } - } - } - } -@@ -1574,7 +1546,7 @@ - defines = [ "_HAS_NODISCARD" ] - } - } else { -- cflags = [ "-Wall" ] -+ cflags = [] - if (treat_warnings_as_errors) { - cflags += [ "-Werror" ] - -@@ -1582,10 +1554,6 @@ - # the actual linker. Make sure these warnings are treated as errors as - # well. - ldflags = [ "-Werror" ] -- } -- if (is_clang) { -- # Enable extra warnings for chromium_code when we control the compiler. -- cflags += [ "-Wextra" ] - } - - # In Chromium code, we define __STDC_foo_MACROS in order to get the -@@ -1594,15 +1562,6 @@ - "__STDC_CONSTANT_MACROS", - "__STDC_FORMAT_MACROS", - ] -- -- if (!is_debug && !using_sanitizer && current_cpu != "s390x" && -- current_cpu != "s390" && current_cpu != "ppc64" && -- current_cpu != "mips" && current_cpu != "mips64") { -- # 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" ] -@@ -1685,12 +1644,6 @@ - # suppressing them individually, we just blanket suppress them here. - "-Wno-unused-variable", - ] -- if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang)) { -- cflags += [ -- # TODO(https://crbug.com/1031169): Clean up and enable. -- "-Wno-misleading-indentation", -- ] -- } - } - - configs = [ ":default_warnings" ]