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

Revert "disable system icu"

Browse source 
This reverts commit 13498bbe85.
This commit is contained in:
Tigro 2016-01-29 18:38:34 +03:00
parent dc4b4d2054
commit c97df2bef0
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
chromium-browser-stable.spec
View file

@ -150,6 +150,7 @@ your profile before changing channels.
%{_crdir}/chromium-wrapper %{_crdir}/chromium-wrapper
%{_crdir}/chrome %{_crdir}/chrome
%{_crdir}/chrome-sandbox %{_crdir}/chrome-sandbox
#%{_crdir}/icudtl.dat
%{_crdir}/locales %{_crdir}/locales
%{_crdir}/lib %{_crdir}/lib
%{_crdir}/resources.pak %{_crdir}/resources.pak
@ -248,7 +249,7 @@ rm -rf v8/test/
# Remove bundled ICU; its header files appear to get picked up instead of # Remove bundled ICU; its header files appear to get picked up instead of
# the system ones, leading to errors during the final link stage. # the system ones, leading to errors during the final link stage.
# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/BNGvJc08B6Q # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/BNGvJc08B6Q
#find third_party/icu -type f \! -regex '.*\.\(gyp\|gypi\|isolate\)' -delete find third_party/icu -type f \! -regex '.*\.\(gyp\|gypi\|isolate\)' -delete
%patch4 -p1 -b .prefs %patch4 -p1 -b .prefs
@ -267,9 +268,9 @@ rm -rf v8/test/
%patch500 -p1 %patch500 -p1
%patch501 -p2 %patch501 -p2
#patch502 -p1 -b .system-icu %patch502 -p1 -b .system-icu
%patch503 -p1 -b .vaapi %patch503 -p1 -b .vaapi
#patch504 -p0 -b .icu-ver %patch504 -p0 -b .icu-ver
#patch600 -p1 #patch600 -p1
### build with widevine support ### build with widevine support
@ -322,7 +323,7 @@ buildconfig+=" -Dclang=0"
%endif %endif
%if 0%{?chromium_system_libs} %if 0%{?chromium_system_libs}
buildconfig+=" -Duse_system_icu=0 buildconfig+=" -Duse_system_icu=1
-Duse_system_flac=1 -Duse_system_flac=1
-Duse_system_speex=1 -Duse_system_speex=1
-Duse_system_fontconfig=1 -Duse_system_fontconfig=1
@ -414,6 +415,7 @@ install -m 4755 out/Release/chrome_sandbox %{buildroot}%{_crdir}/chrome-sandbox
cp -a out/Release/chromedriver %{buildroot}%{_crdir}/chromedriver 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.1 %{buildroot}%{_mandir}/man1/%{crname}.1
install -m 644 out/Release/*.pak %{buildroot}%{_crdir}/ install -m 644 out/Release/*.pak %{buildroot}%{_crdir}/
#install -m 644 out/Release/icudtl.dat %{buildroot}%{_crdir}/
cp -a out/Release/*_blob.bin %{buildroot}%{_crdir}/ cp -a out/Release/*_blob.bin %{buildroot}%{_crdir}/
# chromium components # chromium components