mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git
synced 2025-02-23 23:42:54 +00:00
Updated to 80.0.3987.149
This commit is contained in:
Алзим
parent
810d617b37
commit
ef4e068cc7
2 changed files with 24 additions and 232 deletions
6
.abf.yml
6
.abf.yml
|
|
@ -1,7 +1,7 @@
|
|||
sources:
|
||||
chromium-80.0.3987.132.tar.xz: 9a2b7c398c492380d45deec46d677a4fcd280123
|
||||
chromium-gost-0c9f5b530d86be60efb4ad172730c3df7b8b4faf.tar.gz: 4b9870490ced9a8cd64475544e342728f089db9d
|
||||
chromium-80.0.3987.149.tar.xz: 9329edd5c55078f20a1fddd7e6fb79c78c2240e9
|
||||
chromium-gost-4232a74fcd4458ff17e273c5cfb99804906b9085.tar.gz: 30e8e423cdd2e1a64cb1ae2c2915d1cb1b8afa0e
|
||||
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
|
||||
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
|
||||
msspi-b326deaa5549b5ae2b1d33546ab33cedbd4677b6.tar.gz: 0e30bd7da5d36d54848e08b3200b06947f830f3c
|
||||
msspi-299e461b3a2be5f8118407359a616a1ed4b7798e.tar.gz: c77fceff95f90ebfa205c1b82b46495443aa4b23
|
||||
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28
|
||||
|
|
|
|||
|
|
@ -12,7 +12,12 @@
|
|||
%define debug_package %{nil}
|
||||
|
||||
%global _build_pkgcheck_set %{nil}
|
||||
|
||||
%ifarch x86_64 %ix86
|
||||
%bcond_without gost
|
||||
%else
|
||||
%bcond_with gost
|
||||
%endif
|
||||
|
||||
# eol 'fix' corrupts some .bin
|
||||
%define dont_fix_eol 1
|
||||
|
|
@ -36,22 +41,13 @@
|
|||
%define google_default_client_secret mRHXPjlS4cLpp1beCiXoYbLZ
|
||||
|
||||
# GOST patches and sources
|
||||
%define chromium_gost_commit 0c9f5b530d86be60efb4ad172730c3df7b8b4faf
|
||||
%define msspi_commit b326deaa5549b5ae2b1d33546ab33cedbd4677b6
|
||||
%define chromium_gost_commit 4232a74fcd4458ff17e273c5cfb99804906b9085
|
||||
%define msspi_commit 299e461b3a2be5f8118407359a616a1ed4b7798e
|
||||
%define _gostsourcedir %{_builddir}/chromium-gost
|
||||
|
||||
%if %{with gost}
|
||||
# When building libgostssl.so, we make empty fake libcapi10.so* and libcapi20.so*
|
||||
# to emulate linking with proprietary CryptoPro libraries; at runtime Chromium
|
||||
# tries to dlopen libgostssl.so and, if libcapi* libs are missing, it will simply
|
||||
# not load this library and will not fail with an error. So, we don't need to depend
|
||||
# from these libraries, especially because we can't put them into the repository.
|
||||
%global __requires_exclude 'libcapi.*\.so\.*'
|
||||
%endif
|
||||
|
||||
Summary: A fast web browser based on the Blink engine
|
||||
Name: chromium-browser-stable
|
||||
Version: 80.0.3987.132
|
||||
Version: 80.0.3987.149
|
||||
Release: 1
|
||||
License: BSD, LGPL
|
||||
Group: Networking/WWW
|
||||
|
|
@ -71,7 +67,6 @@ Source997: depot_tools.tar.xz
|
|||
Source999: new-system-icons.tar.xz
|
||||
|
||||
%if %{with gost}
|
||||
Source1100: Makefile.gost
|
||||
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
|
||||
|
|
@ -171,6 +166,11 @@ BuildRequires: speech-dispatcher-devel
|
|||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: pkgconfig(atk)
|
||||
BuildRequires: pkgconfig(dbus-glib-1)
|
||||
%if %rpm4
|
||||
BuildRequires: pkgconfig(dri)
|
||||
BuildRequires: pkgconfig(krb5)
|
||||
BuildRequires: pkgconfig(krb5-gssapi)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(expat)
|
||||
%if 0%{?ffmpeg}
|
||||
BuildRequires: pkgconfig(libavcodec) >= 4.0.2
|
||||
|
|
@ -216,8 +216,8 @@ BuildRequires: pkgconfig(xt)
|
|||
BuildRequires: pkgconfig(xtst)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
%if %{mdvver} >= 201910
|
||||
#BuildRequires: python2dist(beautifulsoup4)
|
||||
#BuildRequires: python2dist(html5lib)
|
||||
BuildRequires: python2dist(beautifulsoup4)
|
||||
BuildRequires: python2dist(html5lib)
|
||||
%else
|
||||
BuildRequires: pythonegg(beautifulsoup4)
|
||||
BuildRequires: pythonegg(html5lib)
|
||||
|
|
@ -374,217 +374,6 @@ ln -sf /usr/bin/clang clang
|
|||
ln -sf /usr/bin/clang++ clang++
|
||||
popd
|
||||
|
||||
# Remove most of the bundled libraries. Libraries specified below (taken from
|
||||
# Gentoo's Chromium ebuild) are the libraries that needs to be preserved.
|
||||
# build/linux/unbundle/remove_bundled_libraries.py \
|
||||
# 'buildtools/third_party/libc++' \
|
||||
# 'buildtools/third_party/libc++abi' \
|
||||
# 'base/third_party/cityhash' \
|
||||
# 'base/third_party/double_conversion' \
|
||||
# 'base/third_party/dynamic_annotations' \
|
||||
# 'base/third_party/icu' \
|
||||
# 'base/third_party/libevent' \
|
||||
# 'base/third_party/nspr' \
|
||||
# 'base/third_party/superfasthash' \
|
||||
# 'base/third_party/symbolize' \
|
||||
# 'base/third_party/valgrind' \
|
||||
# 'base/third_party/xdg_mime' \
|
||||
# 'base/third_party/xdg_user_dirs' \
|
||||
# 'chrome/third_party/mozilla_security_manager' \
|
||||
# 'courgette/third_party' \
|
||||
# 'net/third_party/mozilla_security_manager' \
|
||||
# 'net/third_party/nss' \
|
||||
# 'net/third_party/quic' \
|
||||
# 'net/third_party/uri_template' \
|
||||
# 'third_party/abseil-cpp' \
|
||||
# 'third_party/adobe' \
|
||||
# 'third_party/angle' \
|
||||
# 'third_party/angle/src/common/third_party/base' \
|
||||
# 'third_party/angle/src/common/third_party/smhasher' \
|
||||
# 'third_party/angle/src/common/third_party/xxhash' \
|
||||
# 'third_party/angle/src/third_party/compiler' \
|
||||
# 'third_party/angle/src/third_party/libXNVCtrl' \
|
||||
# 'third_party/angle/src/third_party/trace_event' \
|
||||
# 'third_party/angle/third_party/glslang' \
|
||||
# 'third_party/angle/third_party/spirv-headers' \
|
||||
# 'third_party/angle/third_party/spirv-tools' \
|
||||
# 'third_party/angle/third_party/vulkan-headers' \
|
||||
# 'third_party/angle/third_party/vulkan-loader' \
|
||||
# 'third_party/angle/third_party/vulkan-tools' \
|
||||
# 'third_party/angle/third_party/vulkan-validation-layers' \
|
||||
# 'third_party/apple_apsl' \
|
||||
# 'third_party/axe-core' \
|
||||
# 'third_party/blanketjs' \
|
||||
# 'third_party/blink' \
|
||||
# 'third_party/boringssl' \
|
||||
# 'third_party/boringssl/src/third_party/fiat' \
|
||||
# 'third_party/breakpad' \
|
||||
# 'third_party/breakpad/breakpad/src/third_party/curl' \
|
||||
# 'third_party/brotli' \
|
||||
# 'third_party/cacheinvalidation' \
|
||||
# 'third_party/catapult' \
|
||||
# 'third_party/catapult/common/py_vulcanize/third_party/rcssmin' \
|
||||
# 'third_party/catapult/common/py_vulcanize/third_party/rjsmin' \
|
||||
# 'third_party/catapult/third_party/beautifulsoup4' \
|
||||
# 'third_party/catapult/third_party/html5lib-python' \
|
||||
# 'third_party/catapult/third_party/polymer' \
|
||||
# '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' \
|
||||
# 'third_party/catapult/tracing/third_party/pako' \
|
||||
# 'third_party/ced' \
|
||||
# 'third_party/cld_3' \
|
||||
# 'third_party/closure_compiler' \
|
||||
# 'third_party/crashpad' \
|
||||
# 'third_party/crashpad/crashpad/third_party/lss' \
|
||||
# 'third_party/crashpad/crashpad/third_party/zlib' \
|
||||
# 'third_party/crc32c' \
|
||||
# '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' \
|
||||
# 'third_party/expat' \
|
||||
# 'third_party/ffmpeg' \
|
||||
# 'third_party/flac' \
|
||||
# 'third_party/flatbuffers' \
|
||||
# 'third_party/fontconfig' \
|
||||
# 'third_party/freetype' \
|
||||
# 'third_party/glslang' \
|
||||
# 'third_party/google_input_tools' \
|
||||
# 'third_party/google_input_tools/third_party/closure_library' \
|
||||
# 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
|
||||
# 'third_party/googletest' \
|
||||
# 'third_party/harfbuzz-ng' \
|
||||
# 'third_party/hunspell' \
|
||||
# 'third_party/iccjpeg' \
|
||||
# 'third_party/icu' \
|
||||
# 'third_party/inspector_protocol' \
|
||||
# 'third_party/jinja2' \
|
||||
# 'third_party/jsoncpp' \
|
||||
# 'third_party/jstemplate' \
|
||||
# 'third_party/khronos' \
|
||||
# 'third_party/leveldatabase' \
|
||||
# 'third_party/libXNVCtrl' \
|
||||
# 'third_party/libaddressinput' \
|
||||
# 'third_party/libaom' \
|
||||
# 'third_party/libaom/source/libaom/third_party/vector' \
|
||||
# 'third_party/libaom/source/libaom/third_party/x86inc' \
|
||||
# 'third_party/libdrm' \
|
||||
# 'third_party/libjingle' \
|
||||
# 'third_party/libjpeg_turbo' \
|
||||
# 'third_party/libphonenumber' \
|
||||
# 'third_party/libpng' \
|
||||
# 'third_party/libsecret' \
|
||||
# 'third_party/libsrtp' \
|
||||
# 'third_party/libsync' \
|
||||
# 'third_party/libudev' \
|
||||
# 'third_party/libusb' \
|
||||
# 'third_party/libvpx' \
|
||||
# 'third_party/libvpx/source/libvpx/third_party/x86inc' \
|
||||
# 'third_party/libxml' \
|
||||
# 'third_party/libxml/chromium' \
|
||||
# 'third_party/libxslt' \
|
||||
# 'third_party/libwebm' \
|
||||
# 'third_party/libwebp' \
|
||||
# 'third_party/libyuv' \
|
||||
# 'third_party/llvm-build' \
|
||||
# 'third_party/lss' \
|
||||
# 'third_party/lzma_sdk' \
|
||||
# 'third_party/markupsafe' \
|
||||
# 'third_party/mesa' \
|
||||
# 'third_party/metrics_proto' \
|
||||
# 'third_party/modp_b64' \
|
||||
# 'third_party/nasm' \
|
||||
# 'third_party/node' \
|
||||
# 'third_party/node/linux' \
|
||||
# 'third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2' \
|
||||
# 'third_party/one_euro_filter' \
|
||||
# 'third_party/openh264' \
|
||||
# 'third_party/openscreen' \
|
||||
# 'third_party/openscreen/src/third_party/tinycbor/src/src' \
|
||||
# 'third_party/opus' \
|
||||
# 'third_party/ots' \
|
||||
# 'third_party/pdfium' \
|
||||
# 'third_party/pdfium/third_party/agg23' \
|
||||
# 'third_party/pdfium/third_party/base' \
|
||||
# 'third_party/pdfium/third_party/bigint' \
|
||||
# 'third_party/pdfium/third_party/freetype' \
|
||||
# 'third_party/pdfium/third_party/lcms' \
|
||||
# 'third_party/pdfium/third_party/libopenjpeg20' \
|
||||
# 'third_party/pdfium/third_party/libpng16' \
|
||||
# 'third_party/pdfium/third_party/libtiff' \
|
||||
# 'third_party/pdfium/third_party/skia_shared' \
|
||||
# 'third_party/perfetto' \
|
||||
# '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' \
|
||||
# 'third_party/qcms' \
|
||||
# 'third_party/qunit' \
|
||||
# 'third_party/re2' \
|
||||
# 'third_party/rnnoise' \
|
||||
# 'third_party/s2cellid' \
|
||||
# 'third_party/sfntly' \
|
||||
# 'third_party/simplejson' \
|
||||
# 'third_party/sinonjs' \
|
||||
# 'third_party/skia' \
|
||||
# 'third_party/skia/include/third_party/skcms' \
|
||||
# 'third_party/skia/include/third_party/vulkan' \
|
||||
# 'third_party/skia/third_party/skcms' \
|
||||
# 'third_party/skia/third_party/vulkan' \
|
||||
# 'third_party/smhasher' \
|
||||
# 'third_party/snappy' \
|
||||
# 'third_party/speech-dispatcher' \
|
||||
# 'third_party/spirv-headers' \
|
||||
# 'third_party/SPIRV-Tools' \
|
||||
# 'third_party/sqlite' \
|
||||
# 'third_party/swiftshader' \
|
||||
# 'third_party/swiftshader/third_party/llvm-7.0' \
|
||||
# 'third_party/swiftshader/third_party/llvm-subzero' \
|
||||
# 'third_party/swiftshader/third_party/marl' \
|
||||
# 'third_party/swiftshader/third_party/subzero' \
|
||||
# 'third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1' \
|
||||
# 'third_party/tcmalloc' \
|
||||
# 'third_party/test_fonts' \
|
||||
# 'third_party/unrar' \
|
||||
# 'third_party/usb_ids' \
|
||||
# 'third_party/usrsctp' \
|
||||
# 'third_party/vulkan' \
|
||||
# 'third_party/web-animations-js' \
|
||||
# 'third_party/webdriver' \
|
||||
# 'third_party/webrtc' \
|
||||
# 'third_party/webrtc/common_audio/third_party/fft4g' \
|
||||
# 'third_party/webrtc/common_audio/third_party/spl_sqrt_floor' \
|
||||
# 'third_party/webrtc/modules/third_party/fft' \
|
||||
# 'third_party/webrtc/modules/third_party/g711' \
|
||||
# 'third_party/webrtc/modules/third_party/g722' \
|
||||
# 'third_party/webrtc/rtc_base/third_party/base64' \
|
||||
# 'third_party/webrtc/rtc_base/third_party/sigslot' \
|
||||
# 'third_party/widevine' \
|
||||
# 'third_party/woff2' \
|
||||
# 'third_party/xdg-utils' \
|
||||
# 'third_party/yasm' \
|
||||
# 'third_party/zlib' \
|
||||
# 'third_party/zlib/google' \
|
||||
# 'tools/gn/base/third_party/icu' \
|
||||
# 'url/third_party/mozilla' \
|
||||
# 'v8/src/third_party/siphash' \
|
||||
# 'v8/src/third_party/utf8-decoder' \
|
||||
# 'v8/src/third_party/valgrind' \
|
||||
# 'v8/third_party/inspector_protocol' \
|
||||
# 'v8/third_party/v8' \
|
||||
# --do-remove
|
||||
|
||||
# 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
|
||||
|
|
@ -601,6 +390,10 @@ sed -i \
|
|||
ln -s %{_bindir}/python2 python
|
||||
|
||||
find . -type f -exec sed -i 's,#!/usr/bin/env python,#!/usr/bin/env python2,g' {} \;
|
||||
|
||||
mkdir -p local_bin
|
||||
ln -s %{__python2} local_bin/python
|
||||
export PATH="$PWD/local_bin:$PATH"
|
||||
%endif
|
||||
|
||||
# setup node
|
||||
|
|
@ -693,8 +486,8 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node
|
|||
google_default_client_id="%{google_default_client_id}" \
|
||||
google_default_client_secret="%{google_default_client_secret}"
|
||||
|
||||
build/linux/unbundle/replace_gn_files.py --system-libraries %{system_gn_list}
|
||||
third_party/libaddressinput/chromium/tools/update-strings.py
|
||||
python2 build/linux/unbundle/replace_gn_files.py --system-libraries %{system_gn_list}
|
||||
python2 third_party/libaddressinput/chromium/tools/update-strings.py
|
||||
|
||||
%if %{with clang}
|
||||
export CC=clang
|
||||
|
|
@ -734,7 +527,6 @@ out/Release/gn gen --args='%{gn_config}' out/Release
|
|||
|
||||
pushd out/Release
|
||||
# widevinecdmadapter
|
||||
# Build error with widevinecdmadapter in 67.0.3396.62
|
||||
ninja %{_smp_mflags} chrome chrome_sandbox chromedriver
|
||||
popd
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue