diff --git a/.abf.yml b/.abf.yml index 70ea442..930fed9 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,8 +1,8 @@ sources: - chromium-86.0.4240.198.tar.xz: 2bbb606badb5d089b3192cee52ee59855f78fb63 - chromium-gost-86.0.4240.198.tar.gz: f614219d5623703deecb19590905981a52c5c851 + chromium-87.0.4280.66.tar.xz: 30a868e768ffedf0120ab5c922edad0a44c36182 + chromium-gost-87.0.4280.66.tar.gz: bf9df5c12818d879d406f2d50bdd9d2713349dc3 depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5 icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 - msspi-0.1.40.tar.gz: 322cbfc406193f460d43074218f0a497176970d9 + msspi-0.1.41.tar.gz: b48c1109a5caa93e44394214b85a4b75475ea1b3 new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28 xcb-proto-1.14.1.tar.xz: 836d5b2dd00ff21bd038e92764fda9a256a1b022 diff --git a/chromium-67.0.3396.87-fix-build-llvm-ar.patch b/chromium-67.0.3396.87-fix-build-llvm-ar.patch deleted file mode 100644 index c43dfb0..0000000 --- a/chromium-67.0.3396.87-fix-build-llvm-ar.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- chromium-68.0.3440.106/build/toolchain/gcc_toolchain.gni-orig 2018-08-08 22:10:32.000000000 +0300 -+++ chromium-68.0.3440.106/build/toolchain/gcc_toolchain.gni 2018-08-11 18:42:17.259611096 +0300 -@@ -318,7 +318,7 @@ - } else { - rspfile = "{{output}}.rsp" - rspfile_content = "{{inputs}}" -- command = "\"$ar\" {{arflags}} -r -c -s -D {{output}} @\"$rspfile\"" -+ command = "\"$ar\" {{arflags}} rcsD {{output}} @\"$rspfile\"" - } - - # Remove the output file first so that ar doesn't try to modify the ---- chromium-68.0.3440.106/build/config/compiler/BUILD.gn-orig 2018-08-11 10:15:29.000000000 +0300 -+++ chromium-68.0.3440.106/build/config/compiler/BUILD.gn 2018-08-11 18:47:35.366897524 +0300 -@@ -1595,7 +1595,7 @@ - # have a "thin archive" mode (it does accept -T, but it means truncating - # archive names to 16 characters, which is not what we want). - if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { -- arflags = [ "-T" ] -+ # arflags = [ "-T" ] - } else if (is_win && use_lld) { - arflags = [ "/llvmlibthin" ] - } diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 84baeaa..d62dcdd 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -43,8 +43,8 @@ %define google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ # GOST patches and sources -%define chromium_gost_ver 86.0.4240.198 -%define msspi_ver 0.1.40 +%define chromium_gost_ver 87.0.4280.66 +%define msspi_ver 0.1.41 %define _gostsourcedir %{_builddir}/chromium-gost %define xcb_version 1.14.1 @@ -64,7 +64,7 @@ Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable -Version: 86.0.4240.198 +Version: 87.0.4280.66 Release: 1 License: BSD, LGPL Group: Networking/WWW @@ -118,9 +118,6 @@ Patch190: chromium-69-gn-bootstrap.patch # (cjw) fix i586 build Patch198: chromium-72-i586.patch -# New from Debian -Patch500: chromium-third-party-cookies-off-by-default.patch - # Google patched their bundled copy of icu 54 to include API functionality that wasn't added until 55. # :P Patch502: chromium-45.0.2454.101-system-icu-54-does-not-have-detectHostTimeZone.patch @@ -141,17 +138,12 @@ Patch601: chromium-62-include-cstdlib.patch Patch603: chromium-66.0.3359.81-system-clang.patch # https://mirror.yandex.ru/gentoo-portage/www-client/chromium/files/ Patch604: chromium-compiler-r4.patch -# https://chromium.googlesource.com/chromium/src/+/40a8d84a54ac47d3299194c5377aebd71714f1f0%5E%21/ -Patch607: chromium-67.0.3396.87-fix-build-llvm-ar.patch - # Add "ROSA" to the user agent string Patch627: chromium-68.0.3440.106-rosa-user-agent.patch # Do not prefix libpng functions Patch629: chromium-60.0.3112.78-no-libpng-prefix.patch # Fix errors build in 69 Patch631: chromium-69.0.3497.100-build-error-in-clang6.patch -# https://chromium-review.googlesource.com/c/chromium/src/+/2427349 -Patch636: remove-dead-reloc-in-nonalloc-LD-flags.patch # Fix build /sandbox/policy/linux/bpf_gpu_policy_linux.cc Patch637: chromium-86.0.4240.80-fcntl-h.patch # Fix build nearby/src/cpp/core_v2/internal/payload_manager.cc @@ -373,9 +365,6 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori %patch190 -p1 %patch198 -p1 -# new from debian -%patch500 -p1 - %if 0%{icu} %patch502 -p1 -b .system-icu %patch504 -p0 -b .icu-ver @@ -393,8 +382,6 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori %endif %patch604 -p1 -%patch607 -p1 - %patch627 -p1 %if %{without native_libpng} %patch629 -p1 @@ -402,7 +389,6 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori %if %{without native_clang} %patch631 -p1 -b .clang6 %endif -%patch636 -p1 %patch637 -p1 -b .fcntl %if %{mdvver} == 201905 %patch638 -p1 @@ -428,6 +414,9 @@ sed -i \ -e '/"-Wno-defaulted-function-deleted"/d' \ build/config/compiler/BUILD.gn +# base/rand_util_posix.cc:27:10: fatal error: 'sys/random.h' file not found +sed -i "s|sys/random.h|/usr/include/linux/random.h|g" base/rand_util_posix.cc + %if %{mdvver} >= 201910 # gn is rather convoluted and not python3 friendly -- let's make # sure it sees python2 when it calls python diff --git a/chromium-compiler-r4.patch b/chromium-compiler-r4.patch index 64291ff..d909250 100644 --- a/chromium-compiler-r4.patch +++ b/chromium-compiler-r4.patch @@ -19,7 +19,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn ":compiler_codegen", ":compiler_deterministic", ] -@@ -490,17 +488,6 @@ +@@ -478,36 +478,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" ] @@ -34,6 +34,25 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn - "-mllvm", - "-instcombine-lower-dbg-declare=0", - ] +- +- # Pinned clang has enable-dse-memoryssa enabled by default but it's broken, +- # so we have to force it off. +- # Trunk clang has it disabled by default but it might work, so we force it +- # on so the ToT bots can check if it works now. +- if (!llvm_force_head_revision) { +- cflags += [ +- # TODO(https://crbug.com/1127713): Investigate, remove. +- "-mllvm", +- "-enable-dse-memoryssa=false", +- ] +- } +- if (llvm_force_head_revision) { +- cflags += [ +- # TODO(https://crbug.com/1127713): Investigate, remove. +- "-mllvm", +- "-enable-dse-memoryssa=true", +- ] +- } } # C11/C++11 compiler flags setup. @@ -49,16 +68,13 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn # Ignore warnings about MSVC optimization pragmas. # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662 "-Wno-ignored-pragma-optimize", -@@ -1538,25 +1533,12 @@ +@@ -1536,22 +1526,12 @@ # 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", -- -- # TODO(https://crbug.com/1114873): Clean up, enable. -- "-Wno-string-concatenation", ] cflags_c += [ diff --git a/chromium-third-party-cookies-off-by-default.patch b/chromium-third-party-cookies-off-by-default.patch deleted file mode 100644 index dc73bc8..0000000 --- a/chromium-third-party-cookies-off-by-default.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/components/content_settings/core/browser/cookie_settings.cc~ 2015-09-02 11:00:33.000000000 +0000 -+++ src/components/content_settings/core/browser/cookie_settings.cc 2015-09-03 09:30:37.497315300 +0000 -@@ -57,7 +57,7 @@ void CookieSettings::GetCookieSettings( - void CookieSettings::RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref( -- prefs::kBlockThirdPartyCookies, false, -+ prefs::kBlockThirdPartyCookies, true, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterIntegerPref( - prefs::kCookieControlsMode, diff --git a/remove-dead-reloc-in-nonalloc-LD-flags.patch b/remove-dead-reloc-in-nonalloc-LD-flags.patch deleted file mode 100644 index 1adf339..0000000 --- a/remove-dead-reloc-in-nonalloc-LD-flags.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 74b0cb5b86f7d7f8f7c1172d85b09096bef147b7 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoara -Date: Thu, 24 Sep 2020 02:34:24 +0000 -Subject: [PATCH] Remove dead-reloc-in-nonalloc LD flags - -Breakpad change landed. Revert workaround. - -Bug: 1105559 -Test: components/crash/content/tools/generate_breakpad_symbols.py --build-dir=out/andrd --binary=out/andrd/lib.unstripped/libcontent_shell_content_view.so --symbols-dir=/tmp/foo --platform=android -Change-Id: I519534002898a97b15a57b9b87ac78ef3f216dee -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427349 -Commit-Queue: Nico Weber -Reviewed-by: Nico Weber -Cr-Commit-Position: refs/heads/master@{#810066} ---- - build/config/compiler/BUILD.gn | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index aa9eca20bd2..42839cfba3f 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -396,14 +396,6 @@ config("compiler") { - "-Wl,--as-needed", - ] - } -- if (use_lld && !is_chromeos_device) { -- # TODO(thakis): Fix dump_syms to not need this and then remove it, -- # https://crbug.com/1105559 -- ldflags += [ -- "-Wl,-z,dead-reloc-in-nonalloc=*=0", -- "-Wl,-z,dead-reloc-in-nonalloc=.debug_ranges=1", -- ] -- } - } - - # Linux-specific compiler flags setup.