gcc-4.1 fix, bug #126601

(Portage version: 2.1_pre7-r4)

5 files changed, 74 insertions, 17 deletions

diff --git a/dev-games/kyra/ChangeLog b/dev-games/kyra/ChangeLog
index 4f15b449cfd1..f97232c87b88 100644
--- a/dev-games/kyra/ChangeLog
+++ b/dev-games/kyra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/kyra
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.7 2005/08/24 23:08:03 tester Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.8 2006/04/04 17:56:37 tupone Exp $
+
+  04 Apr 2006; <Tupone@gentoo.org> +files/kyra-2.0.7-gcc41.patch,
+  kyra-2.0.7.ebuild:
+  gcc-4.1 fix, bug #126601 by Matteo Azzali
 
   24 Aug 2005; Olivier Crête <tester@gentoo.org> kyra-2.0.7.ebuild:
   Marked ~amd64, thanks to Erik Musick and Jim Laflin for testing
diff --git a/dev-games/kyra/Manifest b/dev-games/kyra/Manifest
index 36ed92581e6d..0b0569c16eef 100644
--- a/dev-games/kyra/Manifest
+++ b/dev-games/kyra/Manifest
@@ -1,14 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 82cd5296e19e00ca20ccdb1288709698 ChangeLog 1012
+RMD160 57413e88a0a05c5217cdc9eb2a0b2c23828dd58e ChangeLog 1012
+SHA256 2d831caccf51f01ff8a652212fae2e59df7eb4a4b7f1f81e188b1f4e19b301af ChangeLog 1012
+MD5 a7268f0e65f4a0a82a281cbf7bdad320 files/digest-kyra-2.0.7 247
+RMD160 6d6c392c6ad4e4879455d1b2478cba31b6b05f24 files/digest-kyra-2.0.7 247
+SHA256 24c7833c082d90b51122da78b706f77a4482a2bc2ebfd58974da8527f087125d files/digest-kyra-2.0.7 247
+MD5 d9f4cd9e141a4831512acbb225ccc1c3 files/kyra-2.0.7-gcc41.patch 1625
+RMD160 427622ba0a08623ca6b59d497dc3cda65f746cce files/kyra-2.0.7-gcc41.patch 1625
+SHA256 a6e6da8256d051632f1659e74ca3822ce2b457309e8fadcccb0b633eb51f4819 files/kyra-2.0.7-gcc41.patch 1625
+MD5 8edcfc8b70795a2a8eb8b10a57df7861 kyra-2.0.7.ebuild 844
+RMD160 dcc53f3a8fcc619d5f10a4e449ebff0b3a2ebbfc kyra-2.0.7.ebuild 844
+SHA256 ee806e84b83180cd8323fe6837e05aebfe769bf76417aad14b8a6f80a973fd11 kyra-2.0.7.ebuild 844
 MD5 7b8663dd5b15e058787ffdb8010774d0 metadata.xml 2481
-MD5 d2b729000638884ed8b7ba182f9097ae kyra-2.0.7.ebuild 747
-MD5 3ba567183539ec053c5955e4abb64388 ChangeLog 880
-MD5 2ab48b3f5115449807eaad44b62e5a19 files/digest-kyra-2.0.7 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDDQFvmOfEJZHYOKcRAt+gAJ469Qn04W2g6Y+Q5myAT65LXJcD9wCffDJ9
-R7lKKp+XKfWyaoeEazNWl48=
-=EaO2
------END PGP SIGNATURE-----
+RMD160 09171f66958637e45994da3a50375877b59f9d62 metadata.xml 2481
+SHA256 6e4d5c1d2524111ca002698be79bc8647a630602a0318ce3f66a8aa865194937 metadata.xml 2481
diff --git a/dev-games/kyra/files/digest-kyra-2.0.7 b/dev-games/kyra/files/digest-kyra-2.0.7
index 92673ed9c598..668b267e796b 100644
--- a/dev-games/kyra/files/digest-kyra-2.0.7
+++ b/dev-games/kyra/files/digest-kyra-2.0.7
@@ -1 +1,3 @@
 MD5 b86f7a7599cc031df1bbe61031ff97e5 kyra_src_2_0_7.tar.gz 1994743
