Add patch to fix compilation with gcc-4.1; bug #113248

Package-Manager: portage-2.1_pre7-r3

5 files changed, 92 insertions, 6 deletions

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 93c0c524df7c..32cb642f61d7 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/licq
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.74 2006/03/10 05:38:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.75 2006/04/01 06:04:22 halcy0n Exp $
+
+  01 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/licq-1.3.2-gcc41.patch, licq-1.3.2-r1.ebuild:
+  Add patch to fix compilation with gcc-4.1; bug #113248
 
   10 Mar 2006; Aron Griffis <agriffis@gentoo.org> licq-1.3.2.ebuild:
   Mark 1.3.2 stable on ia64
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 06b4f64882fa..d415999e9cb0 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,16 +1,61 @@
-MD5 b2433db541c6ede43805f5c990fbbf1a ChangeLog 11783
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7348a5ba1cd124e05cc38a227c0a135f ChangeLog 11943
+RMD160 105aad775c2d0973149c6e20743a06f5a47130f7 ChangeLog 11943
+SHA256 39fab8985ed67c08b63360cfaa27a570838a9c589bd4c7a4e87959fa4304a4d3 ChangeLog 11943
 MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
+RMD160 c1c52e57c34dd1b218fd26b338be7b3a47aa7cc6 files/1.2.7-debugflag.patch 396
+SHA256 a00700f5170bf56bef28ffce010c530734f97fbf5d4341b08e9804d022314655 files/1.2.7-debugflag.patch 396
 MD5 5f64e4b71c311ff7b6489953fc8bf1f9 files/1.2.7-nptl.patch 1178
+RMD160 dd48fbebb541e6e4257b99cd09a72701e3cbc4b9 files/1.2.7-nptl.patch 1178
+SHA256 cf319b0a91f563fbae6a3590264f8bfe9d767ad55179f616adf804609b1aa0db files/1.2.7-nptl.patch 1178
 MD5 5dbb2a47d1d863a55f564e874c871d30 files/1.3.0-gpgme3_hack.patch 878
+RMD160 d01f33df1e045791ba169759a0476c2a4bfe20c9 files/1.3.0-gpgme3_hack.patch 878
+SHA256 7cdf7f5a111b07b1b37db144dec58464851ff4daa7c6cef7155ca9d5254afb2b files/1.3.0-gpgme3_hack.patch 878
 MD5 52dadf7b64ef4fb690c7892d94b445d6 files/1.3.0-no_stupid_koloboks.patch 3160
+RMD160 242a92a26fcaa1e86efdadfe330ae780ae80d713 files/1.3.0-no_stupid_koloboks.patch 3160
+SHA256 a227ed596bd50fdbee52854fde7381f12b1ab4326b7f222ab89f6e6254ca9c1c files/1.3.0-no_stupid_koloboks.patch 3160
 MD5 100dc5f1d551dc769a337a71734d0e59 files/1.3.0-suse_bool.patch 191
+RMD160 0b8b913f192328485f213c9d7cf12575158c4584 files/1.3.0-suse_bool.patch 191
+SHA256 e061f929c965d28724cc2ff5ad7a859035331e24c52f8fd9cd2c73a07d32898a files/1.3.0-suse_bool.patch 191
 MD5 60faacd9044ad4dd88db77e0bd53dc7f files/1.3.2-email_typo.patch 620
+RMD160 7b8b9edb0f88e2d1a1372d86e8d174ffee910cd2 files/1.3.2-email_typo.patch 620
+SHA256 18a9a5b10d25ee4f017b78183257950a71af20a7927e071f5f05191c078d3eb3 files/1.3.2-email_typo.patch 620
 MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
+RMD160 072fc2d49a3387b2ad781155dea82a78a457266f files/digest-licq-1.2.7 64
+SHA256 8e8ed4a8d98a7d8af1456a3811d3793c4fb326a55b2a84c42bac403b1d939eca files/digest-licq-1.2.7 64
 MD5 b0a924ef22c21dd596d7918631f18559 files/digest-licq-1.3.0 64
