ports/58539: Update: xchat2 fix run on sparc64 and amd64.

[Koop Mast]

>Number:         58539
>Category:       ports
>Synopsis:       Update: xchat2 fix run on sparc64 and amd64.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 25 14:00:34 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Koop Mast
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD prisma.rainbow-runner.nl 5.1-CURRENT FreeBSD 5.1-CURRENT #5: Sat Oct 11 05:31:30 CEST 2003 root at prisma.rainbow-runner.nl:/usr/obj/usr/src/sys/RainBow i386


	
>Description:
	Fix run on 64-bit archs.
	Taken from xchat cvs.
	http://cvs.sourceforge.net/viewcvs.py/xchat/xchat2/src/common/server.c
	Tested om sparc64.
	
>How-To-Repeat:
	
>Fix:

	

--- patch-src_common_server.c begins here ---
--- src/common/server.c.orig	Sun Aug 10 17:40:15 2003
+++ src/common/server.c	Sat Oct 25 22:29:12 2003
@@ -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;
 
--- patch-src_common_server.c ends here ---

--- patch-src_common_text.c begins here ---
--- src/common/text.c.orig	Sun Sep 21 12:36:15 2003
+++ src/common/text.c	Sat Oct 25 22:29:56 2003
@@ -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)
--- patch-src_common_text.c ends here ---

--- patch-src_fe-gtk_xtext.c begins here ---
--- src/fe-gtk/xtext.c.orig	Thu Sep 18 07:26:52 2003
+++ src/fe-gtk/xtext.c	Sat Oct 25 22:31:45 2003
@@ -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);
 	}
 
--- patch-src_fe-gtk_xtext.c ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: