summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorDon Seiler <rizzo@gentoo.org>2004-11-17 17:17:01 +0000
committerDon Seiler <rizzo@gentoo.org>2004-11-17 17:17:01 +0000
commitd6cfac482be21816122b086bdec48d9e31f0f699 (patch)
tree0300ff0c1dc704b7554ca4b8777eaa95832cf91d /net-im
parentUpdated i18n patch to i18n-misc (tab, etc) patch. (Manifest recommit) (diff)
downloadgentoo-2-d6cfac482be21816122b086bdec48d9e31f0f699.tar.gz
gentoo-2-d6cfac482be21816122b086bdec48d9e31f0f699.tar.bz2
gentoo-2-d6cfac482be21816122b086bdec48d9e31f0f699.zip
Fix for gcc-2.95. Thanks to Matt Taylor for posting it. Fixes bug #71483.
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gaim/ChangeLog6
-rw-r--r--net-im/gaim/files/gaim-1.0.3-gcc2.patch16
-rw-r--r--net-im/gaim/gaim-1.0.3-r1.ebuild3
3 files changed, 23 insertions, 2 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 4693ea0541a8..3a0b1ad4a2d1 100644
--- 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/files/gaim-1.0.3-gcc2.patch b/net-im/gaim/files/gaim-1.0.3-gcc2.patch
new file mode 100644
index 000000000000..af0c46b480d4
--- /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 34579a633b93..9a5bb6c13c3c 100644
--- 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() {