[packages/chromium-browser/DEVEL: 26/26] merge with master

[glen]

commit c5b396f3e17f0197cddc207f9444418b631a6fb1
Merge: 6295010 2e4113f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jan 2 22:01:01 2013 +0200

    merge with master

 chromium-browser.spec       | 50 ++++++++++++++++++++++++++++++++++-----------
 clean-source.sh             |  2 ++
 find-lang.sh                |  2 +-
 gnome3-volume-control.patch | 12 +++++++++++
 make-diff-patch.sh          | 19 +++++++++++++++++
 master-prefs-path.patch     | 14 +++++++++++++
 master_preferences.json     | 36 ++++++++++++++++++++++++++++++++
 7 files changed, 122 insertions(+), 13 deletions(-)
---
diff --cc chromium-browser.spec
index c01764e,5c9613d..9fa5f2a
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@@ -73,12 -65,19 +73,12 @@@
  %define		gyp_rev	1014
  Summary:	A WebKit powered web browser
  Name:		chromium-browser
 -Version:	%{branch}.%{patchver}
 -Release:	2
 +Version:	24.0.1312.45
- Release:	0.2
++Release:	0.3
  License:	BSD, LGPL v2+ (ffmpeg)
  Group:		X11/Applications/Networking
 -Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
 -# Source0-md5:	6c467affd292ee9a9020ac91147969c8
 -%if "%{?patchver}" != ""
 -Patch0:		http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 -# Patch0-md5:	2f4e98e37053705fd86ffcb49f1f2247
 -%endif
 +Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz
 +# Source0-md5:	2995d5aa3f1ecb470e60e0984229fcce
  Source1:	%{name}.default
  Source2:	%{name}.sh
  Source3:	%{name}.desktop
@@@ -86,8 -85,10 +86,9 @@@ Source5:	find-lang.s
  Source6:	update-source.sh
  Source7:	clean-source.sh
  Source8:	get-source.sh
- #Patch0:		system-libs.patch
+ Source9:	master_preferences.json
+ #Patch10:		system-libs.patch
  Patch1:		plugin-searchdirs.patch
 -Patch2:		gyp-system-minizip.patch
  Patch3:		disable_dlog_and_dcheck_in_release_builds.patch
  Patch4:		path-libpdf.patch
  Patch5:		options-support.patch
@@@ -100,12 -101,13 +101,14 @@@ Patch9:		chromium-ppapi.patc
  Patch11:	chromium-revert-jpeg-swizzle-r2.patch
  Patch15:	nacl-build-irt.patch
  Patch16:	nacl-linkingfix.patch
 -Patch17:	system-icu.patch
  Patch18:	nacl-no-untar.patch
  Patch19:	system-jsoncpp.patch
 -Patch20:	system-speex.patch
  Patch21:	system-srtp.patch
 -Patch22:	gnome3-volume-control.patch
 -Patch23:	master-prefs-path.patch
 +Patch22:	pulse_fix-157876.patch
 +Patch23:	no-pnacl.patch
 +Patch24:	nacl-verbose.patch
++Patch25:	gnome3-volume-control.patch
++Patch26:	master-prefs-path.patch
  URL:		http://www.chromium.org/Home
  %{?with_gconf:BuildRequires:	GConf2-devel}
  BuildRequires:	OpenGL-GLU-devel
@@@ -246,8 -251,9 +249,8 @@@ sed -e 's/@BUILD_DIST@/PLD %{pld_versio
  %{__sed} -e 's, at localedir@,%{_libdir}/%{name},' %{SOURCE5} > find-lang.sh
  ln -s %{SOURCE7} src
  
- #%patch0 -p1
+ #%patch10 -p1
  %patch1 -p1
 -%patch2 -p1
  %patch3 -p1
  %patch4 -p1
  %patch5 -p1
@@@ -261,10 -267,11 +264,12 @@@ cd sr
  %patch19 -p1
  %patch21 -p1
  %patch22 -p1
++%patch25 -p1
  cd ..
  %patch18 -p1
 -%patch20 -p1
  %patch23 -p1
 +%patch24 -p1
++%patch26 -p1
  
  cd src
  
@@@ -319,9 -338,14 +336,14 @@@ for i in $(find %{_prefix}/x86_64-nacl/
  	ln -s $i ${i#%{_prefix}/x86_64-nacl/include/}
  done
  cd ../../../../../..
+ fi
  %endif
  
- test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp \
 -test %{_specdir}/%{name}.spec -nt Makefile && %{__rm} Makefile
++test %{_specdir}/%{name}.spec -nt Makefile && %{__rm} -f Makefile
+ test -e Makefile || %{__python} build/gyp_chromium \
+ 	--format=make \
+ 	-Goutput_dir=../out \
+ 	build/all.gyp \
  %ifarch %{ix86}
  	-Dtarget_arch=ia32 \
  %endif
@@@ -340,8 -364,10 +362,9 @@@
  	%{?with_shared_libs:-Dlibrary=shared_library} \
  	-Dbuild_ffmpegsumo=%{?with_ffmpegsumo:1}%{!?with_ffmpegsumo:0} \
  	-Dffmpeg_branding=Chrome \
+ 	-Dremove_webcore_debug_symbols=1 \
  	-Dproprietary_codecs=1 \
  %if %{with nacl}
 -	-Ddisable_glibc=1 \
  	-Dnaclsdk_mode=custom:/usr/x86_64-nacl \
  	-Ddisable_glibc_untar=1 \
  	-Ddisable_newlib_untar=1 \
================================================================

---- gitweb:

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