garnome r6732 - in trunk: . fifth-toe/gimp fifth-toe/pidgin fifth-toe/xchat fifth-toe/xchat/files

[kbrae svn gnome org]

Author: kbrae
Date: Fri Sep 12 13:45:46 2008
New Revision: 6732
URL: http://svn.gnome.org/viewvc/garnome?rev=6732&view=rev

Log:
	* fifth-toe/gimp: bump version to 2.4.7
	* fifth-toe/pidgin: bump version to 2.5.1
	* fifth-toe/xchat: bump version to 2.8.6, remove obsolete upstream
	patches and include the latest set



Added:
   trunk/fifth-toe/xchat/files/xc286-smallfixes.diff
Removed:
   trunk/fifth-toe/xchat/files/xc284-fix-scrollbfdleak.diff
   trunk/fifth-toe/xchat/files/xc284-improvescrollback.diff
   trunk/fifth-toe/xchat/files/xc284-scrollbmkdir.diff
Modified:
   trunk/ChangeLog
   trunk/fifth-toe/gimp/Makefile
   trunk/fifth-toe/gimp/checksums
   trunk/fifth-toe/pidgin/Makefile
   trunk/fifth-toe/pidgin/checksums
   trunk/fifth-toe/xchat/Makefile
   trunk/fifth-toe/xchat/checksums

Modified: trunk/fifth-toe/gimp/Makefile
==============================================================================
--- trunk/fifth-toe/gimp/Makefile	(original)
+++ trunk/fifth-toe/gimp/Makefile	Fri Sep 12 13:45:46 2008
@@ -1,5 +1,5 @@
 GARNAME = gimp
-GARVERSION = 2.4.6
+GARVERSION = 2.4.7
 CATEGORIES = fifth-toe
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 

Modified: trunk/fifth-toe/gimp/checksums
==============================================================================
--- trunk/fifth-toe/gimp/checksums	(original)
+++ trunk/fifth-toe/gimp/checksums	Fri Sep 12 13:45:46 2008
@@ -1 +1 @@
-a0bd1560f81f15c23ed4c0c6cb9c4b59  download/gimp-2.4.6.tar.bz2
+8d0e059597d70fbdeb77e6447bae29c4  download/gimp-2.4.7.tar.bz2

Modified: trunk/fifth-toe/pidgin/Makefile
==============================================================================
--- trunk/fifth-toe/pidgin/Makefile	(original)
+++ trunk/fifth-toe/pidgin/Makefile	Fri Sep 12 13:45:46 2008
@@ -1,5 +1,5 @@
 GARNAME = pidgin
-GARVERSION = 2.4.3
+GARVERSION = 2.5.1
 CATEGORIES = fifth-toe
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 

Modified: trunk/fifth-toe/pidgin/checksums
==============================================================================
--- trunk/fifth-toe/pidgin/checksums	(original)
+++ trunk/fifth-toe/pidgin/checksums	Fri Sep 12 13:45:46 2008
@@ -1 +1 @@
-9e4a5f4ebda16a51fe91ec610286810a  download/pidgin-2.4.3.tar.bz2
+f76c269c02fafee9b45cc2a50b43b1f3  download/pidgin-2.5.1.tar.bz2

Modified: trunk/fifth-toe/xchat/Makefile
==============================================================================
--- trunk/fifth-toe/xchat/Makefile	(original)
+++ trunk/fifth-toe/xchat/Makefile	Fri Sep 12 13:45:46 2008
@@ -1,8 +1,8 @@
 GARNAME = xchat
-GARVERSION = 2.8.4
+GARVERSION = 2.8.6
 CATEGORIES = fifth-toe
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-PATCHFILES = xc284-fix-scrollbfdleak.diff xc284-improvescrollback.diff xc284-scrollbmkdir.diff
+PATCHFILES = xc286-smallfixes.diff
 
 MASTER_SITES = http://xchat.org/files/source/2.8/
 

Modified: trunk/fifth-toe/xchat/checksums
==============================================================================
--- trunk/fifth-toe/xchat/checksums	(original)
+++ trunk/fifth-toe/xchat/checksums	Fri Sep 12 13:45:46 2008
@@ -1,4 +1,2 @@
-66d60febc62a01bafac9bb3a35fb37ae  download/xchat-2.8.4.tar.bz2
-2d52e27996cfb9351cf109b239344ace  download/xc284-fix-scrollbfdleak.diff
-a202ee20d7f04f0a515f32190acb65d8  download/xc284-improvescrollback.diff
-e6f0279d8c01cbe6a6bf698add6113fa  download/xc284-scrollbmkdir.diff
+1f2670865d43a23a9abc596dde999aca  download/xchat-2.8.6.tar.bz2
+eb68b6261bf6740cb5f223627eb8f384  download/xc286-smallfixes.diff

Added: trunk/fifth-toe/xchat/files/xc286-smallfixes.diff
==============================================================================
--- (empty file)
+++ trunk/fifth-toe/xchat/files/xc286-smallfixes.diff	Fri Sep 12 13:45:46 2008
@@ -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;