packages (DEVEL): chromium-browser/chromium-browser.spec, chromium-browser/...

[arekm]

Author: arekm                        Date: Thu Feb 16 17:40:18 2012 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 18.0.1025.33

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.177 -> 1.177.2.1) , system-libs.patch (1.10 -> 1.10.2.1) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.177 packages/chromium-browser/chromium-browser.spec:1.177.2.1
--- packages/chromium-browser/chromium-browser.spec:1.177	Thu Feb  9 22:39:14 2012
+++ packages/chromium-browser/chromium-browser.spec	Thu Feb 16 18:40:13 2012
@@ -50,12 +50,12 @@
 %define		gyp_rev	1014
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
-Version:	17.0.963.46
-Release:	2
+Version:	18.0.1025.33
+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:	2799babdc6837530775219ff8a1b322b
+# Source0-md5:	0ea40a4130999d98bf430b7abc161e14
 #SourceX:	http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
 Source2:	%{name}.sh
 Source3:	%{name}.desktop
@@ -72,11 +72,11 @@
 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
 URL:		http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:	GConf2-devel}
 BuildRequires:	OpenGL-GLU-devel
@@ -214,9 +214,7 @@
 %patch7 -p1
 cd src
 %patch9 -p1
-cd ..
 %patch10 -p1
-cd src
 %patch11 -p0
 cd ..
 
@@ -393,6 +391,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.177.2.1  2012/02/16 17:40:13  arekm
+- up to 18.0.1025.33
+
 Revision 1.177  2012/02/09 21:39:14  arekm
 - release 2
 

================================================================
Index: packages/chromium-browser/system-libs.patch
diff -u packages/chromium-browser/system-libs.patch:1.10 packages/chromium-browser/system-libs.patch:1.10.2.1
--- packages/chromium-browser/system-libs.patch:1.10	Fri Jan  6 00:21:40 2012
+++ packages/chromium-browser/system-libs.patch	Thu Feb 16 18:40:13 2012
@@ -42,14 +42,15 @@
  #include "base/time.h"
  #include "base/utf_string_conversions.h"
  #include "chrome/browser/autocomplete/autocomplete.h"
---- chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc.orig	2011-07-19 04:00:59.000000000 +0200
-+++ chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc	2011-07-22 20:43:47.608727449 +0200
-@@ -17,7 +17,7 @@
+--- a/src/chrome/common/metrics/metrics_log_base.cc~	2012-02-09 03:36:29.000000000 +0100
++++ b/src/chrome/common/metrics/metrics_log_base.cc	2012-02-12 16:17:46.992725484 +0100
+@@ -10,7 +10,7 @@
  #include "base/perftimer.h"
  #include "base/string_number_conversions.h"
  #include "base/sys_info.h"
 -#include "base/third_party/nspr/prtime.h"
 +#include <nspr/prtime.h>
- #include "base/time.h"
  #include "base/utf_string_conversions.h"
  #include "chrome/common/logging_chrome.h"
+ #include "libxml/xmlwriter.h"
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.177&r2=1.177.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/system-libs.patch?r1=1.10&r2=1.10.2.1&f=u