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

Updated to 78.0.3904.70

Browse source
This commit is contained in:
Алзим 2019-10-31 23:21:09 +03:00
parent 2ac7eff0f1
commit 80e7cf3e82
6 changed files with 113 additions and 102 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-77.0.3865.90.tar.xz: 730ffd45ffc7bfe338d090332e0549293d439f59
chromium-gost-e3818b44e5b738666df02a4faa30025e8f70e4a9.tar.gz: 7b4d9aa12015077658fea7722cf3c8b72c91ae07
chromium-78.0.3904.70.tar.xz: b8c177c27ba90a7dcdf5e59d78512c75d63b1746
chromium-gost-405a70fc5aa082f9042c6eee2ad6f355f612d8c8.tar.gz: 8b97982bec6433d96deb6b7f32b37446d2b885cd
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
msspi-11be3c144405ac712432d172bca2863545f81fea.tar.gz: 89319e350b9654b3378cccdec7c70d3ccbcd139f
msspi-c9939360e68a55da613ac8cd0495c6d7022a6ce7.tar.gz: ff0c8077c2b3fce7aaeb6344e61314155f198e82
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28

2
chromium-62-include-cstdlib.patch
View file

@ -7,7 +7,7 @@
+#include <cstdlib>
+#include <cstdint>
class CBC_BarcodeRow {
class CBC_BarcodeRow final {
public:
--- 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

13
chromium-70.0.3538.77-no-system-nodejs.patch
View file

@ -1,13 +0,0 @@
--- chromium-70.0.3538.77/third_party/node/update_node_binaries-orig 2018-10-30 19:13:45.462871396 +0300
+++ chromium-70.0.3538.77/third_party/node/update_node_binaries 2018-10-30 19:13:45.462871396 +0300
@@ -83,8 +83,8 @@
}
# First download checksum file.
-rm -f "SHASUMS256.txt"
-wget "https://nodejs.org/dist/latest-v8.x/SHASUMS256.txt"
+rm -fr "SHASUMS256.txt"
+wget "https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt"
update_unix "darwin-x64" "mac"
update_unix "linux-x64" "linux"

115
chromium-browser-stable.spec
View file

@ -25,7 +25,6 @@
%define libva 0
%define clang 1
%define jsoncpp 0
%define sys_node 1
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Mageia use ONLY.
@ -35,8 +34,8 @@
%define google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ
# GOST patches and sources
%define chromium_gost_commit e3818b44e5b738666df02a4faa30025e8f70e4a9
%define msspi_commit 11be3c144405ac712432d172bca2863545f81fea
%define chromium_gost_commit 405a70fc5aa082f9042c6eee2ad6f355f612d8c8
%define msspi_commit c9939360e68a55da613ac8cd0495c6d7022a6ce7
%define _gostsourcedir %{_builddir}/chromium-gost
%if %{with gost}
@ -50,8 +49,8 @@
Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable
Version: 77.0.3865.90
Release: 6
Version: 78.0.3904.70
Release: 1
License: BSD, LGPL
Group: Networking/WWW
Url: https://www.chromium.org/Home
@ -71,8 +70,8 @@ Source999: new-system-icons.tar.xz
%if %{with gost}
Source1100: Makefile.gost
Source1101: https://github.com/deemru/chromium-gost/archive/%{chromium_gost_commit}/chromium-gost-%{chromium_gost_commit}.tar.gz
Source1102: https://github.com/deemru/msspi/archive/%{msspi_commit}/msspi-%{msspi_commit}.tar.gz
Source1101: https://github.com/deemru/chromium-gost/archive/%{chromium_gost_commit}.tar.gz?/chromium-gost-%{chromium_gost_commit}.tar.gz
Source1102: https://github.com/deemru/msspi/archive/%{msspi_commit}.tar.gz?/msspi-%{msspi_commit}.tar.gz
%endif
Patch4: chromium-30.0.1599.66-master-prefs-path.patch
@ -136,7 +135,6 @@ 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
Patch700: chromium-70.0.3538.77-no-system-nodejs.patch
# Disable fontconfig cache magic that breaks remoting
Patch717: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
@ -154,9 +152,7 @@ BuildRequires: git
BuildRequires: gperf
BuildRequires: gyp
BuildRequires: ninja
%if 0%{?sys_node}
BuildRequires: nodejs
%endif
BuildRequires: util-linux
BuildRequires: yasm
BuildRequires: atomic-devel
@ -237,6 +233,10 @@ Conflicts: %{crname}-unstable
# chromium-browser SUBpackage had Epoch=1
Obsoletes: %{crname} < 1:%{version}-%{release}
Provides: %{crname} = 1:%{version}-%{release}
Obsoletes: chromium-gost-lib < 78.0.3904.70
%if %{with gost}
Provides: chromium-gost-lib = %{EVRD}
%endif
%description
Chromium is a browser that combines a minimal design with sophisticated
@ -282,23 +282,23 @@ fi
#----------------------------------------------------------------------------
%if %{with gost}
%package -n chromium-gost-lib
Summary: Library to enable GOST TLS in Chromium browser via CryptoPro
Group: System/Libraries
Requires: %{name} = %{EVRD}
%description -n chromium-gost-lib
If you need to make TLS work with GOST cryptography in Chromium browser,
install this package and proprietary CryptoPro packages.
Chromium looks for libgostssl.so from this package, if it finds it,
then it dlopens it. CryptoPro's libcapi10.so and libcapi20.so are
loaded by libgostssl.so. All this allows to use GOST TLS encryption
via CryptoPro libraries which implement GOST TLS.
%files -n chromium-gost-lib
%{_crdir}/libgostssl.so
%{_crdir}/gostssl.so
# %package -n chromium-gost-lib
# Summary: Library to enable GOST TLS in Chromium browser via CryptoPro
# Group: System/Libraries
# Requires: %{name} = %{EVRD}
#
# %description -n chromium-gost-lib
# If you need to make TLS work with GOST cryptography in Chromium browser,
# install this package and proprietary CryptoPro packages.
#
# Chromium looks for libgostssl.so from this package, if it finds it,
# then it dlopens it. CryptoPro's libcapi10.so and libcapi20.so are
# loaded by libgostssl.so. All this allows to use GOST TLS encryption
# via CryptoPro libraries which implement GOST TLS.
#
# %files -n chromium-gost-lib
# %{_crdir}/libgostssl.so
# %{_crdir}/gostssl.so
# Symlink to chromium-browser
# Disabled to prevent conflicts with chromium-gost RPMs
#%%{_bindir}/chromium-gost
@ -334,13 +334,18 @@ sed -i \
-e "s,^#include <../ssl/internal.h>,#include \"${PWD}/third_party/boringssl/src/ssl/internal.h\",g" \
%{_gostsourcedir}/src/gostssl.cpp
tar -C %{_gostsourcedir}/src/msspi --strip 1 -xf %{SOURCE1102}
sed -i 's/Chromium GOST/Chromium/g' %{_gostsourcedir}/patch/chromium.patch
patch -p1 < %{_gostsourcedir}/patch/chromium.patch
( cd ./third_party/boringssl/src
patch -p1 < %{_gostsourcedir}/patch/boringssl.patch )
( cd %{_gostsourcedir}
#( cd %{_gostsourcedir}
# Canonical library naming requires to prefix their names with "lib"
# We make a symlink later
grep -rIl gostssl.so . | xargs sed -i 's/gostssl.so/libgostssl.so/g' )
#grep -rIl gostssl.so . | xargs sed -i 's/gostssl.so/libgostssl.so/g' )
cp -f %{_gostsourcedir}/src/gostssl.cpp third_party/boringssl/gostssl.cpp
cp -f %{_gostsourcedir}/src/msspi/src/* third_party/boringssl
cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/boringssl/src/include
%endif
%patch4 -p1 -b .prefs
@ -386,12 +391,6 @@ patch -p1 < %{PATCH608}
%patch631 -p1 -b .clang6
%if 0%{?sys_node}
#
%else
%patch700 -p1
%endif
%patch717 -p1
mkdir -p third_party/llvm-build/Release+Asserts/bin
@ -406,7 +405,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'buildtools/third_party/libc++' \
'buildtools/third_party/libc++abi' \
'base/third_party/cityhash' \
'base/third_party/dmg_fp' \
'base/third_party/double_conversion' \
'base/third_party/dynamic_annotations' \
'base/third_party/icu' \
'base/third_party/libevent' \
@ -460,6 +459,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/catapult/third_party/six' \
'third_party/catapult/tracing/third_party/d3' \
'third_party/catapult/tracing/third_party/gl-matrix' \
'third_party/catapult/tracing/third_party/jpeg-js' \
'third_party/catapult/tracing/third_party/jszip' \
'third_party/catapult/tracing/third_party/mannwhitneyu' \
'third_party/catapult/tracing/third_party/oboe' \
@ -474,6 +474,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/cros_system_api' \
'third_party/dav1d' \
'third_party/dawn' \
'third_party/depot_tools' \
'third_party/devscripts' \
'third_party/dom_distiller_js' \
'third_party/emoji-segmenter' \
@ -553,6 +554,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/pffft' \
'third_party/ply' \
'third_party/polymer' \
'third_party/private-join-and-compute' \
'third_party/protobuf' \
'third_party/protobuf/third_party/six' \
'third_party/pyjson5' \
@ -627,25 +629,20 @@ sed -i \
-e '/"-Wno-defaulted-function-deleted"/d' \
build/config/compiler/BUILD.gn
%if 0%{?sys_node}
# setup node
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
%else
third_party/node/update_node_binaries
third_party/node/update_npm_deps
%endif
%build
%if %{with gost}
make --file %{SOURCE1100} \
SDIR="%{_gostsourcedir}" \
OUTDIR="%{_gostsourcedir}" \
CC="%{__cc}" \
CXX="%{__cxx}" \
CFLAGS="%{optflags}"
%endif
# %if %{with gost}
# make --file %{SOURCE1100} \
# SDIR="%{_gostsourcedir}" \
# OUTDIR="%{_gostsourcedir}" \
# CC="%{__cc}" \
# CXX="%{__cxx}" \
# CFLAGS="%{optflags} -Wno-error=attributes"
# %endif
%define system_gn_list ffmpeg
# flac libxslt snappy yasm libpng zlib
@ -821,28 +818,28 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{crname}
install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{crname}/
install -m 0644 %{SOURCE31} %{buildroot}%{_sysconfdir}/%{crname}/
%if %{with gost}
install -m0644 %{_gostsourcedir}/libgostssl.so %{buildroot}%{_crdir}/libgostssl.so
#%if %{with gost}
#install -m0644 %{_gostsourcedir}/libgostssl.so %{buildroot}%{_crdir}/libgostssl.so
# Compatibility symlink: it is named gostssl.so in other builds of Chromium-GOST
# but it is common to prefix libraries with "lib"
( cd %{buildroot}%{_crdir}/ && ln -s libgostssl.so gostssl.so )
#( cd %{buildroot}%{_crdir}/ && ln -s libgostssl.so gostssl.so )
# Disabled to prevent conflicts with chromium-gost RPMs
#( cd %{buildroot}%{_bindir}/ && ln -s %{crname} chromium-gost )
# Find all files and process them (idea from ALT)
find %{buildroot}%{_crdir} -type f |
while read f; do
#find %{buildroot}%{_crdir} -type f |
#while read f; do
# resolve symlinks
t="$(readlink -ev "$f")"
file "$t" | fgrep -qs ELF || continue
#t="$(readlink -ev "$f")"
#file "$t" | fgrep -qs ELF || continue
# Add real RPATH. We need RPATH in GOST builds because 'dlopen(libgostssl.so)'
# is performed, but libgostssl.so will not be found without RPATH.
# Here we could change chromium.path from chromium-gost so that it has
# an absolute path to "gostssl.so" instead of a relative one
# but it is strange to hardcode absolute paths to libraries and will
# break running our Chromium somewhere outside of standard locations.
chrpath -r '%{_crdir}' "$t" ||:
done
%endif
#chrpath -r '%{_crdir}' "$t" ||:
#done
#%endif
find %{buildroot} -name "*.nexe" -exec strip {} \;

73
chromium-compiler-r4.patch
View file

@ -1,6 +1,6 @@
--- chromium-75.0.3770.142/build/config/compiler/BUILD.gn.orig 2019-08-06 18:59:29.345910533 +0300
+++ chromium-75.0.3770.142/build/config/compiler/BUILD.gn 2019-08-06 18:55:45.301821672 +0300
@@ -230,8 +230,6 @@ config("compiler") {
--- chromium-78.0.3904.21/build/config/compiler/BUILD.gn.build-gentoo 2019-09-19 20:50:21.000000000 +0200
+++ chromium-78.0.3904.21/build/config/compiler/BUILD.gn 2019-09-21 21:08:53.313381239 +0200
@@ -250,8 +250,6 @@ config("compiler") {
configs += [
# See the definitions below.
@ -9,27 +9,54 @@
":compiler_codegen",
":compiler_deterministic",
]
@@ -471,20 +469,6 @@ config("compiler") {
@@ -1436,9 +1434,6 @@ config("default_warnings") {
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872
cflags += [ "-Wno-unused-local-typedefs" ]
- # Don't warn about "maybe" uninitialized. Clang doesn't include this
- # in -Wall but gcc does, and it gives false positives.
- cflags += [ "-Wno-maybe-uninitialized" ]
cflags += [ "-Wno-deprecated-declarations" ]
# -Wcomment gives too many false positives in the case a
@@ -1492,37 +1487,6 @@ config("default_warnings") {
# Currently goma can not handle case sensitiveness for windows well.
cflags += [ "-Wno-nonportable-include-path" ]
}
-
- if (current_toolchain == host_toolchain || !use_xcode_clang) {
- # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
- # recognize.
- cflags += [
- # Ignore warnings about MSVC optimization pragmas.
- # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
- "-Wno-ignored-pragma-optimize",
-
- # TODO(https://crbug.com/989932): Evaluate and possibly enable.
- "-Wno-implicit-int-float-conversion",
-
- # TODO(https://crbug.com/995200): Clean up and enable.
- "-Wno-xor-used-as-pow",
-
- # TODO(https://crbug.com/999871): Decide if we want to clean up the
- # codebase or just disable this. Doesn't seem super useful, but
- # also fires in only 4 files.
- "-Wno-c99-designator",
-
- # This is a side effect of -Wc99-designator; easier to clean up.
- "-Wno-reorder-init-list",
-
- # TODO(https://crbug.com/999886): Clean up, enable.
- "-Wno-final-dtor-non-final-class",
- ]
- cflags_c += [
- # TODO(https://crbug.com/995993): Clean up and enable.
- "-Wno-implicit-fallthrough",
- ]
- }
}
}
- if (is_clang && !is_nacl && !use_xcode_clang) {
- cflags += [ "-fcrash-diagnostics-dir=" +
- rebase_path("//tools/clang/crashreports", root_build_dir) ]
-
- 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",
- ]
- }
-
# C11/C++11 compiler flags setup.
# ---------------------------
if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
}
@@ -1525,7 +1515,7 @@ config("chromium_code") {
defines = [ "_HAS_NODISCARD" ]
}
@ -50,7 +77,7 @@
# 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") {
@@ -1562,15 +1526,6 @@ config("chromium_code") {
"__STDC_FORMAT_MACROS",
]

6
chromium-third-party-cookies-off-by-default.patch
View file

@ -1,11 +1,11 @@
--- 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
@@ -82,7 +82,7 @@
@@ -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->RegisterBooleanPref(
prefs::kCookieControlsEnabled, false,
registry->RegisterIntegerPref(
prefs::kCookieControlsMode,