packages: chromium-browser/chromium-browser.spec, chromium-browser/chromium...

[glen]

Author: glen                         Date: Fri Mar 30 06:33:22 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- glib headers fix (from gentoo-portage/www-client/chromium/files/chromium-glib-r0.patch)

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.184 -> 1.185) , chromium-glib.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.184 packages/chromium-browser/chromium-browser.spec:1.185
--- packages/chromium-browser/chromium-browser.spec:1.184	Fri Mar 30 00:24:08 2012
+++ packages/chromium-browser/chromium-browser.spec	Fri Mar 30 08:33:17 2012
@@ -76,6 +76,7 @@
 # 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
@@ -217,6 +218,7 @@
 %patch9 -p1
 %patch10 -p1
 %{!?with_libjpegturbo:%patch11 -p0}
+%patch12 -p3
 cd ..
 
 cd src
@@ -392,6 +394,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.185  2012/03/30 06:33:17  glen
+- glib headers fix (from gentoo-portage/www-client/chromium/files/chromium-glib-r0.patch)
+
 Revision 1.184  2012/03/29 22:24:08  glen
 - merged 18.0.1024.142 from DEVEL (now also stable branch)
 

================================================================
Index: packages/chromium-browser/chromium-glib.patch
diff -u /dev/null packages/chromium-browser/chromium-glib.patch:1.1
--- /dev/null	Fri Mar 30 08:33:22 2012
+++ packages/chromium-browser/chromium-glib.patch	Fri Mar 30 08:33:17 2012
@@ -0,0 +1,14 @@
+Index: l10n/l10n_util.cc
+===================================================================
+diff --git a/trunk/src/ui/base/l10n/l10n_util.cc b/trunk/src/ui/base/l10n/l10n_util.cc
+--- a/trunk/src/ui/base/l10n/l10n_util.cc	(revision 115790)
++++ b/trunk/src/ui/base/l10n/l10n_util.cc	(working copy)
+@@ -5,7 +5,7 @@
+ #include "ui/base/l10n/l10n_util.h"
+ 
+ #if defined(USE_X11)
+-#include <glib/gutils.h>
++#include <glib.h>
+ #endif
+ 
+ #include <algorithm>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/chromium-browser/chromium-browser.spec?r1=1.184&r2=1.185