Build fix for recent GTK+ breakage, patch dug up by Kent Fredric <kentfredric@gmail.com>. Closes bug #241498.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.28-rc2-00185-ge946217-dirty x86_64

4 files changed, 36 insertions, 7 deletions

diff --git a/net-irc/conspire/ChangeLog b/net-irc/conspire/ChangeLog
index cbf55be2a061..98dfaabeb267 100644
--- a/net-irc/conspire/ChangeLog
+++ b/net-irc/conspire/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/conspire
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/ChangeLog,v 1.9 2008/10/12 00:12:49 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/ChangeLog,v 1.10 2008/10/31 13:14:41 chainsaw Exp $
+
+  31 Oct 2008; <chainsaw@gentoo.org> +files/0.20-de798c3d89ea.diff,
+  conspire-0.20.ebuild:
+  Build fix for recent GTK+ breakage, patch dug up by Kent Fredric
+  <kentfredric@gmail.com>. Closes bug #241498.
 
   12 Oct 2008; <chainsaw@gentoo.org> conspire-0.12.0.ebuild,
   conspire-0.13.1.ebuild, conspire-0.20.ebuild:
diff --git a/net-irc/conspire/Manifest b/net-irc/conspire/Manifest
index 70877b6ec934..da575e29298c 100644
--- a/net-irc/conspire/Manifest
+++ b/net-irc/conspire/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.20-de798c3d89ea.diff 399 RMD160 da2281ca00fd6c7d5716fbcc713edfb66968b269 SHA1 48945869c4f792db417915a54d641a8d65e409f0 SHA256 aa14a8d94a12782a3e9217c7bd17e80b9ce0073c27b94ee984dd3e2b355bba6a
 DIST conspire-0.12.0.tbz2 1144684 RMD160 1de8f6699b21215af184fd07c9ca3830cee1e88a SHA1 a7d48264bdd63756d5e034ab02b7632b9617a532 SHA256 0cf94142b9b22f881a1a73da4939e4724ec272056ef2d172157882846bde5e2b
 DIST conspire-0.13.1.tbz2 1173038 RMD160 d7d7b007a52a2b0780bc651be6e02882c201e170 SHA1 21b8ca276e8e7802aa896072e103f243f7f0c511 SHA256 dfddb3b406ed88e8d97c92e82c13f1039d2255d517d21ddd9b92c08066b245a1
 DIST conspire-0.20.tbz2 1150730 RMD160 5731688fcd487eb508a884e1e04106f955222b5c SHA1 0c68cc683568ac28a24e6294619ff0c893a3451b SHA256 8029f3ce87c6392e4305ae49a826832e14342b224a315f8020d9804eb30f2065
 EBUILD conspire-0.12.0.ebuild 1049 RMD160 56b9c656a868ccf9b6ec21c4cac9f44ebb866f77 SHA1 a82a262fa61a13617a9bbcb9c8c08feef3305b2d SHA256 82dd5ae809222837efa1cb82ba56572d10582766bdf06a80f2d9dea627dccaf1
 EBUILD conspire-0.13.1.ebuild 1063 RMD160 4ac1bd98d7c1cdb55f495d227409bc3ed7f2b6cd SHA1 cda80762b2f8fa8ff5d4b4b1858c0beb786490df SHA256 b008f1fc26b3368ed2c6d0f51e7c525860279d9c15725d1c612be6b2a99868b3
-EBUILD conspire-0.20.ebuild 1165 RMD160 12c33d048d4290f8a634250bfc56639824797729 SHA1 203e7b72146d60a25f88c9e733aa676b8172f04f SHA256 b2ce6720a399a7bb7f4fdd9775f5250a07a1f7fe0db3d6f3123a7f177a8690d1
-MISC ChangeLog 1915 RMD160 514065f0ffe05fe1cc9964f7d4c4db728c518ae4 SHA1 50ee1bcb310112fa68bfee7a40e6f735fe3e52e6 SHA256 c233d095c321f42d038277aaa2bfba1a1ce04d55855b917a3ba3a758d48e2886
+EBUILD conspire-0.20.ebuild 1269 RMD160 422533179a630140c884b2fad0200a8a57cdc615 SHA1 ce46a9440109e2d04b546e86f8c2a69cb2e7330c SHA256 0b8d62d60e36ec2812c92edd49b6466d5e7fc4b2c52f7e34a99dcb97afc960c9
+MISC ChangeLog 2123 RMD160 adfd92fe1bf09355c8487b401690487d2baded7c SHA1 379822b6cc2dd089272a4a19050443ab430abdd8 SHA256 bf72ebab9275cdc3ef267927ba3e68dd8a36fdc00b32d531c8691b1826e8851f
 MISC metadata.xml 250 RMD160 bbb8dc8eb566565cca20e2b1946b628de99d67b9 SHA1 d25f4394511b1f01d39ef163eada07751c158862 SHA256 304cf815927a5988355b9fd06d13eea56178bff87b2fe5262f9d0b6640c3050d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjxQOMACgkQp5vW4rUFj5r6CACgoxRC2pUthTJfKNG0V5bj1dgf
-3s0AoKtmWKsoOIGmYyD/M77YD7GU0uKz
-=mpT4
+iEYEARECAAYFAkkLBHgACgkQp5vW4rUFj5rXiwCgvcFOKMZ20IZ+fkHYJtxg+CQ8
+RzwAoK8cN0jHvKgZhGvScVCJRPrfa59E
+=DHEp
 -----END PGP SIGNATURE-----
diff --git a/net-irc/conspire/conspire-0.20.ebuild b/net-irc/conspire/conspire-0.20.ebuild
index b9f3c7411ffb..448881347039 100644
--- a/net-irc/conspire/conspire-0.20.ebuild
+++ b/net-irc/conspire/conspire-0.20.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/conspire-0.20.ebuild,v 1.2 2008/10/12 00:12:49 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/conspire-0.20.ebuild,v 1.3 2008/10/31 13:14:41 chainsaw Exp $
+
+inherit eutils
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
@@ -21,6 +23,12 @@ RDEPEND=">=dev-libs/libmowgli-0.6.0
 	dbus? ( >=dev-libs/dbus-glib-0.60 )
 	python? ( >=dev-lang/python-2.2 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-de798c3d89ea.diff"
+}
+
 src_compile() {
 	econf \
 		$(use_enable socks5 socks) \
diff --git a/net-irc/conspire/files/0.20-de798c3d89ea.diff b/net-irc/conspire/files/0.20-de798c3d89ea.diff
new file mode 100644
index 000000000000..2d0d2166e49b
--- /dev/null
+++ b/net-irc/conspire/files/0.20-de798c3d89ea.diff
@@ -0,0 +1,15 @@
+
+--- a/src/fe-gtk/xtext.h	Mon Mar 24 06:54:42 2008 -0500
++++ b/src/fe-gtk/xtext.h	Tue Jul 22 18:47:41 2008 +0100
+@@ -255,6 +255,6 @@
+ xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext);
+ void gtk_xtext_buffer_free (xtext_buffer *buf);
+ void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render);
+-GtkType gtk_xtext_get_type (void);
++GType gtk_xtext_get_type (void);
+ 
+ #endif
+
+
+
+