Fix building of the text frontend, bug #118206. Patch from upstream CVS, submitted by Patrizio Bassi.

Package-Manager: portage-2.1_pre6-r7

4 files changed, 46 insertions, 12 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 036330453c9b..fd76c25be481 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.194 2006/03/10 00:49:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.195 2006/03/25 20:07:20 swegener Exp $
+
+  25 Mar 2006; Sven Wegener <swegener@gentoo.org>
+  +files/2.6.1-fe-text.patch, xchat-2.6.1.ebuild:
+  Fix building of the text frontend, bug #118206. Patch from upstream CVS,
+  submitted by Patrizio Bassi.
 
   10 Mar 2006; Aron Griffis <agriffis@gentoo.org> xchat-2.4.5-r1.ebuild:
   Mark 2.4.5-r1 stable on ia64
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 97fd4ea3c421..f6b9c477fa93 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,9 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d575dbd345827c98e3007f210a0a459e ChangeLog 28750
-RMD160 475250b537bf4a361dc63ee2059ff1193407a365 ChangeLog 28750
-SHA256 ac8f44ada8fe4889541829bd7b176be1c212b56505613c25bd41e618d0a84d19 ChangeLog 28750
+MD5 54f0f20bac577116e58935c31ee6d306 ChangeLog 28957
+RMD160 3115822df9007ad9c2ed2c5bb6d7047afda1dcab ChangeLog 28957
+SHA256 a3f8284410d8e68b9651293ac606c4eaf4f2fe1e60986ca3133ba03a68f5ae49 ChangeLog 28957
+MD5 041a8391e34746696777938dc261066b files/2.6.1-fe-text.patch 544
+RMD160 d794a4501c686d2c3e9434fa415893e6a7ef3f0b files/2.6.1-fe-text.patch 544
+SHA256 2f1164ea978e96458b7d3b4c29939d29225f3f21322e95742264b4a0356d7aaa files/2.6.1-fe-text.patch 544
 MD5 6354e2efb6f0d1323ad8849be7303575 files/44_fix_alignment_endianess.dpatch 8676
 RMD160 f59929dade1b7c5803d888e40eaa71e298b96a03 files/44_fix_alignment_endianess.dpatch 8676
 SHA256 1480ac7905eb19b8a9b7fb1007cfce15bbcb80777329e71eb9b45cd5c80b34c1 files/44_fix_alignment_endianess.dpatch 8676
@@ -49,13 +52,13 @@ SHA256 67e52b652e6bf318c4dba7949212eb0804db34858f0b817337e515ecfd449c11 xchat-2.
 MD5 8c7e2a71f3f0bb33bc7d9508bd03d593 xchat-2.4.5.ebuild 2307
 RMD160 e33308ae26ef75321e274a3e8f58b018eb86a076 xchat-2.4.5.ebuild 2307
 SHA256 29f5fdbd71ea2fb0cb41abfefc7b0d9b050267d7ba7c29cc5e0170c7304ed724 xchat-2.4.5.ebuild 2307
-MD5 aa4cac1f7ff5a4ded98404eadeb9974d xchat-2.6.1.ebuild 2235
-RMD160 3fcc895a25a76aa45b12cd8a73db24070562064a xchat-2.6.1.ebuild 2235
-SHA256 a2c1ab985cb9057f5c1ee5b119b7746410960b8c68e94071136d7faca66e11aa xchat-2.6.1.ebuild 2235
+MD5 af931da122ca7821384fc208b5468f8a xchat-2.6.1.ebuild 2278
+RMD160 91eb0f3046f6aa3922282676128374aa199dfb32 xchat-2.6.1.ebuild 2278
+SHA256 9f03e02642e3c2b28a4e2912978ecbd6020fc414ca0c3619b1ceb0e622e7de6d xchat-2.6.1.ebuild 2278
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEEM0ZJrHF4yAQTrARAgwlAJ9c6TL2MDCONbQ3vsifLSnLLNqByQCgnw9W
-hjzu8BaMdHQaQ8/G0wHPo8E=
-=Vlv/
+iD8DBQFEJaMDI1lqEGTUzyQRAk7DAJ449cwRkbJT0U+P/zXw+QRYeWV3HwCdEYDR
+5iEn4MWzbTdcloyrRK1SnzY=
+=UBo+
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/2.6.1-fe-text.patch b/net-irc/xchat/files/2.6.1-fe-text.patch
new file mode 100644
index 000000000000..5ac0ee51d7e3
--- /dev/null
+++ b/net-irc/xchat/files/2.6.1-fe-text.patch
@@ -0,0 +1,24 @@
+Patch from upstream CVS, slightly modified
+
+===================================================================
+RCS file: /cvsroot/xchat/xchat2/src/fe-text/fe-text.c,v
+retrieving revision 1.27
+retrieving revision 1.28
+diff -u -r1.27 -r1.28
+--- xchat/xchat2/src/fe-text/fe-text.c	2005/11/04 03:39:23	1.27
++++ xchat/xchat2/src/fe-text/fe-text.c	2006/01/11 05:34:09	1.28
+@@ -667,6 +667,14 @@
+ {
+ }
+ void
++joind (int action, server *serv)
++{
++}
++void
++fe_userlist_set_selected (struct session *sess)
++{
++}
++void
+ fe_dcc_add (struct DCC *dcc)
+ {
+ }
diff --git a/net-irc/xchat/xchat-2.6.1.ebuild b/net-irc/xchat/xchat-2.6.1.ebuild
index ffa5f8f5a924..781f8f2a38a9 100644
--- a/net-irc/xchat/xchat-2.6.1.ebuild
+++ b/net-irc/xchat/xchat-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.1.ebuild,v 1.3 2006/02/19 16:43:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.1.ebuild,v 1.4 2006/03/25 20:07:20 swegener Exp $
 
 inherit eutils versionator gnome2
 
@@ -42,6 +42,8 @@ src_unpack() {
 		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
 			"${S}"/configure{,.in} || die
 	fi
+
+	epatch "${FILESDIR}"/2.6.1-fe-text.patch
 }
 
 src_compile() {