[SM-Commit] GIT changes to master grimoire by George Sherwood (4c6f0c61c695c1dd207e39959e0a0b4eef5522e4)

George Sherwood scm at sourcemage.org
Sun Nov 11 07:36:28 EST 2007


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 chat-irc/xchat/DETAILS                      |    1 
 chat-irc/xchat/HISTORY                      |    7 +++++
 chat-irc/xchat/PRE_BUILD                    |    5 ++++
 chat-irc/xchat/xc284-improvescrollback.diff |   28 +++++++++++++++++++++++
 chat-irc/xchat/xc284-scrollbmkdir.diff      |   33 ++++++++++++++++++++++++++++
 5 files changed, 74 insertions(+)

New commits:
commit 4c6f0c61c695c1dd207e39959e0a0b4eef5522e4
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    xchat: Added two upstream patches improving the scroll back log.

diff --git a/chat-irc/xchat/DETAILS b/chat-irc/xchat/DETAILS
index 9fc7b2c..2b1e9a6 100755
--- a/chat-irc/xchat/DETAILS
+++ b/chat-irc/xchat/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
         WEB_SITE=http://www.xchat.org
+      PATCHLEVEL=1
          ENTERED=20010927
       LICENSE[0]=GPL
         KEYWORDS="irc chat"
diff --git a/chat-irc/xchat/HISTORY b/chat-irc/xchat/HISTORY
index ddf56f2..09addec 100644
--- a/chat-irc/xchat/HISTORY
+++ b/chat-irc/xchat/HISTORY
@@ -1,3 +1,10 @@
+2007-11-11 George Sherwood <george at beernabeer.com>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Added to incorporate upstream patches
+	* xc284-improvescrollback.diff: Upstream patch to fix scroll back
+	* xc284-scrollbmkdir.diff: Upstream patch to fix scrool back
+	  directories
+ 
 2007-07-01 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated to version 2.8.4
 
diff --git a/chat-irc/xchat/PRE_BUILD b/chat-irc/xchat/PRE_BUILD
new file mode 100755
index 0000000..6d32c21
--- /dev/null
+++ b/chat-irc/xchat/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build  &&
+cd $SOURCE_DIRECTORY  &&
+patch -p0 < $SCRIPT_DIRECTORY/xc284-improvescrollback.diff  &&
+patch -p0 < $SCRIPT_DIRECTORY/xc284-scrollbmkdir.diff
+
diff --git a/chat-irc/xchat/xc284-improvescrollback.diff b/chat-irc/xchat/xc284-improvescrollback.diff
new file mode 100644
index 0000000..b83f251
--- /dev/null
+++ b/chat-irc/xchat/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.
+#
+--- src/common/text.c	29 Jul 2007 05:02:36 -0000	1.90
++++ src/common/text.c	26 Sep 2007 07:29:55 -0000
+@@ -285,6 +285,8 @@
+ 		}
+ 	}
+ 
++	sess->scrollwritten = lines;
++
+ 	if (lines)
+ 	{
+ 		text = ctime (&stamp);
+--- src/fe-gtk/setup.c	9 Sep 2007 04:57:07 -0000	1.100
++++ 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/chat-irc/xchat/xc284-scrollbmkdir.diff b/chat-irc/xchat/xc284-scrollbmkdir.diff
new file mode 100644
index 0000000..2ac3284
--- /dev/null
+++ b/chat-irc/xchat/xc284-scrollbmkdir.diff
@@ -0,0 +1,33 @@
+#
+# Fix creation of ~/.xchat2/scrollback/ paths.
+#
+--- src/common/text.c	15 Jun 2007 03:53:42 -0000	1.89
++++ src/common/text.c	8 Jul 2007 08:59:02 -0000
+@@ -49,20 +49,25 @@
+ 
+ 
+ static void mkdir_p (char *dir);
++static char *log_create_filename (char *channame);
+ 
+ 
+ static char *
+ scrollback_get_filename (session *sess, char *buf, int max)
+ {
+-	char *net;
++	char *net, *chan;
+ 
+ 	net = server_get_network (sess->server, FALSE);
+ 	if (!net)
+ 		return NULL;
+ 
+-	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, sess->channel);
++	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, "");
+ 	mkdir_p (buf);
+ 
++	chan = log_create_filename (sess->channel);
++	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, chan);
++	free (chan);
++
+ 	return buf;
+ }
+ 



More information about the SM-Commit mailing list