Patch to fix building on gcc2. Thanks to Tristan Henderson, fixes Bug #48554

4 files changed, 33 insertions, 4 deletions

diff --git a/net-im/gaim-encryption/ChangeLog b/net-im/gaim-encryption/ChangeLog
index fef16539ddd9..f824e6084165 100644
--- a/net-im/gaim-encryption/ChangeLog
+++ b/net-im/gaim-encryption/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gaim-encryption
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/ChangeLog,v 1.21 2004/04/23 12:12:51 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/ChangeLog,v 1.22 2004/04/23 14:18:02 rizzo Exp $
+
+  23 Apr 2004; Don Seiler <rizzo@gentoo.org>;
+  +files/gaim-encryption-2.24-gcc2_fix.patch, gaim-encryption-2.24-r1.ebuild:
+  Patch to fix building on gcc2.  Thanks to Tristan Henderson, fixes Bug #48554
 
 *gaim-encryption-2.24-r1 (23 Apr 2004)
 
diff --git a/net-im/gaim-encryption/Manifest b/net-im/gaim-encryption/Manifest
index ab348491ed71..a42010594c11 100644
--- a/net-im/gaim-encryption/Manifest
+++ b/net-im/gaim-encryption/Manifest
@@ -1,11 +1,12 @@
 MD5 68670a03fbde525ebe3f69dd00d50906 gaim-encryption-2.24.ebuild 1488
 MD5 c7f17c30cc58952c71e57a2e23600e49 gaim-encryption-2.21.ebuild 1260
-MD5 6328f4895440419069b168c386243c9d ChangeLog 2790
+MD5 14ed42f1560535ece22aa344fac7584a ChangeLog 2995
 MD5 ab7db4bf9ff48c8de9da14fd12f6c15c metadata.xml 344
 MD5 8006b2fa4b739f0b9919144b66fe1160 gaim-encryption-2.22.ebuild 1260
-MD5 94c3016bbbe46afd7675ffe1b582fccc gaim-encryption-2.24-r1.ebuild 1569
+MD5 c9138d5573c7033afd8a6b7ad1bdb232 gaim-encryption-2.24-r1.ebuild 1625
 MD5 634fb953048e9a3e63ed137b1ecebf46 files/encrypt_api.diff 537
 MD5 24597e0458ae20c16bf8a8b363de4af4 files/digest-gaim-encryption-2.21 72
 MD5 2d945bd60bd6d47a3adbddb2184e3354 files/digest-gaim-encryption-2.22 72
 MD5 951d14a45791f387ee09954239e51cd8 files/digest-gaim-encryption-2.24 72
+MD5 13458d9e2614dd3e3013b074f7b15149 files/gaim-encryption-2.24-gcc2_fix.patch 1051
 MD5 951d14a45791f387ee09954239e51cd8 files/digest-gaim-encryption-2.24-r1 72
diff --git a/net-im/gaim-encryption/files/gaim-encryption-2.24-gcc2_fix.patch b/net-im/gaim-encryption/files/gaim-encryption-2.24-gcc2_fix.patch
new file mode 100644
index 000000000000..7af7f9b5aa0b
--- /dev/null
+++ b/net-im/gaim-encryption/files/gaim-encryption-2.24-gcc2_fix.patch
@@ -0,0 +1,23 @@
+diff -Naur gaim-encryption-2.24.orig/encrypt.c gaim-encryption-2.24/encrypt.c
+--- gaim-encryption-2.24.orig/encrypt.c	2004-04-15 23:01:18.000000000 -0400
++++ gaim-encryption-2.24/encrypt.c	2004-04-21 07:38:30.000000000 -0400
+@@ -841,6 +841,9 @@
+ 
+    int baggage_size;
+    char baggage[BUF_LONG];
++   
++   const gchar* header = g_hash_table_lookup(header_table, (gpointer)gaim_account_get_protocol(conv->account));
++   const gchar* footer = g_hash_table_lookup(footer_table, (gpointer)gaim_account_get_protocol(conv->account));
+ 
+    if (msg_id == 0) {
+       gaim_debug(GAIM_DEBUG_ERROR, "gaim-encryption", "Bad call to resend_msg: %p %p\n", conv, msg_id);
+@@ -851,9 +854,6 @@
+       conv = gaim_conversation_new(GAIM_CONV_IM, acct, name);
+    }
+ 
+-   const gchar* header = g_hash_table_lookup(header_table, (gpointer)gaim_account_get_protocol(conv->account));
+-   const gchar* footer = g_hash_table_lookup(footer_table, (gpointer)gaim_account_get_protocol(conv->account));
+-
+    if (!header) header = header_default;
+    if (!footer) footer = "";
+ 
diff --git a/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild b/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild
index ecd1759436d0..d4ed7fd8decc 100644
--- a/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild
+++ b/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild,v 1.3 2004/04/23 12:25:23 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/gaim-encryption-2.24-r1.ebuild,v 1.4 2004/04/23 14:18:02 rizzo Exp $
 
 inherit flag-o-matic
 
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/encrypt_api.diff
+	epatch ${FILESDIR}/gaim-encryption-2.24-gcc2_fix.patch
 }
 
 src_compile() {