- glib headers fix (from gentoo-portage/www-client/chromium/files/chromium-glib-r0...

Changed files:
    chromium-browser.spec -> 1.185
    chromium-glib.patch -> 1.1

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 1d54a2b1dafeb489885f2fe125b751ed31c820e9..085be04cc30cabed5ebb8062e0fcfdd1c6536840 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -75,6 +75,7 @@ Patch10:      %{name}-pulse.patch
 # 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
@@ -216,6 +217,7 @@ cd src
 %patch9 -p1
 %patch10 -p1
 %{!?with_libjpegturbo:%patch11 -p0}
+%patch12 -p3
 cd ..
 
 cd src

diff --git a/chromium-glib.patch b/chromium-glib.patch
new file mode 100644 (file)
index 0000000..315f975
--- /dev/null
+++ b/chromium-glib.patch
@@ -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>