"Andreas V. Meier" <avmeier@web.de>:

add patches for xchat-2.0.5
remove patches of xchat-2.0.4


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1783 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -5,6 +5,7 @@
                    updated module-init-tools
  - bumped version
  - Andreas V. Meier: updated rene/k3b and added normalize
+                     updated xchat patches
  - Mathieu Doidy: mathieu's repository update: bitlbee (0.82), bogofilter
                   (0.15.7), liferea (0.4.4), mldonkey (2.5-4), mpc (0.9.2),
                   mpd (0.9.3) and xcdroast (0.98alpha15)

package/daniel/xchat/xc204-fixperlui.diff

@@ -1,33 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/daniel/xchat/xc204-fixperlui.diff
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- xchat-2.0.4/plugins/perl/perl.c	2003-05-24 19:52:24.000000000 +1000
-+++ xchat-2.0.4p1/plugins/perl/perl.c	2003-08-03 03:33:28.000000000 +1000
-@@ -619,7 +619,7 @@
- 		{
- 			nick = xchat_list_str (ph, list, "nick");
- 
--			if (xchat_nickcmp (ph, (char *)nick, (char *)find_nick))
-+			if (xchat_nickcmp (ph, (char *)nick, (char *)find_nick) == 0)
- 			{
- 				XST_mPV (i, nick);
- 				i++;

package/daniel/xchat/xc205-fix-emptyword.diff

@@ -0,0 +1,16 @@
+# fix skiping of "" in word[] array.
+# Side effect: fixes DCC RESUME with mIRC >= 6.1
+--- xchat-2.0.5/src/common/outbound.c	2003-09-05 21:12:52.000000000 +1000
++++ xchat-2.0.6/src/common/outbound.c	2003-10-16 14:00:52.000000000 +1000
+@@ -185,8 +185,10 @@
+ 			if (!handle_quotes)
+ 				goto def;
+ 			if (quote)
++			{
+ 				quote = FALSE;
+-			else
++				space = FALSE;
++			} else
+ 				quote = TRUE;
+ 			cmd++;
+ 			break;

package/daniel/xchat/xc205-fix64bit.diff

@@ -0,0 +1,47 @@
+# fixes 64bit issues (where a pointer to int was given, instead of gsize).
+--- xchat-2.0.5/src/common/server.c	2003-08-11 01:40:15.000000000 +1000
++++ xchat-2.0.6/src/common/server.c	2003-10-07 14:54:26.000000000 +1000
+@@ -289,8 +289,8 @@
+ 		{
+ 			char *conv_line; /* holds a copy of the original string */
+ 			int conv_len; /* tells g_convert how much of line to convert */
+-			int utf_len;
+-			int read_len;
++			gsize utf_len;
++			gsize read_len;
+ 			GError *err;
+ 			gboolean retry;
+ 
+--- xchat-2.0.5/src/common/text.c	2003-09-21 20:36:15.000000000 +1000
++++ xchat-2.0.6/src/common/text.c	2003-10-07 15:01:06.000000000 +1000
+@@ -446,7 +446,7 @@
+ get_stamp_str (char *fmt, time_t tim, char **ret)
+ {
+ 	char dest[128];
+-	int len;
++	gsize len;
+ 
+ 	len = strftime (dest, sizeof (dest), fmt, localtime (&tim));
+ 	if (len)
+--- xchat-2.0.5/src/fe-gtk/xtext.c	2003-09-18 15:26:52.000000000 +1000
++++ xchat-2.0.6/src/fe-gtk/xtext.c	2003-10-07 14:57:14.000000000 +1000
+@@ -2126,6 +2126,7 @@
+ 	char *stripped;
+ 	guchar *new_text;
+ 	int len;
++	gsize glen;
+ 
+ 	stripped = gtk_xtext_selection_get_text (xtext, &len);
+ 	if (!stripped)
+@@ -2158,9 +2159,9 @@
+ 		}
+ 		break;
+ 	default:
+-		new_text = g_locale_from_utf8 (stripped, len, NULL, &len, NULL);
++		new_text = g_locale_from_utf8 (stripped, len, NULL, &glen, NULL);
+ 		gtk_selection_data_set (selection_data_ptr, GDK_SELECTION_TYPE_STRING,
+-										8, new_text, len);
++										8, new_text, glen);
+ 		g_free (new_text);
+ 	}
+