pkg/29752: [patch] gaim update to 1.2.0

[mjl%luckie.org.nz@localhost]

>Number:         29752
>Category:       pkg
>Synopsis:       [patch] gaim update to 1.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 21 09:35:00 +0000 2005
>Originator:     Matthew Luckie
>Release:        NetBSD 1.6
>Organization:
University of Waikato
>Environment:
NetBSD polyprop 1.6.1_RC2 NetBSD 1.6.1_RC2 (polyprop) #4: Wed Nov 26 08:39:04 
NZDT 2003     root@polyprop:/usr/src/sys/arch/cobalt/compile/polyprop cobalt
>Description:
the gaim team has released gaim 1.2.0
>How-To-Repeat:
N/A
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/gaim/Makefile,v
retrieving revision 1.81
diff -u -r1.81 Makefile
--- Makefile    18 Mar 2005 18:56:04 -0000      1.81
+++ Makefile    21 Mar 2005 09:28:32 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.81 2005/03/18 18:56:04 jmmv Exp $
 
-DISTNAME=      gaim-1.1.4
-PKGREVISION=   1
+DISTNAME=      gaim-1.2.0
 CATEGORIES=    chat x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=  .tar.bz2
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/chat/gaim/distinfo,v
retrieving revision 1.61
diff -u -r1.61 distinfo
--- distinfo    18 Mar 2005 18:56:04 -0000      1.61
+++ distinfo    21 Mar 2005 09:28:32 -0000
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.61 2005/03/18 18:56:04 jmmv Exp $
 
-SHA1 (gaim-1.1.4.tar.bz2) = ef4061f2f7413b18c4ea59da10b9f0837df20054
-RMD160 (gaim-1.1.4.tar.bz2) = eb254b2d63108cd65c5237bea922900a4ba72fbf
-Size (gaim-1.1.4.tar.bz2) = 5195580 bytes
+SHA1 (gaim-1.2.0.tar.bz2) = 6aa42c56a1c7dae34a831006ecd4f02dd1fe13a6
+RMD160 (gaim-1.2.0.tar.bz2) = e860058814c97db362e087526ca197746f4fd365
+Size (gaim-1.2.0.tar.bz2) = 5200934 bytes
 SHA1 (patch-aa) = 555c394dbb4cd9ef4fea621d30ce72baae309067
+SHA1 (patch-ab) = b9758039c9b39006db6d3211099786e2614cbe5d
 SHA1 (patch-ad) = 21ffc478343793ce065c75a24ed0cf58b0677359


here's patch-ab:

$NetBSD$

--- src/protocols/yahoo/yahoochat.c.orig        Mon Mar 21 20:00:56 2005
+++ src/protocols/yahoo/yahoochat.c     Mon Mar 21 20:03:09 2005
@@ -342,9 +342,12 @@
 void yahoo_process_chat_join(GaimConnection *gc, struct yahoo_packet *pkt)
 {
        struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data;
+       GaimAccount *account;
        GaimConversation *c = NULL;
+       GaimConversationUiOps *ops;
        GSList *l;
        GList *members = NULL;
+       GList *roomies = NULL;
        char *room = NULL;
        char *topic = NULL;
        char *someid, *someotherid, *somebase64orhashosomething, 
*somenegativenumber;
@@ -443,10 +446,8 @@
                yahoo_chat_add_users(GAIM_CONV_CHAT(c), members);
        }
 
-       GList *roomies=NULL;
-       GaimConversationUiOps *ops;
        ops = gaim_conversation_get_ui_ops(c);
-       GaimAccount *account = gaim_connection_get_account(gc);
+       account = gaim_connection_get_account(gc);
        for (l = account->deny; l != NULL; l = l->next) {
                for (roomies = members; roomies; roomies = roomies->next) {
                        if (!gaim_utf8_strcasecmp((char *)l->data, 
roomies->data)) {