+RMD160 e9e78a67d452cdc5082da5e16113f4ccd910c70b kyra_src_2_0_7.tar.gz 1994743
+SHA256 e813b205d232937be1bcdcd5b3088d9284836c0348040d1c524d90b4dbc6eb7e kyra_src_2_0_7.tar.gz 1994743
diff --git a/dev-games/kyra/files/kyra-2.0.7-gcc41.patch b/dev-games/kyra/files/kyra-2.0.7-gcc41.patch
new file mode 100644
index 000000000000..8c768fbb9aea
--- /dev/null
+++ b/dev-games/kyra/files/kyra-2.0.7-gcc41.patch
@@ -0,0 +1,42 @@
+--- engine/encoder.h.orig	2006-03-17 23:23:49.000000000 +0100
++++ engine/encoder.h	2006-03-17 23:25:20.000000000 +0100
+@@ -185,7 +185,7 @@
+ 														GLASSERT( numRGBA >= numSegment );
+ //														GLASSERT( numSegment >= numLine );
+ 													 }
+-	void KrEncoder::Save();
++	void Save();
+ 
+ 	KrResourceVault* GetVault()						{ return &vault; }
+ 
+--- engine/imagetree.h.orig	2006-03-17 15:29:33.000000000 +0100
++++ engine/imagetree.h	2006-03-17 15:30:24.000000000 +0100
+@@ -217,7 +217,7 @@
+ 	void Clear( KrImNode* root );	// delete the entire tree
+ 
+ 	// Recursive hit test walk.
+-	bool KrImageTree::HitTestRec( KrImNode* node, int x, int y, int flags, GlDynArray<KrImage*>* outputArray, int windowIndex );
++	bool HitTestRec( KrImNode* node, int x, int y, int flags, GlDynArray<KrImage*>* outputArray, int windowIndex );
+ 
+ 	KrImNode*  root;			// The root to position the window
+ 	KrImNode*  offsetRoot;		// The root as returned to the client
+--- guiExtended/progress.h.orig	2006-03-17 15:29:34.000000000 +0100
++++ guiExtended/progress.h	2006-03-17 15:35:05.000000000 +0100
+@@ -43,7 +43,7 @@
+ 	/** if width of the resource is greater then its height then makes
+ 		a horizontal, else makes a vertical progress bar
+ 	*/
+-	KrProgress::KrProgress (int width,
++	KrProgress (int width,
+ 							int height,
+ 							KrRGBA FillColor,
+ 							KrRGBA ChangeColor,
+@@ -53,7 +53,7 @@
+ 	/** if width of the resource is greater then its height then makes
+ 		a horizontal, else makes a vertical progress bar
+ 	*/
+-	KrProgress::KrProgress (int width,
++	KrProgress (int width,
+ 							int height,
+ 							const KrScheme& scheme);
+ 
diff --git a/dev-games/kyra/kyra-2.0.7.ebuild b/dev-games/kyra/kyra-2.0.7.ebuild
index 88cf65a914b2..16545b0437ec 100644
--- a/dev-games/kyra/kyra-2.0.7.ebuild
+++ b/dev-games/kyra/kyra-2.0.7.ebuild
@@ -1,6 +1,8 @@
-# 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/dev-games/kyra/kyra-2.0.7.ebuild,v 1.10 2005/08/24 23:08:03 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/kyra-2.0.7.ebuild,v 1.11 2006/04/04 17:56:38 tupone Exp $
+
+inherit eutils
 
 DESCRIPTION="Kyra Sprite Engine"
 HOMEPAGE="http://www.grinninglizard.com/kyra/"
@@ -17,6 +19,12 @@ DEPEND=">=media-libs/libsdl-1.2
 
 S="${WORKDIR}/${PN}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
+}
+
 src_compile() {
 	econf $(use_with opengl) || die
 	emake || die "emake failed"