From 3ec4ec25f06bade0c2ccf8c48905f7a53515f8dc Mon Sep 17 00:00:00 2001 From: Alzim Date: Fri, 17 Jul 2020 20:27:23 +0300 Subject: [PATCH] Updated to 84.0.4147.89 --- .abf.yml | 7 ++++--- chromium-62-include-cstdlib.patch | 4 ++-- chromium-84.0.4147.89-clang8.patch | 12 ++++++++++++ chromium-browser-stable.spec | 22 +++++++++++++++++----- chromium-compiler-r4.patch | 28 +++++++++------------------- 5 files changed, 44 insertions(+), 29 deletions(-) create mode 100644 chromium-84.0.4147.89-clang8.patch diff --git a/.abf.yml b/.abf.yml index b716e8e..bca1cbc 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,7 +1,8 @@ sources: - chromium-83.0.4103.116.tar.xz: 83beee445f084845557ae40d5e5a047bdd702d69 - chromium-gost-76601f2defc0c29723da26e8052944a9be17b9b6.tar.gz: 350c2f4f7c8c629f06ac5c19f867930cfac55612 + chromium-84.0.4147.89.tar.xz: 7ebbc91a657f5e6e50b272a2f7fd5831e3bc28b8 + chromium-gost-234963582f7744f0edc7e0939ec8b906faedd7c5.tar.gz: 35bf50fbc17e7e55b997d60433a062b6e8d647ba depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5 icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 - msspi-4928f7172b9233b8d91e7d2dcd500769c1bc6ef8.tar.gz: 7a101c50c134060aa7c7a73e9ac7b3e8ca1f921b + msspi-cf0e72ec1578608e95b2842528df7a50c946d9cd.tar.gz: 1d7a87939f142f2d2cc2ef51bec478bde01eab63 new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28 + xcb-proto-1.14.tar.xz: 170307b3748cf6c9953db2017615821428fca8be diff --git a/chromium-62-include-cstdlib.patch b/chromium-62-include-cstdlib.patch index 1cd56e7..0f1219f 100644 --- a/chromium-62-include-cstdlib.patch +++ b/chromium-62-include-cstdlib.patch @@ -7,8 +7,8 @@ +#include +#include - class CBC_BarcodeRow final { - public: + #include "core/fxcrt/fx_memory_wrappers.h" + --- chromium-71.0.3578.98/third_party/pdfium/fxbarcode/qrcode/BC_QRCoderECBlocks.h.orig +++ chromium-71.0.3578.98/third_party/pdfium/fxbarcode/qrcode/BC_QRCoderECBlocks.h @@ -8,6 +8,9 @@ diff --git a/chromium-84.0.4147.89-clang8.patch b/chromium-84.0.4147.89-clang8.patch new file mode 100644 index 0000000..648e79d --- /dev/null +++ b/chromium-84.0.4147.89-clang8.patch @@ -0,0 +1,12 @@ +--- chromium-84.0.4147.89/cc/trees/frame_rate_estimator.cc.orig ++++ chromium-84.0.4147.89/cc/trees/frame_rate_estimator.cc +@@ -48,7 +48,7 @@ + // frequency is lower than that, then using a lower frame rate is permitted. + // The delta below is to account for minor offsets in frame times. + constexpr auto kFudgeDelta = base::TimeDelta::FromMilliseconds(1); +- constexpr auto kMinDelta = ++ const auto kMinDelta = + (viz::BeginFrameArgs::DefaultInterval() * 2) + kFudgeDelta; + if (draw_delta < kMinDelta) + num_of_consecutive_frames_with_min_delta_++; + diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index b63a9be..1211fb0 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -41,13 +41,15 @@ %define google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ # GOST patches and sources -%define chromium_gost_commit 76601f2defc0c29723da26e8052944a9be17b9b6 -%define msspi_commit 4928f7172b9233b8d91e7d2dcd500769c1bc6ef8 +%define chromium_gost_commit 234963582f7744f0edc7e0939ec8b906faedd7c5 +%define msspi_commit cf0e72ec1578608e95b2842528df7a50c946d9cd %define _gostsourcedir %{_builddir}/chromium-gost +%define xcb_version 1.14 + Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable -Version: 83.0.4103.116 +Version: 84.0.4147.89 Release: 1 License: BSD, LGPL Group: Networking/WWW @@ -59,6 +61,8 @@ Source2: %{crname}.desktop # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/toolchain/BUILD.gn Source5: BUILD.gn Source10: %{name}.rpmlintrc +# Bring xcb-proto with us (might need more than python on EPEL?) +Source20: https://www.x.org/releases/individual/proto/xcb-proto-%{xcb_version}.tar.xz Source30: master_preferences Source31: default_bookmarks.html Source32: chromium.default @@ -134,6 +138,8 @@ Patch629: chromium-60.0.3112.78-no-libpng-prefix.patch Patch631: chromium-69.0.3497.100-build-error-in-clang6.patch # 'EraseIf' should be declared prior to the call site or in namespace 'net' Patch632: chromium-83.0.4103.97-clang-r1.patch +# error: constexpr variable 'kMinDelta' must be initialized by a constant expression +Patch633: chromium-84.0.4147.89-clang8.patch BuildRequires: bison %if %{with clang} @@ -369,6 +375,9 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori %patch631 -p1 -b .clang6 %patch632 -p1 -b .clang-r1 +%if %{mdvver} <= 201610 +%patch633 -p1 -b .clang8 +%endif mkdir -p third_party/llvm-build/Release+Asserts/bin pushd third_party/llvm-build/Release+Asserts/bin @@ -403,6 +412,11 @@ mkdir -p third_party/node/linux/node-linux-x64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node %build +%if %{mdvver} <= 201610 +# unpack a local copy of the xcb-proto bits +tar xf %{SOURCE20} +export PYTHONPATH="../../third_party/pyjson5/src:../../xcb-proto-%{xcb_version}" +%endif %define system_gn_list ffmpeg # flac libxslt snappy yasm libpng zlib @@ -452,8 +466,6 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node icu_use_data_file=true \ enable_nacl=false \ is_nacl_glibc=false \ - binutils_path="%{_bindir}" \ - linux_use_bundled_binutils=false \ use_gold=%{use_gold} \ custom_toolchain="%{_sourcedir}:default" \ ffmpeg_branding="Chromium" \ diff --git a/chromium-compiler-r4.patch b/chromium-compiler-r4.patch index a635a65..d34818e 100644 --- a/chromium-compiler-r4.patch +++ b/chromium-compiler-r4.patch @@ -10,7 +10,7 @@ Subject: [PATCH] Disable various compiler configs 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 -@@ -270,8 +270,6 @@ +@@ -250,8 +250,6 @@ configs += [ # See the definitions below. @@ -19,7 +19,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn ":compiler_codegen", ":compiler_deterministic", ] -@@ -498,20 +496,6 @@ +@@ -470,20 +468,6 @@ # platforms can be added later if needed. if (is_linux && use_lld && use_text_section_splitting) { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] @@ -40,9 +40,9 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn } # C11/C++11 compiler flags setup. -@@ -1502,46 +1486,6 @@ - # Currently goma can not handle case sensitiveness for windows well. - cflags += [ "-Wno-nonportable-include-path" ] +@@ -1475,36 +1459,6 @@ + # See crbug.com/1079053 for more details. + cflags += [ "-Wno-max-tokens" ] } - - if (current_toolchain == host_toolchain || !use_xcode_clang) { @@ -67,18 +67,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn - - # TODO(https://crbug.com/1050281): Clean up, enable. - "-Wno-non-c-typedef-for-linkage", -- -- # TODO(https://crbug.com/1059231): Clean up, enable. -- "-Wno-pointer-to-int-cast", - ] - -- if (is_android) { -- cflags += [ -- # TODO(https://crbug.com/1016947) Clean up, enable. -- "-Wno-bitwise-conditional-parentheses", -- ] -- } -- - cflags_c += [ - # TODO(https://crbug.com/995993): Clean up and enable. - "-Wno-implicit-fallthrough", @@ -87,7 +77,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn } } } -@@ -1560,7 +1504,7 @@ +@@ -1523,7 +1477,7 @@ defines = [ "_HAS_NODISCARD" ] } } else { @@ -96,7 +86,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn if (treat_warnings_as_errors) { cflags += [ "-Werror" ] -@@ -1568,10 +1512,6 @@ +@@ -1531,10 +1485,6 @@ # the actual linker. Make sure these warnings are treated as errors as # well. ldflags = [ "-Werror" ] @@ -107,7 +97,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn } # In Chromium code, we define __STDC_foo_MACROS in order to get the -@@ -1580,15 +1520,6 @@ +@@ -1543,15 +1493,6 @@ "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", ] @@ -123,7 +113,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn if (is_mac) { cflags_objc = [ "-Wobjc-missing-property-synthesis" ] -@@ -1606,12 +1606,6 @@ +@@ -1638,12 +1579,6 @@ # suppressing them individually, we just blanket suppress them here. "-Wno-unused-variable", ]