mirror of
https://abf.rosa.ru/djam/chromium-browser-stable.git
synced 2025-02-23 14:42:49 +00:00
update to 34.0.1847.116
This commit is contained in:
parent
404899b926
commit
099bf7ae86
3 changed files with 37 additions and 11 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,4 +1,4 @@
|
|||
sources:
|
||||
"icons.tar.bz2": a835954af164bf38f8ea4ea80608839bed7800a3
|
||||
gn-binaries.tar.xz: 312d6a6addabeed98f3357d34dbc87ccfd43026b
|
||||
chromium-33.0.1750.117.tar.xz: 9881d7cfc1ebbc9f21dc4b686eeb6630b6849701
|
||||
chromium-34.0.1847.116.tar.xz: 747daf7e1a3c7c66e24da57bbcb357096623d1a9
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
%define _src %{_topdir}/SOURCES
|
||||
|
||||
Name: chromium-browser-stable
|
||||
Version: 33.0.1750.146
|
||||
Version: 34.0.1847.116
|
||||
Release: 1
|
||||
Summary: A fast webkit-based web browser
|
||||
Group: Networking/WWW
|
||||
|
@ -27,6 +27,9 @@ Patch15: chromium-25.0.1364.172-sandbox-pie.patch
|
|||
# PATCH-FIX-OPENSUSE Remove the SVN revision for the chromedriver as that this fails with the tarball
|
||||
#Patch16: chromium-fix-chromedriver-build.diff
|
||||
|
||||
# Fix https://codereview.chromium.org/142853004/
|
||||
Patch30: issue142853004_80001_90001.diff
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
|
||||
Provides: %{crname}
|
||||
|
@ -100,6 +103,8 @@ members of the Chromium and WebDriver teams.
|
|||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
|
||||
%patch30 -p1
|
||||
|
||||
# Hard code extra version
|
||||
FILE=chrome/common/chrome_version_info_posix.cc
|
||||
sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{product_vendor} %{product_version}"/' $FILE
|
||||
|
@ -185,10 +190,8 @@ install -m 755 out/Release/chrome %{buildroot}%{_crdir}/
|
|||
install -m 4755 out/Release/chrome_sandbox %{buildroot}%{_crdir}/chrome-sandbox
|
||||
cp -a out/Release/chromedriver %{buildroot}%{_crdir}/chromedriver
|
||||
install -m 644 out/Release/chrome.1 %{buildroot}%{_mandir}/man1/%{crname}.1
|
||||
install -m 644 out/Release/chrome.pak %{buildroot}%{_crdir}/
|
||||
|
||||
install -m 644 out/Release/chrome_100_percent.pak %{buildroot}%{_crdir}/
|
||||
install -m 644 out/Release/content_resources.pak %{buildroot}%{_crdir}/
|
||||
install -m 644 out/Release/*.pak %{buildroot}%{_crdir}/
|
||||
install -m 644 out/Release/icudtl.dat %{buildroot}%{_libdir}/%{name}/
|
||||
install -m 755 out/Release/libffmpegsumo.so %{buildroot}%{_crdir}/
|
||||
#%ifnarch armv7l
|
||||
#install -m 755 out/Release/libppGoogleNaClPluginChrome.so %{buildroot}%{_crdir}/
|
||||
|
@ -197,8 +200,6 @@ install -m 755 out/Release/libffmpegsumo.so %{buildroot}%{_crdir}/
|
|||
#install -m 644 out/Release/nacl_irt_*.nexe %{buildroot}%{_crdir}/
|
||||
#%endif
|
||||
install -m 644 out/Release/locales/*.pak %{buildroot}%{_crdir}/locales/
|
||||
#install -m 755 out/Release/xdg-mime %{buildroot}%{_crdir}/
|
||||
#install -m 755 out/Release/xdg-settings %{buildroot}%{_crdir}/
|
||||
install -m 644 out/Release/resources.pak %{buildroot}%{_crdir}/
|
||||
install -m 644 chrome/browser/resources/default_apps/* %{buildroot}%{_crdir}/default_apps/
|
||||
ln -s %{_crdir}/chromium-wrapper %{buildroot}%{_bindir}/%{crname}
|
||||
|
@ -241,7 +242,7 @@ rm -rf %{buildroot}
|
|||
%{_crdir}/chromium-wrapper
|
||||
%{_crdir}/chrome
|
||||
%{_crdir}/chrome-sandbox
|
||||
%{_crdir}/chrome.pak
|
||||
%{_crdir}/icudtl.dat
|
||||
%{_crdir}/libffmpegsumo.so
|
||||
#%ifnarch armv7l
|
||||
#%{_crdir}/libppGoogleNaClPluginChrome.so
|
||||
|
@ -256,8 +257,6 @@ rm -rf %{buildroot}
|
|||
%{_crdir}/content_resources.pak
|
||||
%{_crdir}/themes
|
||||
%{_crdir}/default_apps
|
||||
#%{_crdir}/xdg-mime
|
||||
#%{_crdir}/xdg-settings
|
||||
%{_mandir}/man1/%{crname}*
|
||||
%{_datadir}/applications/*.desktop
|
||||
%{_iconsdir}/hicolor/*/apps/%{crname}.*
|
||||
|
|
27
issue142853004_80001_90001.diff
Normal file
27
issue142853004_80001_90001.diff
Normal file
|
@ -0,0 +1,27 @@
|
|||
Index: build/gyp_chromium
|
||||
diff --git a/build/gyp_chromium b/build/gyp_chromium
|
||||
index e4cafc756134c35dc51c7ec3ea111bfef5157653..5c2644ecb374f280d0a775b319757352927b6ad7 100755
|
||||
--- a/build/gyp_chromium
|
||||
+++ b/build/gyp_chromium
|
||||
@@ -39,7 +39,8 @@ sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'liblouis'))
|
||||
sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
|
||||
'Source', 'build', 'scripts'))
|
||||
|
||||
-import find_depot_tools
|
||||
+if os.environ.get('GYP_GENERATORS') != 'make':
|
||||
+ import find_depot_tools
|
||||
|
||||
# On Windows, Psyco shortens warm runs of build/gyp_chromium by about
|
||||
# 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
|
||||
@@ -474,8 +475,9 @@ if __name__ == '__main__':
|
||||
args.append('--check')
|
||||
|
||||
supplemental_includes = GetSupplementalFiles()
|
||||
- if not RunGN(supplemental_includes):
|
||||
- sys.exit(1)
|
||||
+ if os.environ.get('GYP_GENERATORS') != 'make':
|
||||
+ if not RunGN(supplemental_includes):
|
||||
+ sys.exit(1)
|
||||
args.extend(
|
||||
['-I' + i for i in additional_include_files(supplemental_includes, args)])
|
||||
|
Loading…
Add table
Reference in a new issue