Add patch to fix compilation failure on gcc-4.5, bug #328769

Package-Manager: portage-2.1.9.47/cvs/Linux ia64

4 files changed, 42 insertions, 4 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index d85febcfe872..faf6b0ad7237 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/amule
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.156 2011/01/10 14:24:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.157 2011/05/08 18:24:23 armin76 Exp $
+
+  08 May 2011; Raúl Porcel <armin76@gentoo.org> amule-2.2.6.ebuild,
+  +files/amule-2.2.6-gcc45.patch:
+  Add patch to fix compilation failure on gcc-4.5, bug #328769
 
   10 Jan 2011; Patrick Lauer <patrick@gentoo.org> amule-2.2.6.ebuild:
   Relaxing crypto++ dep as the issues have been fixed
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index e373fcbc4ef4..2c63ef1418fd 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amule-2.2.6-fallocate.diff 687 RMD160 f2dba9f74d356a4cfde95dfa7f33c7b818eabde9 SHA1 9f633a83027e9b9bf8e35389c4dafe568f954065 SHA256 a6d6755f1ecd6af4527df4826a363ed2518155021df395f08074ce0c4998ad41
+AUX amule-2.2.6-gcc45.patch 893 RMD160 31f6055550c3eca052250346ddd32a5f7d234364 SHA1 78546fe5393f56b181c29dbdc1918aab3212fc33 SHA256 6aa83a2f1533eadb75b7089cde8a51408cada9389c74e3880d3135cfddb483a1
 AUX amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 SHA1 b5872943f5ec0ac41a7c054239a754f1f9669e09 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a
 AUX amuled.initd 1204 RMD160 d17d6b709f8b7eb91132804fa8a420b5f9499d14 SHA1 936566e113bb91cbc7cfe6803bf7b1d76b8cbadb SHA256 af51a7d148368b2ed3b9cc289e0831c95348dbda9b331360a5635af31b81ed7a
 AUX amuleweb.confd 830 RMD160 1921152543c6f327caf55087269cf0f277545764 SHA1 7800ad36f88a116ca4dcc7b68944b7acaf5877e1 SHA256 e0c4ad636011797618c31ce3d4d5d20ea689ecf6f3ad350fff5b1716c6009c4f
 AUX amuleweb.initd 1236 RMD160 d9f417c3145a26d0e2e0879ab8fe4cc6b569dd35 SHA1 c4f7830950db758c1d961e1edb51e8b067cfb50c SHA256 64a2d1c7770b6d975a68a900b6b15f7bc8ff686b249da3ca96c7bc62cfee57d1
 DIST aMule-2.2.6.tar.bz2 4722143 RMD160 9483eb1907803d3a6ac375c4d85a7b0cbd895daa SHA1 369bb950897c3f1f59fc1190ac7034113ac253d0 SHA256 6ce32b5f1d8113a224a8e850639d957656623a04a73fb83d52313c06c3488122
-EBUILD amule-2.2.6.ebuild 2568 RMD160 f3d021c1f302dbec3b8a9257552b7c491aaa3e10 SHA1 2c9a11746c02a8a7d23c8b73457eb83b48613b95 SHA256 f496f2144974ab8b3bed8e4b8894f16a4d7daaa54dc5298c76c443b55ed90d0e
-MISC ChangeLog 21839 RMD160 650ed490f416480d0a506bff40a4566bb250874f SHA1 958560e47c084662f4f4f60f8a803e9b1ae2a478 SHA256 4aaecefd78a3f8b2f5db0ea752c2eee4b28f261095a6db8a0ac1a84d524ae771
+EBUILD amule-2.2.6.ebuild 2606 RMD160 1c151b19842c203811e11d36e9a9d5a367dbc085 SHA1 2355572d863b985cc152bfc43c295ccc2e6078b9 SHA256 85bdd8372e5e0c2d0aaf81a9e1c9833bef19f4d25cbb320bf78d037fa8bd2cec
+MISC ChangeLog 22006 RMD160 ae673cc9e2d8538fee8d685aabc42702908f3ca7 SHA1 f02ccae1e45aec72a795f83f810db67aeafe188c SHA256 5ce7134c7c678d8e9565c743fb1f88431ce3a69627af2970c59921959c4eab9a
 MISC metadata.xml 425 RMD160 87fe71e15546c8adff535542f5fb963fc2fb7048 SHA1 83864d1b7e26ea59062f6a19a9635eb95c2da916 SHA256 c22fa825da533c079b4c801274cbf3f675982501ba003e79632e164835e48942
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk3G4AoACgkQuQc30/atMkDXSwCdFK6vBksgEK8Mk8e3pgi3aOpa
+QcEAoJoWGGsLn7Xs/lYSY60SZ+mjwEQq
+=5QcN
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/amule/amule-2.2.6.ebuild b/net-p2p/amule/amule-2.2.6.ebuild
index f24ef55cdf9b..62e6e1cd2792 100644
--- a/net-p2p/amule/amule-2.2.6.ebuild
+++ b/net-p2p/amule/amule-2.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.6.ebuild,v 1.12 2011/02/27 13:53:27 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.6.ebuild,v 1.13 2011/05/08 18:24:23 armin76 Exp $
 
 EAPI="2"
 
@@ -52,6 +52,7 @@ pkg_preinst() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-fallocate.diff
+	epatch "${FILESDIR}"/${P}-gcc45.patch
 }
 
 src_configure() {
diff --git a/net-p2p/amule/files/amule-2.2.6-gcc45.patch b/net-p2p/amule/files/amule-2.2.6-gcc45.patch
new file mode 100644
index 000000000000..e120ef23b76f
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.2.6-gcc45.patch
@@ -0,0 +1,22 @@
+# Subject: Fix FTBFS on gcc 4.5 (new in ubuntu natty)
+# Origin: other, http://bugs.amule.org/view.php?id=1624
+# Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/amule/+bug/685584
+# Forwarded: upstream claims it's in their current svn code
+Index: amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp
+===================================================================
+--- amule-2.2.6+debian0.orig/src/utils/wxCas/src/wxcasframe.cpp	2010-12-15 16:46:18.435693002 +0000
++++ amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp	2010-12-15 16:47:07.151693001 +0000
+@@ -285,11 +285,11 @@
+ #ifdef __WXMSW__
+ 
+ 	memdc.
+-	SetFont ( wxFont::wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
++	SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
+ #else
+ 
+ 	memdc.
+-	SetFont ( wxFont::wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
++	SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
+ #endif
+ 
+ 	memdc.