Fix xchat build with gtk 2.13.x.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11248 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 95 insertions, 0 deletions

diff --git a/irc/xchat/files/patch-configure b/irc/xchat/files/patch-configure
new file mode 100644
index 000000000..b40bb4f83
--- /dev/null
+++ b/irc/xchat/files/patch-configure
@@ -0,0 +1,17 @@
+--- configure.orig	Wed Jul  4 19:41:43 2007
++++ configure	Wed Jul  4 19:42:45 2007
+@@ -26802,12 +26802,12 @@
+ #include <libintl.h>
+ $gt_revision_test_code
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *libintl_nl_domain_bindings;
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
++return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
+   ;
+   return 0;
+ }
diff --git a/irc/xchat/files/patch-src_fe-gtk_xtext.h b/irc/xchat/files/patch-src_fe-gtk_xtext.h
new file mode 100644
index 000000000..f4a74269a
--- /dev/null
+++ b/irc/xchat/files/patch-src_fe-gtk_xtext.h
@@ -0,0 +1,10 @@
+--- src/fe-gtk/xtext.h.orig	2008-08-06 09:47:05.000000000 +0200
++++ src/fe-gtk/xtext.h	2008-08-06 09:51:01.000000000 +0200
+@@ -270,6 +270,6 @@ void gtk_xtext_set_wordwrap (GtkXText *x
+ xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext);
+ void gtk_xtext_buffer_free (xtext_buffer *buf);
+ void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render);
+-GtkType gtk_xtext_get_type (void);
++GType gtk_xtext_get_type (void);
+ 
+ #endif
diff --git a/irc/xchat/files/patch-xc286-smallfixes b/irc/xchat/files/patch-xc286-smallfixes
new file mode 100644
index 000000000..581462477
--- /dev/null
+++ b/irc/xchat/files/patch-xc286-smallfixes
@@ -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
++++ 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
++++ 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
++++ 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
++++ 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;