Djam/chromium-browser-stable-test
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-test.git synced 2025-02-23 17:42:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 83.0.4103.97

Browse source
This commit is contained in:
Алзим 2020-06-07 18:57:23 +03:00
parent 04375faf4c
commit 2ceeb86fc7
5 changed files with 87 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.abf.yml
View file

@ -1,7 +1,7 @@
sources:
chromium-81.0.4044.138.tar.xz: b8e9d534f5e0079d0b7471996ea1eafcfc55cb10
chromium-gost-e7a51b189b5c5e64f62d6de9bc7b595d5ce922a2.tar.gz: da889308bda195325a8de46709b3d68b3984e6a5
chromium-83.0.4103.97.tar.xz: 014518b09466d291ff47486002902b93146a28f2
chromium-gost-2ea39b745ba9d671ca3d1001a190918902971685.tar.gz: 682788e365edd823a3a836569689a33436f3b7ab
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
msspi-619fd3a3a585cb501634a3e98efbf7fa6c30747c.tar.gz: 6572bb884374783593e1329be4108291593f1161
msspi-025d6287d2c833d77f6356740ff9ca923955bc03.tar.gz: f8601f8055e8de4b88e5515961e84cf77aa8c2d7
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28

8
chromium-79.0.3945.88-deleted-chromium-gost-info.patch
View file

@ -1,15 +1,17 @@
diff --git a/chrome/installer/linux/common/chromium-browser/chromium-browser.info b/chrome/installer/linux/common/chromium-browser/chromium-browser.info
index 3593c9e797ef..9826523e0f36 100644
index 6f67b06166f0..997d45b6af45 100644
--- a/chrome/installer/linux/common/chromium-browser/chromium-browser.info
+++ b/chrome/installer/linux/common/chromium-browser/chromium-browser.info
@@ -6,22 +6,22 @@
@@ -6,7 +6,7 @@
# chromium-browser packages for various platforms.
# Base name of the package.
-PACKAGE="chromium-browser"
+PACKAGE="chromium-gost"
# Filename of the main executable (for generating launcher scripts, etc.)
# Base name of the snap package
SNAPNAME="chromium"
@@ -15,16 +15,16 @@ SNAPNAME="chromium"
PROGNAME=chrome
# Base directory for package installation.

29
chromium-83.0.4103.97-clang-r1.patch Normal file
View file

@ -0,0 +1,29 @@
--- chromium-83.0.4103.97/base/stl_util.h.orig
+++ chromium-83.0.4103.97/base/stl_util.h
@@ -579,19 +579,19 @@
return old_size - std::distance(container.begin(), container.end());
}
+template <class T, class Allocator, class Predicate>
+size_t EraseIf(std::list<T, Allocator>& container, Predicate pred) {
+ size_t old_size = container.size();
+ container.remove_if(pred);
+ return old_size - container.size();
+}
+
template <class T, class Allocator, class Value>
size_t Erase(std::list<T, Allocator>& container, const Value& value) {
// Unlike std::list::remove, this function template accepts heterogeneous
// types and does not force a conversion to the container's value type before
// invoking the == operator.
return EraseIf(container, [&](const T& cur) { return cur == value; });
-}
-
-template <class T, class Allocator, class Predicate>
-size_t EraseIf(std::list<T, Allocator>& container, Predicate pred) {
- size_t old_size = container.size();
- container.remove_if(pred);
- return old_size - container.size();
}
template <class Key, class T, class Compare, class Allocator, class Predicate>

13
chromium-browser-stable.spec
View file

@ -41,13 +41,13 @@
%define google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ
# GOST patches and sources
%define chromium_gost_commit e7a51b189b5c5e64f62d6de9bc7b595d5ce922a2
%define msspi_commit 619fd3a3a585cb501634a3e98efbf7fa6c30747c
%define chromium_gost_commit 2ea39b745ba9d671ca3d1001a190918902971685
%define msspi_commit 025d6287d2c833d77f6356740ff9ca923955bc03
%define _gostsourcedir %{_builddir}/chromium-gost
Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable
Version: 81.0.4044.138
Version: 83.0.4103.97
Release: 1
License: BSD, LGPL
Group: Networking/WWW
@ -132,6 +132,8 @@ Patch627: chromium-68.0.3440.106-rosa-user-agent.patch
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
# 'EraseIf' should be declared prior to the call site or in namespace 'net'
Patch632: chromium-83.0.4103.97-clang-r1.patch
BuildRequires: bison
%if %{with clang}
@ -142,7 +144,6 @@ BuildRequires: libcxxabi-devel
%endif
# gn needs these
BuildRequires: flex
#BuildRequires: git
BuildRequires: gperf
BuildRequires: gyp
BuildRequires: ninja
@ -191,7 +192,6 @@ BuildRequires: pkgconfig(icu-i18n)
%endif
BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libgcrypt)
#BuildRequires: pkgconfig(libgpsd)
BuildRequires: pkgconfig(libmtp)
BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(libpci)
@ -219,9 +219,11 @@ BuildRequires: pkgconfig(zlib)
# no support python2
#BuildRequires: python2dist(beautifulsoup4)
BuildRequires: python2dist(html5lib)
BuildRequires: python2egg(setuptools)
%else
BuildRequires: pythonegg(beautifulsoup4)
BuildRequires: pythonegg(html5lib)
BuildRequires: pythonegg(setuptools)
%endif
%if %{with gost}
BuildRequires: chrpath
@ -367,6 +369,7 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori
%patch629 -p1
%patch631 -p1 -b .clang6
%patch632 -p1 -b .clang-r1
mkdir -p third_party/llvm-build/Release+Asserts/bin
pushd third_party/llvm-build/Release+Asserts/bin

68
chromium-compiler-r4.patch
View file

@ -8,7 +8,6 @@ Subject: [PATCH] Disable various compiler configs
1 file changed, 25 insertions(+), 39 deletions(-)
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index eef1140..b34b55b 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -270,8 +270,6 @@
@ -20,10 +19,12 @@ index eef1140..b34b55b 100644
":compiler_codegen",
":compiler_deterministic",
]
@@ -503,20 +501,6 @@
}
}
@@ -498,20 +496,6 @@
# platforms can be added later if needed.
if (is_linux && 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=" +
- rebase_path("//tools/clang/crashreports", root_build_dir) ]
@ -36,12 +37,10 @@ index eef1140..b34b55b 100644
- "-Xclang",
- "-instcombine-lower-dbg-declare=0",
- ]
- }
-
}
# C11/C++11 compiler flags setup.
# ---------------------------
if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
@@ -1506,42 +1506,6 @@
@@ -1502,46 +1486,6 @@
# Currently goma can not handle case sensitiveness for windows well.
cflags += [ "-Wno-nonportable-include-path" ]
}
@ -60,22 +59,26 @@ index eef1140..b34b55b 100644
- # TODO(https://crbug.com/999886): Clean up, enable.
- "-Wno-final-dtor-non-final-class",
-
- # TODO(https://crbug.com/1016947) Clean up, enable.
- "-Wno-bitwise-conditional-parentheses",
-
- # TODO(https://crbug.com/1016945) Clean up, enable.
- "-Wno-builtin-assume-aligned-alignment",
-
- # TODO(https://crbug.com/1028110): Evaluate and possible enable.
- "-Wno-deprecated-copy",
-
- # TODO(https://crbug.com/1031169): Clean up and enable.
- "-Wno-misleading-indentation",
- # TODO(https://crbug.com/1050281): Clean up, enable.
- "-Wno-non-c-typedef-for-linkage",
-
- # TODO(https://crbug.com/1039697): Evaluate and possibly enable.
- "-Wno-range-loop-analysis",
- # 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",
@ -84,7 +87,7 @@ index eef1140..b34b55b 100644
}
}
}
@@ -1580,7 +1514,7 @@
@@ -1560,7 +1504,7 @@
defines = [ "_HAS_NODISCARD" ]
}
} else {
@ -93,21 +96,22 @@ index eef1140..b34b55b 100644
if (treat_warnings_as_errors) {
cflags += [ "-Werror" ]
@@ -1589,10 +1523,6 @@
@@ -1568,10 +1512,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
# C99 macros on Mac and Linux.
@@ -1546,15 +1532,6 @@ config("chromium_code") {
@@ -1580,15 +1520,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") {
@ -116,7 +120,19 @@ index eef1140..b34b55b 100644
- # 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" ]
@@ -1606,12 +1606,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" ]