Add patch from upstream, bug #196688

(Portage version: 2.1.3.15)

4 files changed, 39 insertions, 4 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index fc28fe02e438..a8e25cb75be7 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.261 2007/08/06 09:11:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.262 2007/10/22 15:08:01 armin76 Exp $
+
+*xchat-2.8.4-r2 (22 Oct 2007)
+
+  22 Oct 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/xc284-improvescrollback.diff, -xchat-2.8.4-r1.ebuild,
+  +xchat-2.8.4-r2.ebuild:
+  Add patch from upstream, bug #196688
 
   06 Aug 2007; Raúl Porcel <armin76@gentoo.org>
   -files/2.8.2-fe-text-vartype.patch, -files/xc282-fixtrayzombies.diff,
diff --git a/net-irc/xchat/files/digest-xchat-2.8.4-r1 b/net-irc/xchat/files/digest-xchat-2.8.4-r2
index a35cdfc237e7..ff6d434cb226 100644
--- a/net-irc/xchat/files/digest-xchat-2.8.4-r1
+++ b/net-irc/xchat/files/digest-xchat-2.8.4-r2
@@ -1,6 +1,5 @@
 MD5 66d60febc62a01bafac9bb3a35fb37ae xchat-2.8.4.tar.bz2 1370883
 RMD160 35cf84e03dfda160674d141063c8fc9cd0ac7de2 xchat-2.8.4.tar.bz2 1370883
 SHA256 f95a9a9e477128aae536669dedd79f4e7b4d469072565695289e4bbb5b36dd63 xchat-2.8.4.tar.bz2 1370883
-MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/files/xc284-improvescrollback.diff b/net-irc/xchat/files/xc284-improvescrollback.diff
new file mode 100644
index 000000000000..4bada74e4af1
--- /dev/null
+++ b/net-irc/xchat/files/xc284-improvescrollback.diff
@@ -0,0 +1,28 @@
+#
+# 1) Stops scrollback files growing too large by fixing the file-shrink code.
+# 2) Puts a "Display scrollback from previous session" into the Setup GUI
+#    (logging section) so people can turn this off without typing commands.
+#
+--- xchat-2.8.4/src/common/text.c	29 Jul 2007 05:02:36 -0000	1.90
++++ xchat-2.8.4p1/src/common/text.c	26 Sep 2007 07:29:55 -0000
+@@ -285,6 +285,8 @@
+ 		}
+ 	}
+ 
++	sess->scrollwritten = lines;
++
+ 	if (lines)
+ 	{
+ 		text = ctime (&stamp);
+--- xchat-2.8.4/src/fe-gtk/setup.c	9 Sep 2007 04:57:07 -0000	1.100
++++ xchat-2.8.4p1/src/fe-gtk/setup.c	26 Sep 2007 07:29:57 -0000
+@@ -382,7 +382,8 @@
+ static const setting logging_settings[] =
+ {
+ 	{ST_HEADER,	N_("Logging"),0,0,0},
+-	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
++	{ST_TOGGLE,	N_("Display scrollback from previous session"), P_OFFINTNL(text_replay), 0, 0, 0},
++	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
+ 	{ST_ENTRY,	N_("Log filename:"), P_OFFSETNL(logmask), 0, 0, sizeof prefs.logmask},
+ 	{ST_LABEL,	N_("%s=Server %c=Channel %n=Network.")},
+ 
diff --git a/net-irc/xchat/xchat-2.8.4-r1.ebuild b/net-irc/xchat/xchat-2.8.4-r2.ebuild
index 040878a9846f..6dd3168741ff 100644
--- a/net-irc/xchat/xchat-2.8.4-r1.ebuild
+++ b/net-irc/xchat/xchat-2.8.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.4-r1.ebuild,v 1.7 2007/08/06 05:51:14 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.8.4-r2.ebuild,v 1.1 2007/10/22 15:08:01 armin76 Exp $
 
 inherit eutils versionator gnome2
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="perl dbus tcl python ssl mmx ipv6 libnotify nls spell xchatnogtk xchatdccserver"
 
 RDEPEND=">=dev-libs/glib-2.6.0
@@ -43,6 +43,7 @@ src_unpack() {
 	fi
 
 	epatch "${FILESDIR}"/xc284-scrollbmkdir.diff
+	epatch "${FILESDIR}"/xc284-improvescrollback.diff
 }
 
 src_compile() {