garnome r6735 - in trunk: . fifth-toe/xchat fifth-toe/xchat/files

[kbrae svn gnome org]

Author: kbrae
Date: Fri Sep 12 18:01:02 2008
New Revision: 6735
URL: http://svn.gnome.org/viewvc/garnome?rev=6735&view=rev

Log:
        * fifth-toe/xchat: Fix xchat build, use GType instead of
        deprecated GtkType.



Added:
   trunk/fifth-toe/xchat/files/gtktype.diff
Modified:
   trunk/ChangeLog
   trunk/fifth-toe/xchat/Makefile
   trunk/fifth-toe/xchat/checksums

Modified: trunk/fifth-toe/xchat/Makefile
==============================================================================
--- trunk/fifth-toe/xchat/Makefile	(original)
+++ trunk/fifth-toe/xchat/Makefile	Fri Sep 12 18:01:02 2008
@@ -2,7 +2,7 @@
 GARVERSION = 2.8.6
 CATEGORIES = fifth-toe
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-PATCHFILES = xc286-smallfixes.diff
+PATCHFILES = xc286-smallfixes.diff gtktype.diff
 
 MASTER_SITES = http://xchat.org/files/source/2.8/
 
@@ -19,6 +19,7 @@
 BUILD_SCRIPTS = $(WORKSRC)/Makefile
 INSTALL_SCRIPTS = $(WORKSRC)/Makefile
 
-CONFIGURE_ARGS = $(DIRPATHS) --enable-socks --enable-ipv6 --disable-textfe --disable-tcl
+CONFIGURE_ARGS = $(DIRPATHS) --enable-socks --enable-ipv6 --disable-textfe \
+  --disable-tcl  # --disable-perl
 
 include ../category.mk

Modified: trunk/fifth-toe/xchat/checksums
==============================================================================
--- trunk/fifth-toe/xchat/checksums	(original)
+++ trunk/fifth-toe/xchat/checksums	Fri Sep 12 18:01:02 2008
@@ -1,2 +1,3 @@
 1f2670865d43a23a9abc596dde999aca  download/xchat-2.8.6.tar.bz2
 eb68b6261bf6740cb5f223627eb8f384  download/xc286-smallfixes.diff
+09b0f826fb46d5aae9663f2be1028d4c  download/gtktype.diff

Added: trunk/fifth-toe/xchat/files/gtktype.diff
==============================================================================
--- (empty file)
+++ trunk/fifth-toe/xchat/files/gtktype.diff	Fri Sep 12 18:01:02 2008
@@ -0,0 +1,25 @@
+--- xchat-2.8.6/src/fe-gtk/xtext.h~	2008-02-24 05:48:02.000000000 +0100
++++ xchat-2.8.6/src/fe-gtk/xtext.h	2008-09-12 17:31:20.000000000 +0200
+@@ -270,6 +270,6 @@
+ 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
+--- xchat-2.8.6/src/fe-gtk/xtext.c~	2008-02-24 06:04:30.000000000 +0100
++++ xchat-2.8.6/src/fe-gtk/xtext.c	2008-09-12 17:31:49.000000000 +0200
+@@ -2494,10 +2494,10 @@
+ 	xtext_class->word_click = NULL;
+ }
+ 
+-GtkType
++GType
+ gtk_xtext_get_type (void)
+ {
+-	static GtkType xtext_type = 0;
++	static GType xtext_type = 0;
+ 
+ 	if (!xtext_type)
+ 	{