Make it compile with gcc-4.3, bug #228891

Package-Manager: portage-2.1.4.4

4 files changed, 27 insertions, 14 deletions

diff --git a/net-p2p/linuxdcpp/ChangeLog b/net-p2p/linuxdcpp/ChangeLog
index ace089bd5545..10cabd79380f 100644
--- a/net-p2p/linuxdcpp/ChangeLog
+++ b/net-p2p/linuxdcpp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/linuxdcpp
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/ChangeLog,v 1.28 2008/06/30 07:51:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/ChangeLog,v 1.29 2008/06/30 10:06:39 armin76 Exp $
+
+  30 Jun 2008; Raúl Porcel <armin76@gentoo.org> +files/1.0.1-gcc-4.3.patch,
+  linuxdcpp-1.0.1-r2.ebuild:
+  Make it compile with gcc-4.3, bug #228891
 
   30 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
   linuxdcpp-1.0.1-r2.ebuild:
diff --git a/net-p2p/linuxdcpp/Manifest b/net-p2p/linuxdcpp/Manifest
index 775a6ada4124..6c9146c45191 100644
--- a/net-p2p/linuxdcpp/Manifest
+++ b/net-p2p/linuxdcpp/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 1.0.1-gcc-4.3.patch 495 RMD160 52ec76b42dd9361520b247a5c7dcf591c8d44ae3 SHA1 73259cfbb77bdbdee322b75cfa89117956403d4c SHA256 9b59df535273dad60903c65df7cea470d016e1a4376dbfec816c205325a954dc
 AUX linuxdcpp-1.0.1-fix-remote-vulnerability.patch 953 RMD160 26457948031fccde029f9d8e2df6eb24de069316 SHA1 dede29ac45406f2016f0f0d55c83657e840d27b4 SHA256 41fb65c533d80a6b2d792c9c1133b26e83780478017ca11b129a30467ac6537c
 DIST linuxdcpp-1.0.1.tar.bz2 282410 RMD160 daaac78b0e7bd73cccd81f23d1983814937f930b SHA1 0da46e3c1920f8d898852a2abeb197609fe35ae7 SHA256 647448d41e8b24219bda4f286e2e6bef0eb956bd4f51e12cced18e3e94de1b38
-EBUILD linuxdcpp-1.0.1-r2.ebuild 1292 RMD160 52ae420916fb3625da13c33d93b3e1bf41fa6a25 SHA1 e6ecd390f5b3db3a0512d0114ce7f3bf49c3b469 SHA256 01e7a3ba96b6dac75f7d426b4329fbb89a8af22453eebed17b3a33b41ecdef67
+EBUILD linuxdcpp-1.0.1-r2.ebuild 1337 RMD160 be08bdf5a31d610544a33574729b6cff9332c014 SHA1 86d3eb201cdf393dca0e5c37f8418438283950f9 SHA256 5f7409ef1c6f97996186b9317278a6c071bd7569d1ee3eb13893bf291fd5abd2
 EBUILD linuxdcpp-1.0.1.ebuild 1190 RMD160 19aa34862d6c173d076127ddcffb95fb73f234fe SHA1 191dc37481ab50158e171c661382e4b4efc34a49 SHA256 b86f590d9152e0b5ccdb42c5a6e2b952ad7834416fd38da7d33b527bc35121fc
 EBUILD linuxdcpp-9999.ebuild 1284 RMD160 c2537dc188ef6b5e01d1e0f7e9265350697ef66c SHA1 f71857349670ee27043f72288f9a3f38e1a8237a SHA256 074abf8f2c8dc310cebe670998e45ad3e58e5c9d4ad0a1432019733ff7d17604
-MISC ChangeLog 4265 RMD160 51463f5bc0c8111212218fa7252f2a1cf2b82acd SHA1 04dd5eca51305140b58788a7aaf11fc1ee3ad06a SHA256 b2c38af3f96029eab60045fef168ca2d5fafa968a995382b907801f1c9f5278a
+MISC ChangeLog 4418 RMD160 25baa0532b9f422956a79531fb25a37e6d6d194a SHA1 6e867dbabcf817cc55e2cb6d19842a96d21c03ce SHA256 cf84e093a54c592499f664c4725be07984790ec037811c9224a8013c505e03f1
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhokKIACgkQNQqtfCuFneOYKgCeJKM8kbotMyerchcIXsU4lXDW
-LukAn3muM9yIrk5sQlZ4mWj60WyCifMy
-=d64W
------END PGP SIGNATURE-----
diff --git a/net-p2p/linuxdcpp/files/1.0.1-gcc-4.3.patch b/net-p2p/linuxdcpp/files/1.0.1-gcc-4.3.patch
new file mode 100644
index 000000000000..279663eddefb
--- /dev/null
+++ b/net-p2p/linuxdcpp/files/1.0.1-gcc-4.3.patch
@@ -0,0 +1,16 @@
+diff -NrU5 linuxdcpp-1.0.1.orig/client/ShareManager.h linuxdcpp-1.0.1/client/ShareManager.h
+--- linuxdcpp-1.0.1.orig/client/ShareManager.h	2007-07-07 22:02:08.000000000 +0200
++++ linuxdcpp-1.0.1/client/ShareManager.h	2008-06-22 14:14:30.000000000 +0200
+@@ -35,10 +35,12 @@
+ #include "Singleton.h"
+ #include "BloomFilter.h"
+ #include "FastAlloc.h"
+ #include "MerkleTree.h"
+ 
++#include <memory>	// GCC 4.3 fix
++
+ STANDARD_EXCEPTION(ShareException);
+ 
+ class SimpleXML;
+ class Client;
+ class File;
diff --git a/net-p2p/linuxdcpp/linuxdcpp-1.0.1-r2.ebuild b/net-p2p/linuxdcpp/linuxdcpp-1.0.1-r2.ebuild
index 486d15e6751b..0b6a83a7a9e7 100644
--- a/net-p2p/linuxdcpp/linuxdcpp-1.0.1-r2.ebuild
+++ b/net-p2p/linuxdcpp/linuxdcpp-1.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-1.0.1-r2.ebuild,v 1.2 2008/06/30 07:51:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-1.0.1-r2.ebuild,v 1.3 2008/06/30 10:06:39 armin76 Exp $
 
 inherit eutils
 
@@ -24,7 +24,9 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	epatch "${FILESDIR}"/${P}-fix-remote-vulnerability.patch
+	epatch "${FILESDIR}"/${PV}-gcc-4.3.patch
 }
 
 src_compile() {