Add patch from upstream, bug #230451

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 i686

4 files changed, 81 insertions, 4 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index b3d125f84011..918df4a6badb 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.265 2008/06/13 09:56:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.266 2008/07/06 17:50:05 armin76 Exp $
+
+*xchat-2.8.6-r1 (06 Jul 2008)
+
+  06 Jul 2008; Raúl Porcel <armin76@gentoo.org>
+  +files/xc286-smallfixes.diff, -xchat-2.8.6.ebuild, +xchat-2.8.6-r1.ebuild:
+  Add patch from upstream, bug #230451
 
 *xchat-2.8.6 (13 Jun 2008)
 
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index fa5928c0d6b1..1bd4f056fe83 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,11 +1,12 @@
 AUX xc284-fix-scrollbfdleak.diff 275 RMD160 48e060a8c9d00984323927e152732718727f862e SHA1 60e5895db731f7846ece98d5d1ad822634e42576 SHA256 24db8f746571ab341f1b2062e76d8a89a35500a973184164ded4500aebf87b30
 AUX xc284-improvescrollback.diff 1106 RMD160 268e0fc832be2fe1caf0bbadc9c7c6fd7ee75acf SHA1 533bc8d851055ef6dfaa4a01e47e6febd4919192 SHA256 7b2266b5722788405e9cd2e3858a40b04443e618b0070d81873cea83d3a9c516
 AUX xc284-scrollbmkdir.diff 826 RMD160 25823f6c4f2eab546adb06f050095371892188f3 SHA1 1f6c5071ffc16f9012c82f3f84739083806285f0 SHA256 295e293d244ef5bf5d66d056ed476abaf37d2f315b41f87d421303e7a21a07cd
+AUX xc286-smallfixes.diff 2020 RMD160 91c654320b7b1f9d6b13f7b226fb4cec26054319 SHA1 b13eb421f6d72fca195b398c606d9413aec57fc4 SHA256 08c31e4d8d792f101047362cb25c529389c9fa254e2139a678491ee4e1fe58ff
 AUX xchat-fix-uk_UA-locale.diff 397 RMD160 8b79ed3bd4f5ef28ffda0a8d4de18e0647e4c0f7 SHA1 aee8e979b4d232e64409d1e3ed07c7b94054313d SHA256 35e25050c1f9c134c5c89d7a5970acb41d7dcb9027510d7e9f0d72b40818da64
 DIST xchat-2.8.4.tar.bz2 1370883 RMD160 35cf84e03dfda160674d141063c8fc9cd0ac7de2 SHA1 6ac509624c241edfac5d53d9d4ece63d917613d6 SHA256 f95a9a9e477128aae536669dedd79f4e7b4d469072565695289e4bbb5b36dd63
 DIST xchat-2.8.6.tar.bz2 1423645 RMD160 bc199e3b58a9db3dfd9f2af6bac7fb6162c53d6e SHA1 7a7463e65cb26c680ed70dd96cec98bcc05435a4 SHA256 8c89dbf36304b99363a7f090d695447653102b4528ca2aa367a2abe5cff1746d
 DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 SHA1 e7b8b58cf7f647ff8778c7542cd46e9b22987385 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f
 EBUILD xchat-2.8.4-r3.ebuild 2727 RMD160 671a13d9a687a15eab6d9aebb31d86c5497a388a SHA1 f2b7c1c2fbdc04ac39abde4280d866f5ffe8e0d5 SHA256 655002f1c7766444cc5b8701529e29298830d003235f439ccd0aefe96b405041
