summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorDon Seiler <rizzo@gentoo.org>2005-03-28 17:24:10 +0000
committerDon Seiler <rizzo@gentoo.org>2005-03-28 17:24:10 +0000
commit877fcc4bad0d4ad6f461d5c6848fffc127276acb (patch)
treedb759bd9824ce21ca8c3627556549ead0c17df89 /net-im
parentStable on sparc (diff)
downloadhistorical-877fcc4bad0d4ad6f461d5c6848fffc127276acb.tar.gz
historical-877fcc4bad0d4ad6f461d5c6848fffc127276acb.tar.bz2
historical-877fcc4bad0d4ad6f461d5c6848fffc127276acb.zip
Patch for gcc-2.95. Thanks to Matt Taylor, closes bug #86425
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gaim/ChangeLog6
-rw-r--r--net-im/gaim/Manifest5
-rw-r--r--net-im/gaim/files/gaim-1.2.0_yahoochat.diff33
-rw-r--r--net-im/gaim/gaim-1.2.0-r2.ebuild3
4 files changed, 43 insertions, 4 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/Manifest b/net-im/gaim/Manifest
index 926ed28e7338..1d1921d36657 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,8 +1,8 @@
-MD5 0d70358d9d54e8a8e087b65dcd0303f6 ChangeLog 47460
+MD5 6d7baae54e72fccb5b3fa9e3d1c06018 ChangeLog 47628
MD5 89b7f8c67092e79109bfa8b7f5a392a5 gaim-1.2.0-r1.ebuild 4267
MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
MD5 da1c536c0eff8dadc489462b1977ce80 gaim-1.2.0.ebuild 4103
-MD5 ce49efbde6606585388653a1240b3748 gaim-1.2.0-r2.ebuild 4182
+MD5 ebb2f0c64c69fa64d93b654006f7e7a8 gaim-1.2.0-r2.ebuild 4228
MD5 a6ee03ab706529595cfab1b6bb031d1d gaim-1.1.4.ebuild 4094
MD5 b85072b7c504e9fc2898de1dcdea2ae2 files/digest-gaim-1.2.0 64
MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
@@ -10,3 +10,4 @@ MD5 5ba46c4b619948e7d1bfc5d63f57032a files/gaim-1.2.0-icq-auth.diff 885
MD5 a7d3e2145df1ef66a763bd5dbb331499 files/digest-gaim-1.1.4 64
MD5 b85072b7c504e9fc2898de1dcdea2ae2 files/digest-gaim-1.2.0-r1 64
MD5 b85072b7c504e9fc2898de1dcdea2ae2 files/digest-gaim-1.2.0-r2 64
+MD5 7b47eab5f3ea93627a32ea7ccf778c67 files/gaim-1.2.0_yahoochat.diff 1234
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() {