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

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 38 insertions, 9 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/Manifest b/gnome-extra/gnome-do/Manifest
index 8180866c041e..c1831a1bf93d 100644
--- a/gnome-extra/gnome-do/Manifest
+++ b/gnome-extra/gnome-do/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX gnome-do-0.8.3.1-gtk-2.22.patch 495 RMD160 19851034d5ce970c8ddd7c72860bf0c80611d86a SHA1 69a07dac564a14c12449c995ea6f78ed2053b613 SHA256 c5270f5c2ceec3cb06a96eb033e6a2dec1c8dbf8a9d545737f9c8c59d277a787
 AUX gnome-do-0.8.3.1-mono-2.8.patch 3390 RMD160 e4d95f0daac0ef9d4a480f8ec88f23780c4cada1 SHA1 cf9812c64e58d6ce112cb4cabc0529ae0c51fff7 SHA256 3bf46487d2f87daff17f1150a2e988689af270d3998465ee1652132a1ab60e29
 AUX gnome-do-0.8.4-mono-2.8.patch 2662 RMD160 51b62fdca38b0f287628488ebbfcd2635c495af5 SHA1 ec15bf4a458e8cac24f23727f94ae58e42122726 SHA256 d8e99a7fe705dd8fcc47052fa36e5bb2253cdbb1cb1d6fe4b8caba3aa3d0d3a1
+AUX gnome-do-0.8.5-glib-2.32.patch 351 RMD160 0db0c802f7e281d6ab90124f23b1e24094a1ba1f SHA1 53db8d8b604cb53dcc58551c108169c53001fcde SHA256 b8d5e214b010b9264f7a776d207ae2131cbad6d487bf3295d290196c27c5bb2b
 DIST gnome-do-0.8.5.tar.gz 904470 RMD160 214397277dd0618050b3e99aeb3e7f98ee2fd4cd SHA1 690d4713f7b818e92717a6e5addeb36a5c9d9162 SHA256 38741b2c9757707c16db6b8d912897408cfe4bff8db728e86dccac5ca894f28b
-EBUILD gnome-do-0.8.5.ebuild 1743 RMD160 6b3759a3bc76d9982f082b01adfc873c39e34798 SHA1 d87520422ccef9fcd99148b14d17e24ceddf496b SHA256 a204e76491f86da3211b8c7f832361485fbc9fc2b6b8abaa44171f84712b7e1d
-MISC ChangeLog 5595 RMD160 131f4b7ea5ce6269d25cd67dac820e79be17b6ef SHA1 d5fb34a38765f8ce8deec3a7d9ed6650e173ec67 SHA256 33ec1a57b8aad51c11352fc647f6486855a8142095c4d9f74f3a0bb6e3812cfe
-MISC metadata.xml 618 RMD160 d79b817370b5c077b871621ce0c4cd1680ec1169 SHA1 4af656f6f907753f6ca6a90fb2cc8f137901709c SHA256 97586ac89b8c0d8e729dcf28d91917821a41d6d872bcf0466034207f1db86e99
+EBUILD gnome-do-0.8.5.ebuild 1784 RMD160 b44156614d19a37225663c45abfc0cd848318c1c SHA1 ffd2b892c71e692be14614aac44351c432b7f471 SHA256 511cb2c4f48a798dfdb6dbdc58ab228408b7fab211db637f99385a6ef307654e
+MISC ChangeLog 5765 RMD160 d59ce33a54378886eee532f6661a1e7f24e97d6b SHA1 7b3d1d1f41b7807d5383bd30ea150f5ada3dbc4f SHA256 339fd3b8da839b5720dcc897052d8e3a1c40c8f7bbaa6e6a07c7157917ca6750
+MISC metadata.xml 614 RMD160 4ab891e8bfbabc249f104e2ca6d23364d43d2d1a SHA1 c9d1cf1296a220139b7e48d6770f4fa6331e05b8 SHA256 90c8a17d1cda0a959d8412c9574e8d284234ca2ae7e26a92eba0538636883fde
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/i6tYACgkQgAnW8HDreRYr4gCffW6NZhJ9NxmqOr9/nGP/sJpV
+d9QAn2NGCcsR5XFmGRnARg6wJV71Y4BC
+=hAnR
+-----END PGP SIGNATURE-----
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>