Update gaim to 0.61, based on the package provided by mjl@luckie.org.nz in

pkgsrc-wip.  This new version includes lots of changes since 0.59.x, but
maybe the most important is the switch to GTK v2.

2 files changed, 22 insertions, 135 deletions

diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
index 80a1ffbfe5e..e6f98204803 100644
--- a/chat/gaim/patches/patch-aa
+++ b/chat/gaim/patches/patch-aa
@@ -1,18 +1,24 @@
-$NetBSD: patch-aa,v 1.11 2002/10/28 19:39:28 jmc Exp $
+$NetBSD: patch-aa,v 1.12 2003/04/11 15:41:40 jmmv Exp $
 
---- src/Makefile.in.orig	Sat Sep 14 22:28:40 2002
-+++ src/Makefile.in	Mon Oct 28 19:24:10 2002
-@@ -150,11 +150,11 @@
- @GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c 			aim.c 			applet.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			core.c 			dialogs.c 			gaimrc.c 			gtkimhtml.c 			gtkspell.c 			gtkticker.c 			html.c 			idle.c 			list.c 			md5.c 			module.c 			multi.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			prpl.c 			server.c 			sound.c 			ticker.c 			util.c
- @GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
- @GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = -export-dynamic
--@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@
-+@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@ -liconv
- @GNOMEAPPLET_FALSE@gaim_SOURCES = about.c 		aim.c 		applet.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		core.c 		dialogs.c 		gaimrc.c 		gtkimhtml.c 		gtkspell.c 		gtkticker.c 		html.c 		idle.c 		list.c 		md5.c 		module.c 		multi.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		prpl.c 		server.c 		sound.c 		ticker.c 		util.c
- @GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
- @GNOMEAPPLET_FALSE@gaim_LDFLAGS = -export-dynamic
--@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@
-+@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@ -liconv
- CFLAGS = @CFLAGS@ $(PERL_CFLAGS) -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
+--- src/buddy.c.orig	Thu Apr 10 18:11:40 2003
++++ src/buddy.c	Thu Apr 10 18:11:54 2003
+@@ -1112,6 +1112,7 @@
+ 	GtkWidget *sw;
+ 	GtkWidget *button;
+ 	GtkSizeGroup *sg;
++	GtkAccelGroup *accel_group;
+ 	GtkTreeSelection *selection;
+ 	GtkTargetEntry gte[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
+ 				{"application/x-im-contact", 0, DRAG_BUDDY}};
+@@ -1136,7 +1137,10 @@
+ 	gtk_widget_add_events(gtkblist->window, GDK_VISIBILITY_NOTIFY_MASK);
  
- LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
+ 	/******************************* Menu bar *************************************/
+-	ift = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<GaimMain>", NULL);
++	accel_group = gtk_accel_group_new();
++	gtk_window_add_accel_group(GTK_WINDOW (gtkblist->window), accel_group);
++	g_object_unref(accel_group);
++	ift = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<GaimMain>", accel_group);
+ 	gtk_item_factory_set_translate_func (ift,
+ 					     item_factory_translate_func,
+ 					     NULL, NULL);
diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab
deleted file mode 100644
index 370bb93119f..00000000000
--- a/chat/gaim/patches/patch-ab
+++ /dev/null
@@ -1,119 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2003/01/09 16:15:09 mycroft Exp $
-
---- src/perl.c.orig	Sat Dec 21 20:08:19 2002
-+++ src/perl.c	Thu Jan  9 16:03:03 2003
-@@ -178,15 +178,13 @@
- {
- 	DIR *dir;
- 	struct dirent *ent;
--	struct dirent *dirent_buf;
- 	char *buf;
- 	char *path;
- 
- 	path = gaim_user_dir();
- 	dir = opendir(path);
- 	if (dir) {
--		dirent_buf = g_malloc(sizeof(struct dirent) + NAME_MAX);
--		while ((readdir_r(dir,dirent_buf,&ent),ent)) {
-+ 		while ((ent = readdir(dir))) {
- 			if (strcmp(ent->d_name, ".") && strcmp(ent->d_name, "..")) {
- 				if (is_pl_file(ent->d_name)) {
- 					buf = g_malloc(strlen(path) + strlen(ent->d_name) + 2);
-@@ -197,7 +195,6 @@
- 			}
- 		}
- 		closedir(dir);
--		g_free(dirent_buf);
- 	}
- 	g_free(path);
- }
-@@ -295,7 +292,7 @@
- XS (XS_GAIM_register)
- {
- 	char *name, *ver, *callback, *unused; /* exactly like X-Chat, eh? :) */
--	unsigned int junk;
-+	STRLEN junk;
- 	struct perlscript *scp;
- 	dXSARGS;
- 	items = 0;
-@@ -406,7 +403,7 @@
- {
- 	char *title;
- 	char *message;
--	unsigned int junk;
-+	STRLEN junk;
- 	dXSARGS;
- 	items = 0;
- 
-@@ -474,7 +471,7 @@
- 
- XS (XS_GAIM_command)
- {
--	unsigned int junk;
-+	STRLEN junk;
- 	char *command = NULL;
- 	dXSARGS;
- 	items = 0;
-@@ -526,7 +523,7 @@
- XS (XS_GAIM_user_info)
- {
- 	struct gaim_connection *gc;
--	unsigned int junk;
-+	STRLEN junk;
- 	struct buddy *buddy = NULL;
- 	dXSARGS;
- 	items = 0;
-@@ -552,7 +549,7 @@
- {
- 	char *nick, *who, *what;
- 	struct conversation *c;
--	int junk;
-+	STRLEN junk;
- 	int send, wflags;
- 	dXSARGS;
- 	items = 0;
-@@ -584,7 +581,7 @@
- 	struct gaim_connection *gc;
- 	char *nick, *what;
- 	int isauto;
--	int junk;
-+	STRLEN junk;
- 	dXSARGS;
- 	items = 0;
- 
-@@ -607,7 +604,7 @@
- 	char *nick, *what;
- 	int isauto;
- 	struct conversation *c;
--	unsigned int junk;
-+	STRLEN junk;
- 	dXSARGS;
- 	items = 0;
- 
-@@ -637,7 +634,7 @@
- 	char *what;
- 	struct conversation *b = NULL;
- 	GSList *bcs;
--	unsigned int junk;
-+	STRLEN junk;
- 	dXSARGS;
- 	items = 0;
- 
-@@ -803,7 +800,7 @@
- 
- XS (XS_GAIM_add_event_handler)
- {
--	unsigned int junk;
-+	STRLEN junk;
- 	struct _perl_event_handlers *handler;
- 	dXSARGS;
- 	items = 0;
-@@ -830,7 +827,7 @@
- 
- XS (XS_GAIM_add_timeout_handler)
- {
--	unsigned int junk;
-+	STRLEN junk;
- 	long timeout;
- 	struct _perl_timeout_handlers *handler;
- 	dXSARGS;