Fix bug 414835, no version bump since it's a compilation bug.

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

4 files changed, 48 insertions, 5 deletions

diff --git a/dev-vcs/giggle/ChangeLog b/dev-vcs/giggle/ChangeLog
index d423c55d1806..e708f9ec084f 100644
--- a/dev-vcs/giggle/ChangeLog
+++ b/dev-vcs/giggle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/giggle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/ChangeLog,v 1.13 2012/05/03 02:57:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/ChangeLog,v 1.14 2012/05/06 13:59:19 ikelos Exp $
+
+  06 May 2012; Mike Auty <ikelos@gentoo.org> giggle-0.6.1.ebuild,
+  +files/giggle-0.6.1-gmodule-explicit.patch:
+  Fix bug 414835, no version bump since it's a compilation bug.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> giggle-0.5.ebuild,
   giggle-0.6.1.ebuild:
diff --git a/dev-vcs/giggle/Manifest b/dev-vcs/giggle/Manifest
index 7d40f19bc22d..1e888fa307ab 100644
--- a/dev-vcs/giggle/Manifest
+++ b/dev-vcs/giggle/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX giggle-0.6.1-gmodule-explicit.patch 849 RMD160 8a374cf28fa857ddd7d898614b8b23ee2493ff92 SHA1 bb33dd20b45dcf3ef34b7fac5e23ad72ef7e97a2 SHA256 f8ad37a5e533e24afe127e6d67f7baf055ebed93b822644d7a08d97c96079474
 DIST giggle-0.5.tar.bz2 486406 RMD160 ee2ff519d7bd29f59a5b4b26342e1dfc7916deb2 SHA1 43143e49be8f510e126c19c68ce19870448e9430 SHA256 2e2c70d25159d31c87d155c9f799e0f1feb30fe26fc8aaf207ca6b3bd9b2b259
 DIST giggle-0.6.1.tar.bz2 1908147 RMD160 56db8094dfe85f63e359c253eded811fcab7ac6e SHA1 790f3ff8eb47896a96c10e0697d17b26fbfcef45 SHA256 47d5da248aae588b69427f8726b8b7cf76701544bb0b567ef823afefe2e39f52
 EBUILD giggle-0.5.ebuild 965 RMD160 31a059c617b088a9ffb2415ef501affae31b65f2 SHA1 da44583b521468b4ff06b5340a3621119f20d157 SHA256 481f82ad631f80dd0eea41bc78525693ce77929f5051c84b12af84636bfa989d
-EBUILD giggle-0.6.1.ebuild 886 RMD160 2f793b4119e6c8649230c00ccc90d529ec7d7295 SHA1 49b1576e53eaa9dd21cdc06de2675d3cda435efe SHA256 d135bad46c66bab16a7852d1ab1d990147101775f62d1c2a3db8f1b16424560a
-MISC ChangeLog 5354 RMD160 836751cd8c4f73f8eb6b799e53dfdeaf5e6b062a SHA1 d344ee214ebbafa50170d991d79257db805cacc2 SHA256 a97b81a1a1ba40ab1c087b539b653b2a87e012c83b389060fb60d72e89251612
+EBUILD giggle-0.6.1.ebuild 985 RMD160 8428f140450cf43ecf2612492357ff38fed59b67 SHA1 9fd19d37b542083210bc0f37cb17361f3a76b553 SHA256 07d26e549d2830d436bebccab0203d834540a23b01c308fa9059a149dbe68646
+MISC ChangeLog 5531 RMD160 c4f9aee79413d6371d941aee5ed98b659693442d SHA1 95b6fc8fe6efa0335b7f5183c32891c310a7f14d SHA256 b4d61b2c22b53e77810ac9f70a99087a6b15cd8fff4c6b2356fbf6a92ab09e05
 MISC metadata.xml 308 RMD160 72fbb179bf7b778d7c47d5fa39cf3ed34d573d24 SHA1 b570907c82eac4b605da77baa919286908abccfd SHA256 99f014e759c422b2db301da36b8f3b84b1bd38fe53e49eb54c2827368e42bcee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk+mg8YACgkQu7rWomwgFXo1+gCfYdvrE/POgVG2pTmSN3ZMCA+Q
+xbkAn192Mq3COE0ghEVXjh0smeEq3KbA
+=vl7Z
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/giggle/files/giggle-0.6.1-gmodule-explicit.patch b/dev-vcs/giggle/files/giggle-0.6.1-gmodule-explicit.patch
new file mode 100644
index 000000000000..2716ea2cdeef
--- /dev/null
+++ b/dev-vcs/giggle/files/giggle-0.6.1-gmodule-explicit.patch
@@ -0,0 +1,23 @@
+From 6a4d71af9920df76a15e427671c90952fddbb411 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Thu, 19 Jan 2012 13:48:40 +0000
+Subject: build: Explicitly link to gmodule-2.0
+
+gmodule-2.0 is now gone from the pkg-config files for GTK+ 3 and others.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667350
+---
+diff --git a/configure.ac b/configure.ac
+index 07f5b7b..aa11046 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,6 +55,7 @@ GTKSOURCE_REQUIRED_VERSION=3.0
+ PKG_CHECK_MODULES(GIGGLE, [
+         gio-2.0           >= $GLIB_REQUIRED_VERSION
+         glib-2.0          >= $GLIB_REQUIRED_VERSION
++        gmodule-2.0       >= $GLIB_REQUIRED_VERSION
+         gthread-2.0       >= $GLIB_REQUIRED_VERSION
+         gdk-pixbuf-2.0    >= $GDK_PIXBUF_REQUIRED_VERSION
+         gdk-3.0           >= $GTK_REQUIRED_VERSION
+--
+cgit v0.9.0.2
diff --git a/dev-vcs/giggle/giggle-0.6.1.ebuild b/dev-vcs/giggle/giggle-0.6.1.ebuild
index 0f429cdbc221..f9788ea79451 100644
--- a/dev-vcs/giggle/giggle-0.6.1.ebuild
+++ b/dev-vcs/giggle/giggle-0.6.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.6.1.ebuild,v 1.5 2012/05/03 02:57:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.6.1.ebuild,v 1.6 2012/05/06 13:59:19 ikelos Exp $
 
 EAPI="3"
 
-inherit gnome2
+inherit gnome2 autotools eutils
 
 DESCRIPTION="GTK+ Frontend for GIT"
 HOMEPAGE="http://live.gnome.org/giggle"
@@ -32,3 +32,8 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 G2CONF="$(use_enable eds evolution-data-server)"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gmodule-explicit.patch"
+	eautoreconf
+}