build with internal icu

This commit is contained in:
Tigro 2016-03-08 19:43:38 +03:00
parent cba37c9a1f
commit 7d724f1830

View file

@ -11,6 +11,7 @@
%define chromium_system_libs 1 %define chromium_system_libs 1
%define clang 1 %define clang 1
%define ffmpeg 1 %define ffmpeg 1
%define icu 0
Summary: A fast web browser based on the Blink engine Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable Name: chromium-browser-stable
@ -95,7 +96,9 @@ BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(harfbuzz)
%if 0%{icu}
BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-i18n)
%endif
BuildRequires: pkgconfig(libevent) BuildRequires: pkgconfig(libevent)
BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(libgcrypt)
@ -160,7 +163,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}/icudtl.dat
%{_crdir}/locales %{_crdir}/locales
%{_crdir}/lib %{_crdir}/lib
%{_crdir}/resources.pak %{_crdir}/resources.pak
@ -260,10 +263,12 @@ rm -rf third_party/yasm/source/
rm -rf tools/gyp/test/ rm -rf tools/gyp/test/
rm -rf v8/test/ rm -rf v8/test/
%if 0%{icu}
# 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
%endif
%patch4 -p1 -b .prefs %patch4 -p1 -b .prefs
@ -279,9 +284,11 @@ find third_party/icu -type f \! -regex '.*\.\(gyp\|gypi\|isolate\)' -delete
%patch500 -p1 %patch500 -p1
%patch501 -p2 %patch501 -p2
%if 0%{icu}
%patch502 -p1 -b .system-icu %patch502 -p1 -b .system-icu
%patch503 -p1 -b .vaapi
%patch504 -p0 -b .icu-ver %patch504 -p0 -b .icu-ver
%endif
%patch503 -p1 -b .vaapi
%if 0%{?ffmpeg} %if 0%{?ffmpeg}
%patch505 -p1 %patch505 -p1
%patch506 -p1 %patch506 -p1
@ -343,9 +350,14 @@ buildconfig+="-Dclang=1
buildconfig+=" -Dclang=0" buildconfig+=" -Dclang=0"
%endif %endif
%if 0%{icu}
buildconfig+=" -Duse_system_icu=1"
%else
buildconfig+=" -Duse_system_icu=0"
%endif
%if 0%{?chromium_system_libs} %if 0%{?chromium_system_libs}
buildconfig+=" -Duse_system_icu=1 buildconfig+=" -Duse_system_flac=1
-Duse_system_flac=1
-Duse_system_speex=1 -Duse_system_speex=1
-Duse_system_fontconfig=1 -Duse_system_fontconfig=1
-Duse_system_jsoncpp=1 -Duse_system_jsoncpp=1
@ -390,8 +402,7 @@ buildconfig+=" -Dsystem_libdir=lib64
-Dtarget_arch=x64" -Dtarget_arch=x64"
%endif %endif
buildconfig+=" -Dicu_use_data_file_flag=0 buildconfig+=" -Duse_pulseaudio=1
-Duse_pulseaudio=1
-Dlinux_link_libpci=1 -Dlinux_link_libpci=1
-Dlinux_link_gnome_keyring=1 -Dlinux_link_gnome_keyring=1
-Dlinux_link_gsettings=1 -Dlinux_link_gsettings=1
@ -434,7 +445,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}/ 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