diff options
| author |   Don Seiler <rizzo@gentoo.org> | 2005-03-28 17:24:10 +0000 |
|---|---|---|
| committer | Don Seiler <rizzo@gentoo.org> | 2005-03-28 17:24:10 +0000 |
| commit | 9a21b18cf4688e5dac63d1d9f9a0955021a3a8e9 (patch) | |
| tree | 1f285f80befad7743b767bbd8b82885731dbe38e /net-im | |
| parent | Stable on sparc (diff) | |
| download | gentoo-2-9a21b18cf4688e5dac63d1d9f9a0955021a3a8e9.tar.gz gentoo-2-9a21b18cf4688e5dac63d1d9f9a0955021a3a8e9.tar.bz2 gentoo-2-9a21b18cf4688e5dac63d1d9f9a0955021a3a8e9.zip | |
Patch for gcc-2.95. Thanks to Matt Taylor, closes bug #86425
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/gaim/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/gaim/files/gaim-1.2.0_yahoochat.diff | 33 | ||||
| -rw-r--r-- | net-im/gaim/gaim-1.2.0-r2.ebuild | 3 |
3 files changed, 40 insertions, 2 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog index dc2c3ae2ff4c..d0babd53ae1f 100644 --- a/net-im/gaim/ChangeLog +++ b/net-im/gaim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/gaim # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.317 2005/03/23 16:10:41 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.318 2005/03/28 17:24:10 rizzo Exp $ + + 28 Mar 2005; Don Seiler <rizzo@gentoo.org> + +files/gaim-1.2.0_yahoochat.diff, gaim-1.2.0-r2.ebuild: + Patch for gcc-2.95. Thanks to Matt Taylor, closes bug #86425 *gaim-1.2.0-r2 (23 Mar 2005) diff --git a/net-im/gaim/files/gaim-1.2.0_yahoochat.diff b/net-im/gaim/files/gaim-1.2.0_yahoochat.diff new file mode 100644 index 000000000000..2977cd6b78ab --- /dev/null +++ b/net-im/gaim/files/gaim-1.2.0_yahoochat.diff @@ -0,0 +1,33 @@ +=================================================================== +RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoochat.c,v +retrieving revision 1.25.2.4 +retrieving revision 1.25.2.5 +diff -u -r1.25.2.4 -r1.25.2.5 +--- src/protocols/yahoo/yahoochat.c 2005/03/16 03:14:01 1.25.2.4 ++++ src/protocols/yahoo/yahoochat.c 2005/03/19 14:44:57 1.25.2.5 +@@ -341,10 +341,13 @@ + + void yahoo_process_chat_join(GaimConnection *gc, struct yahoo_packet *pkt) + { ++ GaimAccount *account = gaim_connection_get_account(gc); + struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data; + GaimConversation *c = NULL; + GSList *l; + GList *members = NULL; ++ GList *roomies = NULL; ++ GaimConversationUiOps *ops; + 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); ++ + 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)) { diff --git a/net-im/gaim/gaim-1.2.0-r2.ebuild b/net-im/gaim/gaim-1.2.0-r2.ebuild index 477a4df2f3dd..6002d86cff5e 100644 --- a/net-im/gaim/gaim-1.2.0-r2.ebuild +++ b/net-im/gaim/gaim-1.2.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.2.0-r2.ebuild,v 1.1 2005/03/23 16:10:41 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.2.0-r2.ebuild,v 1.2 2005/03/28 17:24:10 rizzo Exp $ inherit flag-o-matic eutils gcc debug @@ -90,6 +90,7 @@ src_unpack() { cd ${S} use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch epatch ${FILESDIR}/gaim-1.2.0-icq-auth.diff + epatch ${FILESDIR}/gaim-1.2.0_yahoochat.diff } src_compile() { |