diff options
Diffstat (limited to 'chat')
-rw-r--r-- | chat/gaim/Makefile.common | 4 | ||||
-rw-r--r-- | chat/gaim/distinfo | 8 | ||||
-rw-r--r-- | chat/gaim/patches/patch-ab | 48 |
3 files changed, 38 insertions, 22 deletions
diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common index 3f6a8bfbd1c..f45e1ae2eaf 100644 --- a/chat/gaim/Makefile.common +++ b/chat/gaim/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.8 2002/11/30 12:41:06 salo Exp $ +# $NetBSD: Makefile.common,v 1.9 2003/01/09 16:15:08 mycroft Exp $ # -DISTNAME= gaim-0.59.6 +DISTNAME= gaim-0.59.8 CATEGORIES= chat x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/} \ ftp://ftp.marko.net/pub/gaim/ diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo index 1e02ec0ea7e..f987e5b074a 100644 --- a/chat/gaim/distinfo +++ b/chat/gaim/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.19 2002/11/14 21:33:49 mycroft Exp $ +$NetBSD: distinfo,v 1.20 2003/01/09 16:15:08 mycroft Exp $ -SHA1 (gaim-0.59.6.tar.gz) = 57d341aa0a26fdafa5788e4c6c74538d72c86493 -Size (gaim-0.59.6.tar.gz) = 2104114 bytes +SHA1 (gaim-0.59.8.tar.gz) = d1d81fd634bc206433982eb19cd76492a79a1834 +Size (gaim-0.59.8.tar.gz) = 2126403 bytes SHA1 (patch-aa) = d1eba622e65507f657d602e497601e38140c5963 -SHA1 (patch-ab) = b085e043c5cb5b66e0540fd21ea86908d777d37c +SHA1 (patch-ab) = 0a635d9c7b89b5ce87c3a0bb37fa05280c66c6c2 diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab index 2a5f705c4ce..370bb93119f 100644 --- a/chat/gaim/patches/patch-ab +++ b/chat/gaim/patches/patch-ab @@ -1,17 +1,33 @@ -$NetBSD: patch-ab,v 1.3 2002/08/28 07:43:57 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2003/01/09 16:15:09 mycroft Exp $ ---- src/perl.c.orig Mon Aug 26 11:00:58 2002 -+++ src/perl.c Wed Aug 28 13:37:46 2002 -@@ -185,7 +185,7 @@ +--- 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) { -- while ((readdir_r(dir,&dirent_buf,&ent),ent)) { -+ while ((ent = readdir(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); -@@ -293,7 +293,7 @@ +@@ -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? :) */ @@ -20,7 +36,7 @@ $NetBSD: patch-ab,v 1.3 2002/08/28 07:43:57 jlam Exp $ struct perlscript *scp; dXSARGS; items = 0; -@@ -404,7 +404,7 @@ +@@ -406,7 +403,7 @@ { char *title; char *message; @@ -29,7 +45,7 @@ $NetBSD: patch-ab,v 1.3 2002/08/28 07:43:57 jlam Exp $ dXSARGS; items = 0; -@@ -472,7 +472,7 @@ +@@ -474,7 +471,7 @@ XS (XS_GAIM_command) { @@ -38,7 +54,7 @@ $NetBSD: patch-ab,v 1.3 2002/08/28 07:43:57 jlam Exp $ char *command = NULL; dXSARGS; items = 0; -@@ -524,7 +524,7 @@ +@@ -526,7 +523,7 @@ XS (XS_GAIM_user_info) { struct gaim_connection *gc; @@ -47,7 +63,7 @@ $NetBSD: patch-ab,v 1.3 2002/08/28 07:43:57 jlam Exp $ struct buddy *buddy = NULL; dXSARGS; items = 0; -@@ -550,7 +550,7 @@ +@@ -552,7 +549,7 @@ { char *nick, *who, *what; struct conversation *c; @@ -56,7 +72,7 @@ $NetBSD: patch-ab,v 1.3 2002/08/28 07:43:57 jlam Exp $ int send, wflags; dXSARGS; items = 0; -@@ -582,7 +582,7 @@ +@@ -584,7 +581,7 @@ struct gaim_connection *gc; char *nick, *what; int isauto; @@ -65,7 +81,7 @@ $NetBSD: patch-ab,v 1.3 2002/08/28 07:43:57 jlam Exp $ dXSARGS; items = 0; -@@ -605,7 +605,7 @@ +@@ -607,7 +604,7 @@ char *nick, *what; int isauto; struct conversation *c; @@ -74,7 +90,7 @@ $NetBSD: patch-ab,v 1.3 2002/08/28 07:43:57 jlam Exp $ dXSARGS; items = 0; -@@ -635,7 +635,7 @@ +@@ -637,7 +634,7 @@ char *what; struct conversation *b = NULL; GSList *bcs; @@ -83,7 +99,7 @@ $NetBSD: patch-ab,v 1.3 2002/08/28 07:43:57 jlam Exp $ dXSARGS; items = 0; -@@ -801,7 +801,7 @@ +@@ -803,7 +800,7 @@ XS (XS_GAIM_add_event_handler) { @@ -92,7 +108,7 @@ $NetBSD: patch-ab,v 1.3 2002/08/28 07:43:57 jlam Exp $ struct _perl_event_handlers *handler; dXSARGS; items = 0; -@@ -828,7 +828,7 @@ +@@ -830,7 +827,7 @@ XS (XS_GAIM_add_timeout_handler) { |