diff options
author | jmmv <jmmv> | 2004-04-24 09:29:53 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2004-04-24 09:29:53 +0000 |
commit | 603ef8cfa8cef73eb53cbb94be39e7dfae319ec3 (patch) | |
tree | ab7c54ac5c55599108606819989c7d96239d6339 /chat/gaim | |
parent | 03bd1f68e46193425004a38ebe3497cdbf417c47 (diff) | |
download | pkgsrc-603ef8cfa8cef73eb53cbb94be39e7dfae319ec3.tar.gz |
Update to 0.77, based on patch from Matthew Luckie (maintainer):
New Features:
* The System Log returns (Ka-Hing Cheung)
* Added a conversation-drag-ended signal (Etan Reisner)
* Reorganized and cleaned up the MSN protocol plugin (Felipe Contreras)
* Added the -c option to specify location of the .gaim directory, removed
the outdated -f option that no longer had any effect (Daniel Atallah)
* Novell GroupWise protocol support added (Novell)
* WYSIWYG improvements (Tim Ringenbach)
* WYSIWYG editing for user info (Jon Oberheide)
* Rich-text copy and paste
* Plugins can now add menu items to the buddy context menu
(Christopher O'Brien)
* Plugins can now add preferences (Gary Kramlich)
* The TOC protocol is no longer built by default. The plugin is not
being properly tested and is no longer officially supported.
* Bumped up the plugin API version number, and added version numbers
for loader plugins and protocol plugins. Authors will want to
update their plugins, and possibly use GAIM_PLUGIN_API_VERSION,
GAIM_PRPL_API_VERSION, and GAIM_LOADER_API_VERSION constants.
* Zephyr error reporting works (Arun A. Tharuvai)
* Zephyr deals with non-utf8 characters (Arun A. Tharuvai)
Bug Fixes:
* Formatting in the Log viewer is fixed (Kevin Stange)
* Save Conversation works again (Kevin Stange)
* The Clear button in privacy works (Robert Mibus)
* MSN error reporting works again (Stu Tomlinson)
* MSN e-mail notifications should no longer cause Gaim to crash
(Felipe Contreras)
* Fixed an infinite loop bug that would sometimes cause MSN to lock
up (Nickolai Zeldovich)
* All away messages should now show up in tooltips
* Removing zephyr buddies no longer crashes (Arun A. Tharuvai)
Diffstat (limited to 'chat/gaim')
-rw-r--r-- | chat/gaim/Makefile | 5 | ||||
-rw-r--r-- | chat/gaim/PLIST | 11 | ||||
-rw-r--r-- | chat/gaim/distinfo | 11 | ||||
-rw-r--r-- | chat/gaim/patches/patch-aa | 18 | ||||
-rw-r--r-- | chat/gaim/patches/patch-ab | 20 | ||||
-rw-r--r-- | chat/gaim/patches/patch-ac | 18 | ||||
-rw-r--r-- | chat/gaim/patches/patch-ad | 50 | ||||
-rw-r--r-- | chat/gaim/patches/patch-ae | 38 |
8 files changed, 162 insertions, 9 deletions
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index 9ff8348229c..2032de7d6b4 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.58 2004/04/14 16:15:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.59 2004/04/24 09:29:53 jmmv Exp $ # -DISTNAME= gaim-0.76 +DISTNAME= gaim-0.77 CATEGORIES= chat x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/} EXTRACT_SUFX= .tar.bz2 @@ -26,6 +26,7 @@ CONFIGURE_ARGS+= --disable-nas CONFIGURE_ARGS+= --disable-perl CONFIGURE_ARGS+= --disable-nss CONFIGURE_ARGS+= --disable-tcl +CONFIGURE_ARGS+= --disable-gevolution .include "../../mk/bsd.prefs.mk" diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST index 5d86bc731ee..eee2eddb5ef 100644 --- a/chat/gaim/PLIST +++ b/chat/gaim/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2004/04/02 16:08:21 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.26 2004/04/24 09:29:53 jmmv Exp $ bin/gaim bin/gaim-remote include/gaim-remote/remote-socket.h @@ -39,12 +39,12 @@ lib/gaim/libmsn.so lib/gaim/libnapster.a lib/gaim/libnapster.la lib/gaim/libnapster.so +lib/gaim/libnovell.a +lib/gaim/libnovell.la +lib/gaim/libnovell.so lib/gaim/liboscar.a lib/gaim/liboscar.la lib/gaim/liboscar.so -lib/gaim/libtoc.a -lib/gaim/libtoc.la -lib/gaim/libtoc.so lib/gaim/libyahoo.a lib/gaim/libyahoo.la lib/gaim/libyahoo.so @@ -102,6 +102,7 @@ ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo +${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo @@ -333,8 +334,10 @@ share/pixmaps/gaim/status/default/msn.png share/pixmaps/gaim/status/default/na.png share/pixmaps/gaim/status/default/napster.png share/pixmaps/gaim/status/default/notauthorized.png +share/pixmaps/gaim/status/default/novell.png share/pixmaps/gaim/status/default/occupied.png share/pixmaps/gaim/status/default/offline.png +share/pixmaps/gaim/status/default/rendezvous.png share/pixmaps/gaim/status/default/secure.png share/pixmaps/gaim/status/default/trepia.png share/pixmaps/gaim/status/default/wireless.png diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo index 1a0c078c9c1..aee61f67f28 100644 --- a/chat/gaim/distinfo +++ b/chat/gaim/distinfo @@ -1,4 +1,9 @@ -$NetBSD: distinfo,v 1.39 2004/04/02 16:08:21 jmmv Exp $ +$NetBSD: distinfo,v 1.40 2004/04/24 09:29:53 jmmv Exp $ -SHA1 (gaim-0.76.tar.bz2) = f683b30f43d3a3e1453f96a5fb9dfd7ed6dbd4b2 -Size (gaim-0.76.tar.bz2) = 3543882 bytes +SHA1 (gaim-0.77.tar.bz2) = 56101f1e5da73ad09992f2584fe2cdcff3c47e31 +Size (gaim-0.77.tar.bz2) = 3709914 bytes +SHA1 (patch-aa) = 4ddae874deff49b2c9fe38643d377dc34eb2b070 +SHA1 (patch-ab) = 669fe9d5e4e35c0a06adf50491e2a54338c060c4 +SHA1 (patch-ac) = aa5e1ae725bba363f7b924d0c61275b0a6dfa7e2 +SHA1 (patch-ad) = 3b6fc88653a5e3f44b8a0a6059ec1a102c874e70 +SHA1 (patch-ae) = e95f5536a4a6360f7ce3c5df429bb65c5dc25a05 diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa new file mode 100644 index 00000000000..4542578891c --- /dev/null +++ b/chat/gaim/patches/patch-aa @@ -0,0 +1,18 @@ +$NetBSD: patch-aa,v 1.19 2004/04/24 09:29:54 jmmv Exp $ + +--- src/gtkimhtml.c.orig Fri Apr 23 04:24:05 2004 ++++ src/gtkimhtml.c Sat Apr 24 05:37:14 2004 +@@ -542,10 +542,11 @@ + GtkTextIter start, end; + GtkTextMark *sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer); + GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer); +- ++ gboolean primary; ++ + gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, sel); + gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &end, ins); +- gboolean primary = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_PRIMARY) == clipboard; ++ primary = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_PRIMARY) == clipboard; + + if (info == TARGET_HTML) { + int len; diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab new file mode 100644 index 00000000000..3f4484f9177 --- /dev/null +++ b/chat/gaim/patches/patch-ab @@ -0,0 +1,20 @@ +$NetBSD: patch-ab,v 1.8 2004/04/24 09:29:54 jmmv Exp $ + +--- src/gtkrequest.c.orig Sun Apr 18 18:22:41 2004 ++++ src/gtkrequest.c Sat Apr 24 06:19:00 2004 +@@ -260,6 +260,7 @@ + GtkWidget *label; + GtkWidget *entry; + GtkWidget *img; ++ GtkWidget *toolbar; + char *label_text; + + data = g_new0(GaimGtkRequestData, 1); +@@ -338,7 +339,6 @@ + gtk_widget_set_size_request(sw, 320, 130); + + /* Toolbar */ +- GtkWidget *toolbar; + toolbar = gtk_imhtmltoolbar_new(); + gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); + diff --git a/chat/gaim/patches/patch-ac b/chat/gaim/patches/patch-ac new file mode 100644 index 00000000000..5e8d68cd42a --- /dev/null +++ b/chat/gaim/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.7 2004/04/24 09:29:54 jmmv Exp $ + +--- src/protocols/novell/nmcontact.c.orig Sun Apr 18 06:29:20 2004 ++++ src/protocols/novell/nmcontact.c Sat Apr 24 05:03:53 2004 +@@ -701,10 +701,12 @@ + void + nm_folder_remove_contact(NMFolder * folder, NMContact * contact) + { ++ GSList *node; ++ + if (folder == NULL || contact == NULL) + return; + +- GSList *node = folder->contacts; ++ node = folder->contacts; + + while (node) { + if (contact->id == ((NMContact *) (node->data))->id) { diff --git a/chat/gaim/patches/patch-ad b/chat/gaim/patches/patch-ad new file mode 100644 index 00000000000..5fba86a8232 --- /dev/null +++ b/chat/gaim/patches/patch-ad @@ -0,0 +1,50 @@ +$NetBSD: patch-ad,v 1.3 2004/04/24 09:29:54 jmmv Exp $ + +--- src/protocols/novell/nmuser.c.orig Thu Apr 22 09:01:16 2004 ++++ src/protocols/novell/nmuser.c Sat Apr 24 05:11:42 2004 +@@ -50,10 +50,12 @@ + nm_initialize_user(const char *name, const char *server_addr, + int port, gpointer data, nm_event_cb event_callback) + { ++ NMUser *user; ++ + if (name == NULL || server_addr == NULL || event_callback == NULL) + return NULL; + +- NMUser *user = g_new0(NMUser, 1); ++ user = g_new0(NMUser, 1); + + user->conn = g_new0(NMConn, 1); + +@@ -1647,11 +1649,12 @@ + nm_typed_to_dotted(const char *typed) + { + unsigned i = 0, j = 0; ++ char *dotted; + + if (typed == NULL) + return NULL; + +- char *dotted = g_new0(char, strlen(typed)); ++ dotted = g_new0(char, strlen(typed)); + + do { + +@@ -1692,6 +1695,7 @@ + gint objid1; + NMContact *contact; + NMFolder *folder; ++ gpointer item; + + if (user == NULL || fields == NULL) + return; +@@ -1713,8 +1717,7 @@ + nm_locate_field(NM_A_SZ_OBJECT_ID, (NMField *) cursor->value); + if (locate != NULL && locate->value != 0) { + objid1 = atoi((char *) locate->value); +- gpointer item = +- nm_folder_find_item_by_object_id(user->root_folder, objid1); ++ item = nm_folder_find_item_by_object_id(user->root_folder, objid1); + if (item != NULL) { + if (cursor->method == NMFIELD_METHOD_ADD) { + if (g_ascii_strcasecmp(cursor->tag, NM_A_FA_CONTACT) == 0) { diff --git a/chat/gaim/patches/patch-ae b/chat/gaim/patches/patch-ae new file mode 100644 index 00000000000..a1a43a4cae2 --- /dev/null +++ b/chat/gaim/patches/patch-ae @@ -0,0 +1,38 @@ +$NetBSD: patch-ae,v 1.1 2004/04/24 09:29:54 jmmv Exp $ + +--- src/protocols/novell/novell.c.orig Thu Apr 22 13:53:15 2004 ++++ src/protocols/novell/novell.c Sat Apr 24 05:19:17 2004 +@@ -897,6 +897,7 @@ + const char *text = NULL; + const char *name = NULL; + int status = 0; ++ GaimGroup *group; + + /* Get each contact for this folder */ + cnt = nm_folder_get_contact_count(folder); +@@ -912,7 +913,7 @@ + nm_contact_get_display_name(contact)); + + /* Does the Gaim group exist already? */ +- GaimGroup *group = gaim_find_group(nm_folder_get_name(folder)); ++ group = gaim_find_group(nm_folder_get_name(folder)); + + if (group == NULL) { + group = gaim_group_new(nm_folder_get_name(folder)); +@@ -2062,6 +2063,7 @@ + { + NMERR_T rc = NM_OK; + NMUser *user; ++ NMFolder *folder; + + if (gc == NULL || old_name == NULL || new_name == NULL || tobemoved == NULL) { + return; +@@ -2078,7 +2080,7 @@ + return; + } + +- NMFolder *folder = nm_find_folder(user, old_name); ++ folder = nm_find_folder(user, old_name); + + if (folder) { + rc = nm_send_rename_folder(user, folder, new_name, |