- up to 18.0.1025.162

[packages/chromium-browser.git] / chromium-browser.spec

diff --git a/chromium-browser.spec b/chromium-browser.spec
index c77d57322d79b184f66f22c9ad92327177a65eb7..ca320b9553f8d9fc66b9229dec8ef3a3e173d063 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -20,6 +20,7 @@
 %bcond_without system_vpx              # with system vpx
 %bcond_without system_yasm             # with system yasm
 %bcond_without system_zlib             # with system zlib
+%bcond_without libjpegturbo            # use libjpeg-turbo features
 %bcond_with            verbose                 # verbose build (V=1)
 
 # TODO
@@ -49,13 +50,12 @@
 %define                gyp_rev 1014
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
-Version:       17.0.963.33
+Version:       18.0.1025.162
 Release:       1
 License:       BSD, LGPL v2+ (ffmpeg)
 Group:         X11/Applications/Networking
-Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz
-# Source0-md5: e402820a7d57a5f39a8b2428996a5bd0
-#SourceX:      http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
+Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.tar.xz
+# Source0-md5: 189c506b33faeecf2c80617b170201b8
 Source2:       %{name}.sh
 Source3:       %{name}.desktop
 Source5:       find-lang.sh
@@ -71,6 +71,11 @@ Patch6:              get-webkit_revision.patch
 Patch7:                dlopen_sonamed_gl.patch
 Patch8:                chromium_useragent.patch.in
 Patch9:                system-expat.patch
+Patch10:       %{name}-pulse.patch
+# https://bugs.gentoo.org/show_bug.cgi?id=393471
+# libjpeg-turbo >= 1.1.90 supports that feature
+Patch11:       chromium-revert-jpeg-swizzle-r2.patch
+Patch12:       chromium-glib.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 BuildRequires: OpenGL-GLU-devel
@@ -88,10 +93,12 @@ BuildRequires:      glib2-devel
 BuildRequires: gperf
 BuildRequires: gtk+2-devel
 %{?with_kerberos:BuildRequires:        heimdal-devel}
+BuildRequires: hicolor-icon-theme
 BuildRequires: libevent-devel
 %{?with_keyring:BuildRequires: libgnome-keyring-devel}
 BuildRequires: libicu-devel >= 4.6
 BuildRequires: libjpeg-devel
+%{?with_libjpegturbo:BuildRequires:    libjpeg-turbo-devel >= 1.2.0}
 BuildRequires: libpng-devel
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libstdc++-devel
@@ -128,8 +135,10 @@ BuildRequires:     xz
 %{?with_system_zlib:BuildRequires:     zlib-devel}
 Requires:      browser-plugins >= 2.0
 Requires:      desktop-file-utils
+Requires:      hicolor-icon-theme
 %{?with_system_vpx:Requires:   libvpx >= 0.9.5-2}
 Requires:      xdg-utils >= 1.0.2-4
+%{?with_libjpegturbo:Requires: libjpeg-turbo >= 1.2.0}
 Provides:      wwwbrowser
 Obsoletes:     chromium-browser-bookmark_manager < 5.0.388.0
 Obsoletes:     chromium-browser-inspector < 15.0.863.0
@@ -206,6 +215,9 @@ ln -s %{SOURCE7} src
 %patch7 -p1
 cd src
 %patch9 -p1
+%patch10 -p1
+%{!?with_libjpegturbo:%patch11 -p0}
+%patch12 -p3
 cd ..
 
 cd src
@@ -273,7 +285,7 @@ test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp \
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/{themes,plugins,extensions} \
-       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_pixmapsdir},%{_desktopdir}}
+       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir}}
 
 cd src/out/%{!?debug:Release}%{?debug:Debug}
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
@@ -301,7 +313,17 @@ install -p nacl_irt_x86_32.nexe $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 cd -
 
-cp -p src/chrome/app/theme/chromium/product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+for icon in src/chrome/app/theme/chromium/product_logo_[0-9]*.png; do
+       size=${icon##*/product_logo_}
+       size=${size%.png}
+
+       # this will skip non-numeric (22_mono_invert, 22_mono)
+       dir=%{_iconsdir}/hicolor/${size}x${size}/apps
+       test -d "$dir" || continue
+
+       install -d $RPM_BUILD_ROOT$dir
+       cp -p $icon $RPM_BUILD_ROOT$dir/%{name}.png
+done
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins -b <<'EOF'
 # http://code.google.com/p/chromium/issues/detail?id=24507
@@ -317,11 +339,13 @@ EOF
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%update_icon_cache hicolor
 %update_desktop_database
 %update_browser_plugins
 
 %postun
 if [ "$1" = 0 ]; then
+       %update_icon_cache hicolor
        %update_browser_plugins
 fi
 
@@ -331,8 +355,8 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
 %attr(755,root,root) %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
-%{_pixmapsdir}/%{name}.png
 %{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*/apps/%{name}.png
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/chrome.pak
 %{_libdir}/%{name}/content_resources.pak