Add patch from upstream, bug #196688

Package-Manager: portage-2.1.3.15

5 files changed, 54 insertions, 15 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/Manifest b/net-irc/xchat/Manifest
index a2d1b51d6ae9..6f0edc904d43 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,21 +1,25 @@
+AUX xc284-improvescrollback.diff 1106 RMD160 268e0fc832be2fe1caf0bbadc9c7c6fd7ee75acf SHA1 533bc8d851055ef6dfaa4a01e47e6febd4919192 SHA256 7b2266b5722788405e9cd2e3858a40b04443e618b0070d81873cea83d3a9c516
+MD5 a202ee20d7f04f0a515f32190acb65d8 files/xc284-improvescrollback.diff 1106
+RMD160 268e0fc832be2fe1caf0bbadc9c7c6fd7ee75acf files/xc284-improvescrollback.diff 1106
+SHA256 7b2266b5722788405e9cd2e3858a40b04443e618b0070d81873cea83d3a9c516 files/xc284-improvescrollback.diff 1106
 AUX xc284-scrollbmkdir.diff 826 RMD160 25823f6c4f2eab546adb06f050095371892188f3 SHA1 1f6c5071ffc16f9012c82f3f84739083806285f0 SHA256 295e293d244ef5bf5d66d056ed476abaf37d2f315b41f87d421303e7a21a07cd
 MD5 e6f0279d8c01cbe6a6bf698add6113fa files/xc284-scrollbmkdir.diff 826
 RMD160 25823f6c4f2eab546adb06f050095371892188f3 files/xc284-scrollbmkdir.diff 826
 SHA256 295e293d244ef5bf5d66d056ed476abaf37d2f315b41f87d421303e7a21a07cd files/xc284-scrollbmkdir.diff 826
 DIST xchat-2.8.4.tar.bz2 1370883 RMD160 35cf84e03dfda160674d141063c8fc9cd0ac7de2 SHA1 6ac509624c241edfac5d53d9d4ece63d917613d6 SHA256 f95a9a9e477128aae536669dedd79f4e7b4d469072565695289e4bbb5b36dd63
 DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 SHA1 e7b8b58cf7f647ff8778c7542cd46e9b22987385 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f
-EBUILD xchat-2.8.4-r1.ebuild 2577 RMD160 b05842ca06c552dad5df0e21973c0d967a375666 SHA1 75938720bb818cecf2354e7d1a68927d908de3bb SHA256 c20a87630c69e29da5c7330c33c2bd84db9f58ccab96331d4f332fb549465897
-MD5 f91f15b306c127e4cfe33a2d0be87198 xchat-2.8.4-r1.ebuild 2577
-RMD160 b05842ca06c552dad5df0e21973c0d967a375666 xchat-2.8.4-r1.ebuild 2577
-SHA256 c20a87630c69e29da5c7330c33c2bd84db9f58ccab96331d4f332fb549465897 xchat-2.8.4-r1.ebuild 2577
-MISC ChangeLog 38251 RMD160 a0ef3702aed6e6eac72a7fbdd77ee27feb4edb61 SHA1 7b9d0830078409d3cd11542dc034c63c14112a1f SHA256 6091a9f4ddba2bd8609ca80be613a4f991a0bf943e72f7f804db9e1a22808d82
-MD5 704df17b9aca2d47026dc880478ec7a3 ChangeLog 38251
-RMD160 a0ef3702aed6e6eac72a7fbdd77ee27feb4edb61 ChangeLog 38251
-SHA256 6091a9f4ddba2bd8609ca80be613a4f991a0bf943e72f7f804db9e1a22808d82 ChangeLog 38251
+EBUILD xchat-2.8.4-r2.ebuild 2639 RMD160 a880c549b398cfd67dc10347de082e7244574ef9 SHA1 2083d38e0a88679c5f0dc5d7c62a48907ea9f049 SHA256 0b64e9d81a592a6754ae5ff4ccf4612eeb1449eb55d02c01d48585d5f129586e
+MD5 c6d9581f2febedb6789b689f79d970e1 xchat-2.8.4-r2.ebuild 2639
+RMD160 a880c549b398cfd67dc10347de082e7244574ef9 xchat-2.8.4-r2.ebuild 2639
+SHA256 0b64e9d81a592a6754ae5ff4ccf4612eeb1449eb55d02c01d48585d5f129586e xchat-2.8.4-r2.ebuild 2639
+MISC ChangeLog 38460 RMD160 a2b3d679f48442a6c84ff15cd4de93e7c00b4c4e SHA1 329909443ace3c3ef2ca628ccdaba1bea3e22455 SHA256 381ada2c0919c9d9b46019fa2a9bceeda0f07897b61a628f8d3cbabb0a98e2c4
+MD5 25d12b136b4906ddd5d8a93f68e99302 ChangeLog 38460
+RMD160 a2b3d679f48442a6c84ff15cd4de93e7c00b4c4e ChangeLog 38460
+SHA256 381ada2c0919c9d9b46019fa2a9bceeda0f07897b61a628f8d3cbabb0a98e2c4 ChangeLog 38460
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
-MD5 baba0f3ffdadd8f6981c6e34fc3a7e9e files/digest-xchat-2.8.4-r1 506
-RMD160 30ab02c56b5869c8d401613ceb35055b1be55ef8 files/digest-xchat-2.8.4-r1 506
-SHA256 f9ae0b0cc341dd2a416512136157822a4e69563dec180144ffd16101a813f437 files/digest-xchat-2.8.4-r1 506
+MD5 cf242e13d96e1230d5b59fc984c3f9c0 files/digest-xchat-2.8.4-r2 433
+RMD160 5c60fd2e0abd328967a7b1648b61acc390b917fd files/digest-xchat-2.8.4-r2 433
+SHA256 40b3b7690a6d95282c1fa00a54f7d24c396973fd55bebfb38b844b5932a2e249 files/digest-xchat-2.8.4-r2 433
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() {