- up to 18.0.1025.162

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

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 81520eb24be1facc78c020d8e3c5dfe912e86141..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.83
+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/stable/%{name}-%{version}.tar.xz
-# Source0-md5: 55eb30a093f060e718c4b69fd8ab5d7b
-#SourceX:      http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
+# Source0-md5: 189c506b33faeecf2c80617b170201b8
 Source2:       %{name}.sh
 Source3:       %{name}.desktop
 Source5:       find-lang.sh
@@ -71,11 +71,11 @@ Patch6:             get-webkit_revision.patch
 Patch7:                dlopen_sonamed_gl.patch
 Patch8:                chromium_useragent.patch.in
 Patch9:                system-expat.patch
-Patch10:       dlopen-sonames.patch
+Patch10:       %{name}-pulse.patch
 # https://bugs.gentoo.org/show_bug.cgi?id=393471
 # libjpeg-turbo >= 1.1.90 supports that feature
-# but there is no autodetection currently, so revert for now
-Patch11:       chromium-revert-jpeg-swizzle-r0.patch
+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
@@ -98,6 +98,7 @@ 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
@@ -137,6 +138,7 @@ 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
@@ -213,10 +215,9 @@ ln -s %{SOURCE7} src
 %patch7 -p1
 cd src
 %patch9 -p1
-cd ..
 %patch10 -p1
-cd src
-%patch11 -p0
+%{!?with_libjpegturbo:%patch11 -p0}
+%patch12 -p3
 cd ..
 
 cd src