+RMD160 7e9e4bf0ae34e11e876fcd1c5d7c3cd9ddd31c3b files/digest-licq-1.3.0 64
+SHA256 c6f59d6e143febf42e5c1eb8090eace762be301a3d493076dbf10795dfc29b1a files/digest-licq-1.3.0 64
 MD5 b7d176e7d3091d82fed1f4931604b327 files/digest-licq-1.3.2 64
-MD5 b7d176e7d3091d82fed1f4931604b327 files/digest-licq-1.3.2-r1 64
+RMD160 9dccc420a19b5832c671b1d7caba6cd927223c65 files/digest-licq-1.3.2 64
+SHA256 3ea7c8fa70f2b3a254b6c07462ea69cb93ed2cf9d6f5a6357c45d176ff0e76c4 files/digest-licq-1.3.2 64
+MD5 5cf1f1e3a3bac2f951531b04661d56e6 files/digest-licq-1.3.2-r1 238
+RMD160 eb01ac57f0b87dd1b96636323b46cb6a0fe2ed0a files/digest-licq-1.3.2-r1 238
+SHA256 d725a8686268a70d3eb84733378532356e9943e158b26129262c1770da4dfa76 files/digest-licq-1.3.2-r1 238
+MD5 c493da59c47a80c87d079309fc47c880 files/licq-1.3.2-gcc41.patch 1238
+RMD160 99a4628325ee2818a215dd2af870b0fdd7a76659 files/licq-1.3.2-gcc41.patch 1238
+SHA256 eca8a5920942d8ce938e3bf907daf4f5353721a95af4447db9e65874b58e745e files/licq-1.3.2-gcc41.patch 1238
 MD5 f30c97a120a37f90edd8abdf612cd52a licq-1.2.7.ebuild 3368
+RMD160 e14a1039669c88d963e1f2c97a5309efe95da1d2 licq-1.2.7.ebuild 3368
+SHA256 3c8ebe9846d903477e50a45b0570dd8eb19dd502012022ad661a231edddee39d licq-1.2.7.ebuild 3368
 MD5 2d149efe7ebe39b0e944db660fd88c89 licq-1.3.0.ebuild 3799
-MD5 b6602d07b65d88645dac04ab170a8f51 licq-1.3.2-r1.ebuild 4987
+RMD160 b15fb6f2bbaa3e13be1324c3284ef79fccb3f2cd licq-1.3.0.ebuild 3799
+SHA256 f93c401f23ea86be0c611ac2ed248bdbf1ad4a22345912baab470af4d18ddd23 licq-1.3.0.ebuild 3799
+MD5 4fdeeb1a2736844950d1c84d1479da85 licq-1.3.2-r1.ebuild 5028
+RMD160 d0aa32378a1a9beec2c596cf321d386fd80a1eaf licq-1.3.2-r1.ebuild 5028
+SHA256 2d0e2ed46eca4cb0ad5e26171520d9c7678f861b35181cb38e1f892367e496a0 licq-1.3.2-r1.ebuild 5028
 MD5 0bc9f8233ca4e3ff3d0537b347d4a9b4 licq-1.3.2.ebuild 4858
+RMD160 c0d8f9ede7a3e0c8f091748f6536e15f3b43a3c3 licq-1.3.2.ebuild 4858
+SHA256 4009c9f7fa0757f248f9a818092ba9b5b8271bbbc288812fa9b9d16d3bf5fe99 licq-1.3.2.ebuild 4858
 MD5 7adc6310a4dbd42bad26caa80683d4ec metadata.xml 249
