[packages/chromium-browser/stable-27-merge: 27/27] up to stable 27.0.1453.93

[glen]

commit 1c58be07c928427b6fd065065ef11c8e24257e6e
Merge: cf7c7d9 87dd436
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed May 22 01:02:41 2013 +0300

    up to stable 27.0.1453.93
    
    Merged branch 'dev-27' into master

 chromium-browser.spec    |  87 ++++++++++--------
 chromium-ppapi.patch     |  13 ---
 clean-source.sh          |  26 +++++-
 get-source.sh            |   4 +-
 harfbuzz-0.13.patch      |  15 ---
 master-prefs-path.patch  |   2 +-
 no-pnacl.patch           |  11 +++
 sync-session-name.patch  | 104 +++++++++++++++++++++
 system-ffmpeg.patch      | 196 ++++++---------------------------------
 system-jsoncpp.patch     |  18 ----
 system-mesa.patch        | 234 -----------------------------------------------
 system-nspr.patch        |  33 -------
 tcmalloc-glibc2.16.patch |  12 ---
 13 files changed, 220 insertions(+), 535 deletions(-)
---
diff --cc chromium-browser.spec
index 5864011,a0174b5..9229616
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@@ -74,14 -69,14 +69,14 @@@ Version:	%{branch}.%{patchver
  %else
  Version:	%{branch}.%{basever}
  %endif
 -Release:	0.16
 -License:	BSD, LGPL v2+ (ffmpeg)
 +Release:	1
 +License:	BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
  Group:		X11/Applications/Networking
 -Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{branch}.%{basever}.tar.gz
 -# Source0-md5:	eafd6a919faadc8a7446cd673f460c4c
 +Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
- # Source0-md5:	eafd6a919faadc8a7446cd673f460c4c
++# Source0-md5:	6bb4fc8f0c437b447a76c3bd91cf9f81
  %if "%{?patchver}" != ""
  Patch0:		http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 -# Patch0-md5:	7e2f26d76ca6241961276a328a9230cf
 +# Patch0-md5:	8eaaa7eb2866d1b3b5536074853de998
  %endif
  Source1:	%{name}.default
  Source2:	%{name}.sh
@@@ -110,12 -103,10 +103,11 @@@ Patch18:	nacl-no-untar.patc
  Patch24:	nacl-verbose.patch
  Patch25:	gnome3-volume-control.patch
  Patch26:	master-prefs-path.patch
- Patch27:	tcmalloc-glibc2.16.patch
  Patch28:	system-mesa.patch
  Patch29:	speechd-0.8.patch
- Patch30:	harfbuzz-0.13.patch
- Patch31:	%{name}-whitelist-gpu.patch
+ Patch30:	no-pnacl.patch
+ Patch31:	sync-session-name.patch
++Patch32:	%{name}-whitelist-gpu.patch
  URL:		http://www.chromium.org/Home
  %{?with_gconf:BuildRequires:	GConf2-devel}
  %{?with_system_mesa:BuildRequires:	Mesa-libGL-devel >= 9.1}
@@@ -300,10 -292,8 +293,9 @@@ ln -s %{SOURCE7} 
  %patch24 -p2
  %patch26 -p2
  %patch29 -p2
- cd third_party/WebKit
- %patch30 -p1
- cd -
- %patch31 -p1
+ %patch30 -p0
+ %patch31 -p0
++%patch32 -p1
  
  sh -x clean-source.sh \
  	%{!?with_nacl:nacl=0} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/1c58be07c928427b6fd065065ef11c8e24257e6e