Fixed for gcc-4.5, thanks Xarthisius, bug #318575

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 29 insertions, 8 deletions

diff --git a/sci-libs/liborigin/ChangeLog b/sci-libs/liborigin/ChangeLog
index c68e4068604b..2952611f7bf7 100644
--- a/sci-libs/liborigin/ChangeLog
+++ b/sci-libs/liborigin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/liborigin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.17 2010/04/26 20:34:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/ChangeLog,v 1.18 2010/05/05 16:49:25 bicatali Exp $
+
+  05 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  liborigin-20100420.ebuild, +files/liborigin-20100420-gcc45.patch:
+  Fixed for gcc-4.5, thanks Xarthisius, bug #318575
 
   26 Apr 2010; Markus Meier <maekke@gentoo.org> liborigin-20090406.ebuild:
   amd64/x86 stable, bug #314037
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index ab7a25d497c1..a1497e402274 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX liborigin-20080225-makefile.patch 1547 RMD160 e1ce040963f3efd852190b3f7bf3ed363ddad214 SHA1 16fedf0df0efd79337463e54a1257b0cb19f706c SHA256 cc5b0f3517092e02f0aa2233c466e31fef172f07b152ccd3e2ceaf0df36b35d4
 AUX liborigin-20100420-build-parsers.patch 495 RMD160 b15ca109c8a4fd3d3e7314c2fb4e87164678081b SHA1 1b96a4b06282f44fc7ea62e833b8075840ff28f4 SHA256 1cebbabd2cced95afda0971578856ec1611009ad347fc25b3a76b3d2e7dfb764
+AUX liborigin-20100420-gcc45.patch 345 RMD160 11fc8f2825af54785a629e4cd69a923c4505556f SHA1 6eb14d4cd79e7d87f98604e881a64002e3c1a974 SHA256 fb13c17e62de8beaf8c9bc91e403c915ebe1e18d855b90b04a0a1e4265b32343
 DIST liborigin-20080225.tar.gz 49326 RMD160 c18339fee71b2b819c95c54f0dfea4a49e44f522 SHA1 0dbbd2f929beaf94600c055fc3b15228354498c2 SHA256 bfa1d8ea617df9ad0c9e3764eefb0c7dc8ba76478735607e6cdd01df9937835e
 DIST liborigin-20100420.tar.bz2 121096 RMD160 ddbe3add0f9bd47b6f1489ab8a50a35b03498394 SHA1 ba4f195a36fd2f97c07655f13764c8113aeecc5c SHA256 797add4425f28fc14695f8216c280887cdc97dfa6daeca4f67526371c42af579
 DIST liborigin2-06042009.zip 739957 RMD160 86a48dc031eb7b3fe5d162901ed07ead6e805a13 SHA1 1763568726bc446bab018946ebd023f5a2ca6fe7 SHA256 53f2638f7ef96cf09fb01ba47c8d7d70739e70620a7a60ce2b28f7a270c9e55c
 EBUILD liborigin-20080225-r1.ebuild 778 RMD160 e2dc052b0fb35988b66878830f28bcea761108a9 SHA1 4d62661936a0257878529d1ebf583b0f7f687bbe SHA256 d5e7c086bf04ea3813674124785da98280e2d3159c65f1698ade05d7148d4918
 EBUILD liborigin-20090406.ebuild 1301 RMD160 85d904eafb7ab246db29a178b0c520301ed758a5 SHA1 d6efe3bbcc4ca2d7531c311d5d8f0162b9df92dd SHA256 0bd952823601b7137b0a26b739659ceccb403c5c0792dacb5fed83f017638079
-EBUILD liborigin-20100420.ebuild 1259 RMD160 4127eb5aca7f69ae5226b05b72bf6d075c5000f2 SHA1 3f828a6b74a2d2c791c638959774735b1a49f5ba SHA256 1b4502cf00f3d40eeca843e20cc3317ff8264a29d12dfe7163c4a4e227919858
-MISC ChangeLog 3119 RMD160 11c4321b9dc001a32caa0c85511f23399ebd58a8 SHA1 4e41493fc49f119229ed10cb3576c0f74f940d56 SHA256 3dc31b65fa712bcbc5f51716b44bbfb5dbb26d5fa163e2f3ba9db1155c3e51de
+EBUILD liborigin-20100420.ebuild 1303 RMD160 508bdf2dca7b08969e2415bfb0ba567950401923 SHA1 f815212c040659d3380544ac716c620dcf161575 SHA256 5c909ae95bf689f834a56ef2e9a09ff252621dc8bcc703bb7dc3d472eb829cf4
+MISC ChangeLog 3297 RMD160 5dc754b195a6963461c5af1c554c14ad321bc62a SHA1 43b5c6b89ae8c2216a5993abbc10bc388b73cbc8 SHA256 87c4bd5363d66c8c80dcdc27fb337d74feea9395003b5446a85b1e9b142a7d8b
 MISC metadata.xml 253 RMD160 6f6629a29e3d78392dc866988d84e1181f4393b4 SHA1 8eec277c384cc4ab1e293172028c71ca164af7a4 SHA256 ade43daac692ebcd9187e8c0ec18331a14f189a686a3c9c52c1016a3e7f98ba0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvV+IIACgkQkKaRLQcq0GJdYwCgnIb3tmDTtG1bivOtbZRcuG5G
-3CYAn3gaWR++OCBZvNvupf7Dp+eHhVuq
-=wesh
+iEYEARECAAYFAkvhq9AACgkQ1ycZbhPLE2BhpgCaAv4rKmpAIU5k3ibDpd5GZCs1
+01gAnjyK8IOiO/gzGI25NQwHaX9QKj/h
+=yTeY
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/liborigin/files/liborigin-20100420-gcc45.patch b/sci-libs/liborigin/files/liborigin-20100420-gcc45.patch
new file mode 100644
index 000000000000..8aab51902793
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-20100420-gcc45.patch
@@ -0,0 +1,15 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318575
+
+--- OriginDefaultParser.cpp
++++ OriginDefaultParser.cpp
+@@ -73,7 +73,7 @@
+ 	int i;
+ 	FILE *f, *debug;
+ 	if((f=fopen(fileName.c_str(),"rb")) == NULL ) {
+-		printf("Could not open %s!\n",fileName);
++		printf("Could not open %s!\n",fileName.c_str());
+ 		return false;
+ 	}
+ 
diff --git a/sci-libs/liborigin/liborigin-20100420.ebuild b/sci-libs/liborigin/liborigin-20100420.ebuild
index 8381f3fefe17..b9ec35a421fa 100644
--- a/sci-libs/liborigin/liborigin-20100420.ebuild
+++ b/sci-libs/liborigin/liborigin-20100420.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20100420.ebuild,v 1.1 2010/04/23 08:14:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20100420.ebuild,v 1.2 2010/05/05 16:49:24 bicatali Exp $
 
 EAPI=2
 inherit eutils qt4
@@ -31,6 +31,7 @@ src_prepare() {
 	EOF
 	# use system one
 	rm -f tree.hh || die
+	epatch "${FILESDIR}"/${P}-gcc45.patch
 }
 
 src_configure() {