mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git
synced 2025-02-23 23:42:54 +00:00
Updated chromium_gost_commit to 79.0.3945.117
This commit is contained in:
Алзим
parent
9f8b579689
commit
c96274faea
3 changed files with 5 additions and 89 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,6 +1,6 @@
|
|||
sources:
|
||||
chromium-79.0.3945.117.tar.xz: 4dff5f8f552f27050a41df9de02df90bb02dfc32
|
||||
chromium-gost-7b09253b0112b1bb7b4e89a9134cf078f4084c85.tar.gz: d34309d905981f3d03261157257530a0c7fe8f6f
|
||||
chromium-gost-577b382a3ca5f59e87c9c33eac85823a3fa39f37.tar.gz: 31e8ade0a52b5a72d57eba981c942b48d79ddcc0
|
||||
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
|
||||
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
|
||||
msspi-0e5911974e2d76d68e24eac4599c7248d0018589.tar.gz: 852d987c066ea7ab7c8e9d638b6e96a20eca6cbb
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff -up chromium-70.0.3538.67/base/test/BUILD.gn.nofc chromium-70.0.3538.67/base/test/BUILD.gn
|
||||
--- chromium-70.0.3538.67/base/test/BUILD.gn.nofc 2018-10-29 11:29:01.356812567 -0400
|
||||
+++ chromium-70.0.3538.67/base/test/BUILD.gn 2018-10-29 11:29:12.631584916 -0400
|
||||
@@ -209,9 +209,6 @@ static_library("test_support") {
|
||||
data_deps = [
|
||||
"//third_party/test_fonts",
|
||||
]
|
||||
- if (current_toolchain == host_toolchain) {
|
||||
- data_deps += [ ":do_generate_fontconfig_caches" ]
|
||||
- }
|
||||
}
|
||||
|
||||
if (is_ios) {
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
%define google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ
|
||||
|
||||
# GOST patches and sources
|
||||
%define chromium_gost_commit 7b09253b0112b1bb7b4e89a9134cf078f4084c85
|
||||
%define chromium_gost_commit 577b382a3ca5f59e87c9c33eac85823a3fa39f37
|
||||
%define msspi_commit 0e5911974e2d76d68e24eac4599c7248d0018589
|
||||
%define _gostsourcedir %{_builddir}/chromium-gost
|
||||
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
Summary: A fast web browser based on the Blink engine
|
||||
Name: chromium-browser-stable
|
||||
Version: 79.0.3945.117
|
||||
Release: 1
|
||||
Release: 2
|
||||
License: BSD, LGPL
|
||||
Group: Networking/WWW
|
||||
Url: https://www.chromium.org/Home
|
||||
|
|
@ -137,9 +137,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
|
||||
|
||||
# Disable fontconfig cache magic that breaks remoting
|
||||
Patch717: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
|
||||
|
||||
BuildRequires: bison
|
||||
%if 0%{?clang}
|
||||
BuildRequires: clang
|
||||
|
|
@ -148,7 +145,6 @@ BuildRequires: libcxx-devel
|
|||
BuildRequires: libcxxabi-devel
|
||||
%endif
|
||||
# gn needs these
|
||||
BuildRequires: libstdc++-static-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: git
|
||||
BuildRequires: gperf
|
||||
|
|
@ -160,7 +156,6 @@ BuildRequires: yasm
|
|||
BuildRequires: atomic-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: cap-devel
|
||||
#BuildRequires: closure-compiler
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: elfutils-devel
|
||||
BuildRequires: jpeg-devel
|
||||
|
|
@ -186,7 +181,6 @@ BuildRequires: pkgconfig(glib-2.0)
|
|||
BuildRequires: pkgconfig(glu)
|
||||
BuildRequires: pkgconfig(gnome-keyring-1)
|
||||
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
|
||||
#BuildRequires: pkgconfig(gtk+-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(harfbuzz)
|
||||
%if 0%{icu}
|
||||
|
|
@ -281,29 +275,6 @@ then
|
|||
rpm -e %{crname}-install
|
||||
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
|
||||
# Symlink to chromium-browser
|
||||
# Disabled to prevent conflicts with chromium-gost RPMs
|
||||
#%%{_bindir}/chromium-gost
|
||||
%endif
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%package -n chromedriver
|
||||
|
|
@ -342,10 +313,6 @@ patch -p1 < %{_gostsourcedir}/patch/chromium.patch
|
|||
%patch1 -p1 -R
|
||||
( cd ./third_party/boringssl/src
|
||||
patch -p1 < %{_gostsourcedir}/patch/boringssl.patch )
|
||||
#( 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' )
|
||||
|
||||
cp -f %{_gostsourcedir}/src/gostssl.cpp third_party/boringssl/gostssl.cpp
|
||||
cp -f %{_gostsourcedir}/src/msspi/src/* third_party/boringssl
|
||||
|
|
@ -394,8 +361,6 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori
|
|||
|
||||
%patch631 -p1 -b .clang6
|
||||
|
||||
%patch717 -p1
|
||||
|
||||
mkdir -p third_party/llvm-build/Release+Asserts/bin
|
||||
pushd third_party/llvm-build/Release+Asserts/bin
|
||||
ln -sf /usr/bin/clang clang
|
||||
|
|
@ -618,11 +583,6 @@ build/linux/unbundle/remove_bundled_libraries.py \
|
|||
'v8/third_party/v8' \
|
||||
--do-remove
|
||||
|
||||
# Remove bundled ICU; its header files appear to get picked up instead of
|
||||
# the system ones, leading to errors during the final link stage.
|
||||
# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/BNGvJc08B6Q
|
||||
#find third_party/icu -type f \! -regex '.*\.\(gn\|gni\|isolate\)' -delete
|
||||
|
||||
# Hard code extra version
|
||||
FILE=chrome/common/channel_info_posix.cc
|
||||
sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{product_vendor} %{product_version}"/' $FILE
|
||||
|
|
@ -639,15 +599,6 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
|
|||
|
||||
%build
|
||||
|
||||
# %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
|
||||
# opus
|
||||
|
|
@ -702,6 +653,8 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
|
|||
custom_toolchain="%{_sourcedir}:default" \
|
||||
ffmpeg_branding="Chromium" \
|
||||
proprietary_codecs=true \
|
||||
linux_link_libudev = true \
|
||||
linux_link_libspeechd = true \
|
||||
enable_platform_ac3_eac3_audio = true \
|
||||
enable_mse_mpeg2ts_stream_parser=true \
|
||||
enable_platform_hevc=true \
|
||||
|
|
@ -816,28 +769,4 @@ 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
|
||||
# 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 )
|
||||
# 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
|
||||
# resolve symlinks
|
||||
#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
|
||||
|
||||
find %{buildroot} -name "*.nexe" -exec strip {} \;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue