gnome-extra/gnome-do: Fix for building against glib-2.32, #421719

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 23 insertions, 6 deletions

diff --git a/gnome-extra/gnome-do/ChangeLog b/gnome-extra/gnome-do/ChangeLog
index 836778061e1c..3f455bf1a5b6 100644
--- a/gnome-extra/gnome-do/ChangeLog
+++ b/gnome-extra/gnome-do/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-do
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/ChangeLog,v 1.31 2012/05/05 06:25:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/ChangeLog,v 1.32 2012/06/21 09:35:12 jlec Exp $
+
+  21 Jun 2012; Justin Lecher <jlec@gentoo.org> gnome-do-0.8.5.ebuild,
+  +files/gnome-do-0.8.5-glib-2.32.patch, metadata.xml:
+  Fix for building against glib-2.32, #421719
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> gnome-do-0.8.5.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/gnome-extra/gnome-do/files/gnome-do-0.8.5-glib-2.32.patch b/gnome-extra/gnome-do/files/gnome-do-0.8.5-glib-2.32.patch
new file mode 100644
index 000000000000..88fc0c443e36
--- /dev/null
+++ b/gnome-extra/gnome-do/files/gnome-do-0.8.5-glib-2.32.patch
@@ -0,0 +1,16 @@
+ libdo/keybinder.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libdo/keybinder.h b/libdo/keybinder.h
+index 2a39958..da202e6 100644
+--- a/libdo/keybinder.h
++++ b/libdo/keybinder.h
+@@ -24,7 +24,7 @@
+ #ifndef __DO_KEY_BINDER_H__
+ #define __DO_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/gnome-extra/gnome-do/gnome-do-0.8.5.ebuild b/gnome-extra/gnome-do/gnome-do-0.8.5.ebuild
index 8fb69312cc2a..dcd2e4c45a0a 100644
--- a/gnome-extra/gnome-do/gnome-do-0.8.5.ebuild
+++ b/gnome-extra/gnome-do/gnome-do-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/gnome-do-0.8.5.ebuild,v 1.3 2012/05/05 06:25:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/gnome-do-0.8.5.ebuild,v 1.4 2012/06/21 09:35:12 jlec Exp $
 
 # TODO: GNOME Do defaults to a debug build; to disable, --enable-release must
 # be passed. However, when doing this the build fails; figure out why.
@@ -44,6 +44,7 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 src_prepare() {
 #	epatch "${FILESDIR}"/${P}-mono-2.8.patch
+	epatch "${FILESDIR}"/${P}-glib-2.32.patch
 
 	# Drop DEPRECATED flags
 	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED::g' \
diff --git a/gnome-extra/gnome-do/metadata.xml b/gnome-extra/gnome-do/metadata.xml
index 1ba9a617e7a4..8710d2607ed6 100644
--- a/gnome-extra/gnome-do/metadata.xml
+++ b/gnome-extra/gnome-do/metadata.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
-
-
 	<longdescription>
 	GNOME Do allows you to quickly search for many items present in your GNOME
 	desktop environment (applications, Evolution contacts, Firefox bookmarks,
@@ -14,5 +11,4 @@
 	commonly used actions on those items (Run, Open, Email, Chat, Play, etc.).
 	GNOME Do is inspired by Quicksilver and GNOME Launch Box.
 	</longdescription>
-
 </pkgmetadata>