Pull in a patch from upstream to fix text frontend building.

Package-Manager: portage-2.0.53_rc7

4 files changed, 79 insertions, 15 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 80504c4e40be..fc834fbc5d0d 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.178 2005/11/03 07:20:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.179 2005/11/04 07:18:35 swegener Exp $
+
+  04 Nov 2005; Sven Wegener <swegener@gentoo.org>
+  +files/xc260-fix-fetext.diff, xchat-2.6.0.ebuild:
+  Pull in a patch from upstream to fix text frontend building.
 
 *xchat-2.6.0 (03 Nov 2005)
 
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index b138d088f8a9..d1fecc55751e 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 510fd65e41cfc72f372fd34de40b6c8b ChangeLog 26704
+MD5 88a519c952b4c2d6d1d09fdc4e31aa1f ChangeLog 26870
 MD5 e2b99b2d2dfc54ba96e560c0ed8392df files/digest-xchat-1.8.11-r1 65
 MD5 21bc6820aa6d0c8722509a74c7fccb3d files/digest-xchat-2.4.3 134
 MD5 c5d53c24b3ebfec1f168930213f55fea files/digest-xchat-2.4.5 65
@@ -9,16 +6,10 @@ MD5 02c31b272038e119a3ce2d4a79897f72 files/digest-xchat-2.6.0 64
 MD5 a8f607d224408d4a27777d2ffce8beac files/xc1811fixststint.diff 422
 MD5 31de685eff3d16d9466416434c9fd6c3 files/xc208-fixsocks5.diff 688
 MD5 17073299c8c2c65062ad2e77cd03b841 files/xc245-fix-te-notify.diff 403
+MD5 6bfc06df4986a7fb482525e1dfd8fa21 files/xc260-fix-fetext.diff 1123
 MD5 ee98eba7f1061680d8d0582a10d72cb7 files/xchat-dccserver-0.5.patch 11776
 MD5 fb5772136a872c08434566d4f0bcdc7f metadata.xml 179
 MD5 4634f562e01b219d3bcfb0ae6acb8397 xchat-1.8.11-r1.ebuild 2264
 MD5 f70fee92ab2e258ea7be208d0ddfa4b6 xchat-2.4.3.ebuild 2266
 MD5 f8955431b1602f7fa637ee19c96d0369 xchat-2.4.5.ebuild 2301
-MD5 b52995c8db3b6105551bb1ac9aa58876 xchat-2.6.0.ebuild 2203
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDatrcgIKl8Uu19MoRAl8hAJ9TBpnnvOXU/MKHAjilBZdbXRSzEQCfZnIp
-C7jgjhsN3EOPhjMnrf1qkaE=
-=D1KM
------END PGP SIGNATURE-----
+MD5 55c602b144fd5109640f5c8ea29ff216 xchat-2.6.0.ebuild 2257
diff --git a/net-irc/xchat/files/xc260-fix-fetext.diff b/net-irc/xchat/files/xc260-fix-fetext.diff
new file mode 100644
index 000000000000..5322ab7f457e
--- /dev/null
+++ b/net-irc/xchat/files/xc260-fix-fetext.diff
@@ -0,0 +1,67 @@
+#
+# Fix for building xchat 2.6.0 with ./configure --enable-textfe
+#
+--- xchat-2.6.0/src/fe-text/fe-text.c	28 Sep 2005 07:49:46 -0000	1.26
++++ xchat-2.6.0p1/src/fe-text/fe-text.c	4 Nov 2005 03:19:46 -0000
+@@ -109,12 +109,6 @@
+ 	fe_print_text (sess, buf);
+ 
+ 	fe_print_text (sess, "\n\nCompiled in Features\0032:\017 "
+-#ifdef USE_PERL
+-	"Perl "
+-#endif
+-#ifdef USE_PYTHON
+-	"Python "
+-#endif
+ #ifdef USE_PLUGIN
+ 	"Plugin "
+ #endif
+@@ -124,9 +118,6 @@
+ #ifdef USE_OPENSSL
+ 	"OpenSSL "
+ #endif
+-#ifdef SOCKS
+-	"Socks5 "
+-#endif
+ #ifdef USE_IPV6
+ 	"IPv6"
+ #endif
+@@ -406,7 +397,7 @@
+ 			return 0;
+ 		}
+ 	}
+-	return 1;
++	return -1;
+ }
+ 
+ void
+@@ -557,7 +548,7 @@
+ }
+ 
+ void
+-fe_message (char *msg, int wait)
++fe_message (char *msg, int flags)
+ {
+ 	puts (msg);
+ }
+@@ -565,7 +556,7 @@
+ void
+ fe_close_window (struct session *sess)
+ {
+-	kill_session_callback (sess);
++	session_free (sess);
+ 	done = TRUE;
+ }
+ 
+@@ -803,6 +794,11 @@
+ {
+ 	return -1;
+ }
++void *
++fe_gui_info_ptr (session *sess, int info_type)
++{
++	return NULL;
++}
+ void fe_confirm (const char *message, void (*yesproc)(void *), void (*noproc)(void *), void *ud)
+ {
+ }
diff --git a/net-irc/xchat/xchat-2.6.0.ebuild b/net-irc/xchat/xchat-2.6.0.ebuild
index 4bb917d93986..922fe107e1b8 100644
--- a/net-irc/xchat/xchat-2.6.0.ebuild
+++ b/net-irc/xchat/xchat-2.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.0.ebuild,v 1.3 2005/11/04 03:51:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.0.ebuild,v 1.4 2005/11/04 07:18:35 swegener Exp $
 
-inherit versionator
+inherit eutils versionator
 
 DESCRIPTION="Graphical IRC client"
 SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
@@ -37,6 +37,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/xc260-fix-fetext.diff
+
 	# use libdir/xchat/plugins as the plugin directory
 	if [ $(get_libdir) != "lib" ] ; then
 		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \