Fix for gcc-2.95. Thanks to Matt Taylor for posting it. Fixes bug #71483.

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 4693ea0541a855658b699c5521c9ebe186ad53ea..3a0b1ad4a2d1b322f5361e8e491294b4a93709a3 100644 (file)
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.268 2004/11/16 20:18:01 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.269 2004/11/17 17:17:01 rizzo Exp $
+
+  17 Nov 2004; Don Seiler <rizzo@gentoo.org> +files/gaim-1.0.3-gcc2.patch,
+  gaim-1.0.3-r1.ebuild:
+  Fix for gcc-2.95.  Thanks to Matt Taylor for posting it.  Fixes bug #71483.
 
   16 Nov 2004; Don Seiler <rizzo@gentoo.org> gaim-1.0.3-r1.ebuild:
   Depending on dev-libs/nss-3.9.2-r1.  Fixes bug #71004

diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index d432f838e0a3e14810ce31d3c060cc16f397fb72..220cfa8749d2bcf3c77cac9d5ebaf748e93a67bf 100644 (file)
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,12 +1,13 @@
-MD5 b50efe6b8b5c208b4c2ff67277585955 ChangeLog 41604
+MD5 fac17b68953fb4770714f3a47d4b50e8 ChangeLog 41782
 MD5 fd54c70bd27573e820a717e82c593b04 gaim-1.0.2-r1.ebuild 3717
 MD5 264bb3eece5dad32364c45ab5c50ced3 gaim-1.0.3.ebuild 3679
-MD5 bec46f6b3f0b9cd43b053cd823435ad9 gaim-1.0.3-r1.ebuild 3849
+MD5 c0764b9d13a022db163a8ea56ebb8993 gaim-1.0.3-r1.ebuild 3891
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
 MD5 0cdd9d3f2035687340e6360264fda0e3 gaim-1.0.2.ebuild 3662
-MD5 5a965d7dbdfe4f077deabcee9695526b files/gaim-1.0.3cvs-ircbuddylist.patch 4051
 MD5 f9039f6cb5717109cf48a9f7e5d51a32 files/digest-gaim-1.0.2-r1 64
-MD5 3c880530528d7d9a72baa22afc76736d files/digest-gaim-1.0.3 64
+MD5 5a965d7dbdfe4f077deabcee9695526b files/gaim-1.0.3cvs-ircbuddylist.patch 4051
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
+MD5 3c880530528d7d9a72baa22afc76736d files/digest-gaim-1.0.3 64
 MD5 3c880530528d7d9a72baa22afc76736d files/digest-gaim-1.0.3-r1 64
+MD5 b7ca30984d2853ae2978ca94668ef7b5 files/gaim-1.0.3-gcc2.patch 546
 MD5 f9039f6cb5717109cf48a9f7e5d51a32 files/digest-gaim-1.0.2 64

diff --git a/net-im/gaim/files/gaim-1.0.3-gcc2.patch b/net-im/gaim/files/gaim-1.0.3-gcc2.patch
new file mode 100644 (file)
index 0000000..af0c46b
--- /dev/null
+++ b/net-im/gaim/files/gaim-1.0.3-gcc2.patch
@@ -0,0 +1,16 @@
+--- gaim-1.0.3/src/log.c~      2004-11-11 14:11:43 -0500
++++ gaim-1.0.3/src/log.c       2004-11-16 22:41:18 -0500
+@@ -74,11 +74,12 @@ void gaim_log_free(GaimLog *log)
+ void gaim_log_write(GaimLog *log, GaimMessageFlags type,
+                   const char *from, time_t time, const char *message)
+ {
++      struct _gaim_logsize_user *lu;
++
+       g_return_if_fail(log);
+       g_return_if_fail(log->logger);
+       g_return_if_fail(log->logger->write);
+ 
+-      struct _gaim_logsize_user *lu;
+       (log->logger->write)(log, type, from, time, message);
+ 
+       lu = g_new(struct _gaim_logsize_user, 1);

diff --git a/net-im/gaim/gaim-1.0.3-r1.ebuild b/net-im/gaim/gaim-1.0.3-r1.ebuild
index 34579a633b9354e893ae5ffc168ef0799e07a356..9a5bb6c13c3c923e4db3ef42e37a386468b904d4 100644 (file)
--- a/net-im/gaim/gaim-1.0.3-r1.ebuild
+++ b/net-im/gaim/gaim-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.3-r1.ebuild,v 1.2 2004/11/16 20:18:01 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.0.3-r1.ebuild,v 1.3 2004/11/17 17:17:01 rizzo Exp $
 
 inherit flag-o-matic eutils gcc debug
 
@@ -81,6 +81,7 @@ src_unpack() {
        unpack ${A}
        cd ${S}
        use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
+       epatch ${FILESDIR}/gaim-1.0.3-gcc2.patch
 }
 
 src_compile() {