-EBUILD xchat-2.8.6.ebuild 2538 RMD160 b343df2df76ef85b7ec4c8ceb56c834e35270021 SHA1 b387f306db0c2ce216429ea09650fef9594da10c SHA256 a66bcf2dd6dac0ae0b5c5fbecbb89ae0c1bb8bf3d27bedfa7e8629df87afce58
-MISC ChangeLog 38949 RMD160 fc583c9188b282d3949877efdaf69e649b0c319a SHA1 705f4e5f0711f56ecc278c3d4948edaa76b83693 SHA256 8c296e8c012563e14adddc40f6194be521e33b96a047c32fb7a1ecbb2a888ecf
+EBUILD xchat-2.8.6-r1.ebuild 2586 RMD160 5014769d7b247a61a775430cef19932b35dafe05 SHA1 4e924ef21edad8437b4f29dfa3352a943bcb7bdb SHA256 57a73dd6563a172e3b7224e36d22c94b7edd469ef3bb3df050d8b68bfb719893
+MISC ChangeLog 39146 RMD160 25f00bbb94e2e294750841cc8b8f0ff14bfa06ef SHA1 deac9b295635c361a11492ebe10f0db9b2e45ad4 SHA256 a9e9aaa74fcd2934afcf7641fcb2e88fc7cff4dd0383abe3f939dbb8f75438c6
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
diff --git a/net-irc/xchat/files/xc286-smallfixes.diff b/net-irc/xchat/files/xc286-smallfixes.diff
new file mode 100644
index 000000000000..da9001522fd8
--- /dev/null
+++ b/net-irc/xchat/files/xc286-smallfixes.diff
@@ -0,0 +1,68 @@
+#
+# Various small fixes from CVS that are considered safe to apply to 2.8.6.
+#
+--- xchat-2.8.6/src/common/cfgfiles.c	2008-02-05 21:02:47.000000000 +1100
++++ xchat-2.8.6p1/src/common/cfgfiles.c	2008-06-15 13:45:43.000000000 +1000
+@@ -886,7 +886,6 @@
+ set_showval (session *sess, const struct prefs *var, char *tbuf)
+ {
+ 	int len, dots, j;
+-	static const char *offon[] = { "OFF", "ON" };
+ 
+ 	len = strlen (var->name);
+ 	memcpy (tbuf, var->name, len);
+@@ -909,8 +908,10 @@
+ 					*((int *) &prefs + var->offset));
+ 		break;
+ 	case TYPE_BOOL:
+-		sprintf (tbuf + len, "\0033:\017 %s\n", offon[
+-					*((int *) &prefs + var->offset)]);
++		if (*((int *) &prefs + var->offset))
++			sprintf (tbuf + len, "\0033:\017 %s\n", "ON");
++		else
++			sprintf (tbuf + len, "\0033:\017 %s\n", "OFF");
+ 		break;
+ 	}
+ 	PrintText (sess, tbuf);
+--- xchat-2.8.6/src/common/chanopt.c	2008-06-10 22:00:55.000000000 +1000
++++ xchat-2.8.6p1/src/common/chanopt.c	2008-06-15 13:48:04.000000000 +1000
+@@ -32,7 +32,7 @@
+ 
+ #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx)
+ 
+-channel_options chanopt[] =
++static const channel_options chanopt[] =
+ {
+ 	{"alert_beep", "BEEP", S_F(alert_beep)},
+ 	{"alert_taskbar", NULL, S_F(alert_taskbar)},
+--- xchat-2.8.6/src/common/servlist.c	2008-04-01 19:22:34.000000000 +1100
++++ xchat-2.8.6p1/src/common/servlist.c	2008-06-15 13:57:41.000000000 +1000
+@@ -509,6 +509,8 @@
+ 	list = g_slist_nth (net->servlist, net->selected);
+ 	if (!list)
+ 		list = net->servlist;
++	if (!list)
++		return;
+ 	ircserv = list->data;
+ 
+ 	/* incase a protocol switch is added to the servlist gui */
+--- xchat-2.8.6/src/common/text.c	2008-03-28 13:20:04.000000000 +1100
++++ xchat-2.8.6p1/src/common/text.c	2008-06-15 13:59:59.000000000 +1000
+@@ -216,7 +216,7 @@
+ static void
+ scrollback_save (session *sess, char *text)
+ {
+-	char buf[1024];
++	char buf[512 * 4];
+ 	time_t stamp;
+ 	int len;
+ 
+@@ -266,7 +266,7 @@
+ scrollback_load (session *sess)
+ {
+ 	int fh;
+-	char buf[1024];
++	char buf[512 * 4];
+ 	char *text;
+ 	time_t stamp;
+ 	int lines;
diff --git a/net-irc/xchat/xchat-2.8.6.ebuild b/net-irc/xchat/xchat-2.8.6-r1.ebuild
index be12ff454ee5..fcc9ed7ed1ba 100644
--- a/net-irc/xchat/xchat-2.8.6.ebuild
+++ b/net-irc/xchat/xchat-2.8.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.6.ebuild,v 1.1 2008/06/13 09:56:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.6-r1.ebuild,v 1.1 2008/07/06 17:50:05 armin76 Exp $
 
 inherit eutils versionator gnome2
 
@@ -41,6 +41,8 @@ src_unpack() {
 		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
 			"${S}"/configure{,.in} || die
 	fi
+
+	epatch "${FILESDIR}"/xc286-smallfixes.diff
 }
 
 src_compile() {