+RMD160 09f64f681d0dd11fd8a5784ae17b7eaaa87cc12f metadata.xml 249
+SHA256 bfa15ab9faf7742a9f33d2ba72410a089690beb639884f357b135951cd663230 metadata.xml 249
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFELhf0CRZPokWLroQRAuWCAJ9hdSjpsVZKgHmEUDQo+fFrU1AMEACfTSBi
+UksjoC9NhlTDQxIMIaMl1i4=
+=Uf0x
+-----END PGP SIGNATURE-----
diff --git a/net-im/licq/files/digest-licq-1.3.2-r1 b/net-im/licq/files/digest-licq-1.3.2-r1
index 38bccae79e8a..6c1f06b4f555 100644
--- a/net-im/licq/files/digest-licq-1.3.2-r1
+++ b/net-im/licq/files/digest-licq-1.3.2-r1
@@ -1 +1,3 @@
 MD5 0471bb8fed91eefb23dfe153c9a4a806 licq-1.3.2.tar.bz2 3980117
+RMD160 19242437cce5ec3fd9bde6be50a4e29a8654950b licq-1.3.2.tar.bz2 3980117
+SHA256 3c6ec77d42973c93a9d1926a3aa444ff0388263f38a19c9b51e1337cde60f8bc licq-1.3.2.tar.bz2 3980117
diff --git a/net-im/licq/files/licq-1.3.2-gcc41.patch b/net-im/licq/files/licq-1.3.2-gcc41.patch
new file mode 100644
index 000000000000..72ae1f7fb20c
--- /dev/null
+++ b/net-im/licq/files/licq-1.3.2-gcc41.patch
@@ -0,0 +1,34 @@
+diff -ur licq-1.3.2-orig/include/licq_buffer.h licq-1.3.2/include/licq_buffer.h
+--- licq-1.3.2-orig/include/licq_buffer.h	2006-03-15 00:41:39.000000000 -0500
++++ licq-1.3.2/include/licq_buffer.h	2006-03-15 00:42:25.000000000 -0500
+@@ -62,7 +62,7 @@
+ 
+    char *Pack(CBuffer *);
+    char *Pack(const char *data, int size);
+-   char *CBuffer::PackLNTS(const char *);
++   char *PackLNTS(const char *);
+    char *PackString(const char *data, unsigned short max = 0);
+    char *PackUnsignedShort(unsigned short data);
+    char *PackUnsignedLong(unsigned long data);
+diff -ur licq-1.3.2-orig/include/licq_icqd.h licq-1.3.2/include/licq_icqd.h
+--- licq-1.3.2-orig/include/licq_icqd.h	2006-03-15 00:41:39.000000000 -0500
++++ licq-1.3.2/include/licq_icqd.h	2006-03-15 00:45:49.000000000 -0500
+@@ -837,6 +837,17 @@
+   bool bFinished;
+ };
+ 
++//Forward declarations for friend functions
++void *ProcessRunningEvent_Server_tep(void *p);
++void *Ping_tep(void *p);
++void *UpdateUsers_tep(void *p);
++void *MonitorSockets_tep(void *p);
++void *ReverseConnectToUser_tep(void *p);
++void *ProcessRunningEvent_Client_tep(void *p);
++void *ProcessRunningEvent_Server_tep(void *p);
++void *Shutdown_tep(void *p);
++void *ConnectToServer_tep(void *s);
++
+ 
+ 
+ #endif
+
diff --git a/net-im/licq/licq-1.3.2-r1.ebuild b/net-im/licq/licq-1.3.2-r1.ebuild
index ffff7bab9c0a..c305c164ae4f 100644
--- a/net-im/licq/licq-1.3.2-r1.ebuild
+++ b/net-im/licq/licq-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.2-r1.ebuild,v 1.2 2005/11/12 12:52:41 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.2-r1.ebuild,v 1.3 2006/04/01 06:04:22 halcy0n Exp $
 
 inherit eutils kde-functions multilib
 
@@ -32,6 +32,7 @@ src_unpack() {
 	cd ${S}
 
 	use ncurses && epatch ${FILESDIR}/1.3.0-suse_bool.patch
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 
 	if use kde
 	then