diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index b1f08f2..5dd7816 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -13,7 +13,7 @@ Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable Version: 47.0.2526.106 -Release: 1 +Release: 2 License: BSD, LGPL Group: Networking/WWW Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz @@ -45,29 +45,33 @@ Patch101: chromium-arm-r0.patch Patch500: chromium-third-party-cookies-off-by-default.patch Patch501: chromium-ps-print.patch +# Patch to fix build with use_system_libvpx +# Chromium bug #541273 +Patch600: unbundle-libvpx_new-fix.patch + Provides: %{crname} = %{EVRD} Conflicts: chromium-browser-unstable Conflicts: chromium-browser-beta Obsoletes: chromium-browser < 1:9.0.597.94 +BuildRequires: %{_lib}re2-devel +BuildRequires: %{_lib}snappy-devel BuildRequires: bison -BuildRequires: flex -BuildRequires: gperf -BuildRequires: gyp -BuildRequires: ninja -BuildRequires: util-linux -BuildRequires: yasm BuildRequires: bzip2-devel BuildRequires: cap-devel BuildRequires: cups-devel BuildRequires: elfutils-devel +BuildRequires: flex +BuildRequires: gperf +BuildRequires: gyp BuildRequires: jpeg-devel +BuildRequires: ninja BuildRequires: pam-devel -BuildRequires: speech-dispatcher-devel BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) @@ -76,6 +80,8 @@ BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(jsoncpp) BuildRequires: pkgconfig(libevent) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libgcrypt) @@ -96,6 +102,9 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) +BuildRequires: speech-dispatcher-devel +BuildRequires: util-linux +BuildRequires: yasm %if 0%{?clang} BuildRequires: clang @@ -134,7 +143,7 @@ your profile before changing channels. %{_crdir}/chromium-wrapper %{_crdir}/chrome %{_crdir}/chrome-sandbox -%{_crdir}/icudtl.dat +#%{_crdir}/icudtl.dat %{_crdir}/locales %{_crdir}/lib %{_crdir}/resources.pak @@ -193,8 +202,47 @@ members of the Chromium and WebDriver teams. %prep %setup -qn chromium-%{version} -a 998 -a 997 -a 999 -# remove some third_party +# files we do not want from upstream source bundles +rm -rf breakpad/src/processor/testdata/ +rm -rf chrome/app/test_data/dlls/ +rm -rf chrome/common/extensions/docs/ +#rm -rf chrome/test/data/ +rm -rf chrome/tools/test/reference_build/chrome_linux/ +rm -rf components/test/data/component_updater/jebgalgnebhfojomionfpkfelancnnkf/component1.dll +rm -rf content/test/data/ +rm -rf net/data/ +rm -rf ppapi/examples/ +rm -rf ppapi/native_client/tests/ +rm -rf third_party/apache-win32/ rm -rf third_party/binutils/ +rm -rf third_party/expat/files/ +rm -rf third_party/flac/include +rm -rf third_party/flac/src +rm -rf third_party/lcov +rm -rf third_party/libevent/*/* +rm -rf third_party/libevent/*.[ch] +rm -rf libexif/sources +rm -rf libjpeg/*.[ch] +rm -rf libjpeg_turbo +rm -rf libpng/*.[ch] +rm -rf libxslt/libexslt +rm -rf libxslt/libxslt +rm -rf libxslt/linux +rm -rf libxslt/mac +rm -rf libxslt/win32 +rm -rf mesa/src/src +rm -rf swig +rm -rf third_party/WebKit/LayoutTests/ +rm -rf third_party/WebKit/Tools/Scripts/ +rm -rf third_party/xdg-utils/tests/ +rm -rf third_party/yasm/source/ +rm -rf tools/gyp/test/ +rm -rf v8/test/ + +# 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 '.*\.\(gyp\|gypi\|isolate\)' -delete %patch4 -p1 -b .prefs @@ -213,6 +261,8 @@ rm -rf third_party/binutils/ %patch500 -p1 %patch501 -p2 +%patch600 -p1 + ### build with widevine support # Patch from crbug (chromium bugtracker) @@ -247,6 +297,12 @@ buildconfig+="-Dwerror= -Ddisable_newlib_untar=0 -Duse_system_xdg_utils=1 -Denable_hotwording=0 + -Denable_widevine=1 + -Denable_hidpi=1 + -Denable_touch_ui=1 + -Duse_gnome_keyring=1 + -Duse_gconf=0 + -Duse_sysroot=0 -Duse_aura=1" %if 0%{?clang} @@ -259,6 +315,9 @@ buildconfig+=" -Dclang=0" %if 0%{?chromium_system_libs} buildconfig+=" -Duse_system_flac=1 -Duse_system_speex=1 + -Duse_system_fontconfig=1 + -Duse_system_jsoncpp=1 + -Duse_system_expat=1 -Duse_system_libexif=1 -Duse_system_libevent=1 -Duse_system_libmtp=1 @@ -271,7 +330,11 @@ buildconfig+=" -Duse_system_flac=1 -Duse_system_libxml=1 -Duse_system_libyuv=1 -Duse_system_nspr=1 - -Duse_system_protobuf=1 + -Duse_system_protobuf=0 + -Duse_system_re2=1 + -Duse_system_snappy=1 + -Duse_system_zlib=1 + -Duse_system_libvpx=1 -Duse_system_yasm=1" %else buildconfig+=" -Duse_system_flac=0 @@ -298,6 +361,7 @@ buildconfig+=" -Dsystem_libdir=lib64 %endif buildconfig+=" -Duse_system_icu=0 + -Dicu_use_data_file_flag=0 -Duse_pulseaudio=1 -Dlinux_link_libpci=1 -Dlinux_link_gnome_keyring=1 @@ -343,7 +407,7 @@ 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/*.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}/ # chromium components