Fixing gcc-4.1 build and adding .desktop, bug #131834

(Portage version: 2.1_rc1-r2)

4 files changed, 96 insertions, 5 deletions

diff --git a/games-puzzle/krystaldrop/ChangeLog b/games-puzzle/krystaldrop/ChangeLog
index 5009018d2a47..45ff8c4c34fe 100644
--- a/games-puzzle/krystaldrop/ChangeLog
+++ b/games-puzzle/krystaldrop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/krystaldrop
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.2 2004/06/24 23:06:49 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.3 2006/05/18 21:08:24 tupone Exp $
+
+  18 May 2006; <Tupone@gentoo.org> +files/krystaldrop-0.7.2-gcc41.patch,
+  krystaldrop-0.7.2.ebuild:
+  Fixing gcc-4.1 compilation, bug #131834 thanks to Diego Pettenò
 
 *krystaldrop-0.7.2 (27 Feb 2004)
 
diff --git a/games-puzzle/krystaldrop/files/digest-krystaldrop-0.7.2 b/games-puzzle/krystaldrop/files/digest-krystaldrop-0.7.2
index 7a2f45f62bff..4b445c151013 100644
--- a/games-puzzle/krystaldrop/files/digest-krystaldrop-0.7.2
+++ b/games-puzzle/krystaldrop/files/digest-krystaldrop-0.7.2
@@ -1,2 +1,6 @@
 MD5 2a0a8049fc5525f1c2cd8ed6656572c4 art_0.7.2.tgz 17079147
+RMD160 3a01c1375946f6d0b764ed3482ebb346ffe6480c art_0.7.2.tgz 17079147
+SHA256 7cd9dbd1ad12eb7e26e57e2a52b59e7137e20979d4fc8cb21a48faff983f6e27 art_0.7.2.tgz 17079147
 MD5 68af5fccb41bb22bb583da8139dd3bc0 src_0.7.2.tgz 162856
+RMD160 d53bcfb904bf32948ccf47838df011f67435e45b src_0.7.2.tgz 162856
+SHA256 d0e42cf05f241e409649de6a48045c026c42417cdabd233c8fef8783096946e5 src_0.7.2.tgz 162856
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch
new file mode 100644
index 000000000000..c962a2121596
--- /dev/null
+++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch
@@ -0,0 +1,78 @@
+Index: krystaldrop/Sources/KDpp/Tools/FilePath.h
+===================================================================
+--- krystaldrop.orig/Sources/KDpp/Tools/FilePath.h
++++ krystaldrop/Sources/KDpp/Tools/FilePath.h
+@@ -75,7 +75,7 @@ public:
+ 	/**
+ 		Adds a directory before the filePath....
+ 	*/
+-	void KD_FilePath::PrefixDirectory(const string &path);
++	void PrefixDirectory(const string &path);
+ 
+ 
+ 	/**
+Index: krystaldrop/Sources/KDpp/Video/Color.h
+===================================================================
+--- krystaldrop.orig/Sources/KDpp/Video/Color.h
++++ krystaldrop/Sources/KDpp/Video/Color.h
+@@ -38,7 +38,7 @@ public:
+ 	KD_Color operator*( float lambda );
+ 
+ 	// Multiply by another color
+-	KD_Color KD_Color::operator*( const KD_Color &other );
++	KD_Color operator*( const KD_Color &other );
+ 
+ 	// Sets all the components between 0 and 1
+ 	void normalize();
+Index: krystaldrop/Sources/KrystalDrop/Game/AnimRow.h
+===================================================================
+--- krystaldrop.orig/Sources/KrystalDrop/Game/AnimRow.h
++++ krystaldrop/Sources/KrystalDrop/Game/AnimRow.h
+@@ -22,7 +22,7 @@ class KD_AnimatedRow: public KD_Row
+    void UpdateBlocks (unsigned multiplier); /* multiplier is used to catch up when a lag has occured */
+   
+   public:
+-   KD_AnimatedRow::KD_AnimatedRow (short Height_In_Gems, short x_Offset, 
++   KD_AnimatedRow (short Height_In_Gems, short x_Offset, 
+                                    KD_Hand* Hand, KD_Parameters* Param, KD_Memo* Memo);
+   ~KD_AnimatedRow();
+   
+Index: krystaldrop/Sources/KrystalDrop/Game/Table.h
+===================================================================
+--- krystaldrop.orig/Sources/KrystalDrop/Game/Table.h
++++ krystaldrop/Sources/KrystalDrop/Game/Table.h
+@@ -329,7 +329,7 @@ public:
+ 	/**
+ 		Sets the sprites for the border of the field.
+ 	*/
+-	void KD_Table::setAllBorders(KD_Sprite *spr[KD_NB_SPRITE_FOR_BORDER]);
++	void setAllBorders(KD_Sprite *spr[KD_NB_SPRITE_FOR_BORDER]);
+ 	void setHorizontalBar(KD_Sprite *spr);
+ 	void setVerticalBar(KD_Sprite *spr);
+ 	void setUpperLeftBar(KD_Sprite *spr);
+Index: krystaldrop/Sources/Makefile
+===================================================================
+--- krystaldrop.orig/Sources/Makefile
++++ krystaldrop/Sources/Makefile
+@@ -35,7 +35,7 @@ ACC_ZLIB_SUPPORT=yes
+ export
+ VERSION=0_7_2
+ 
+-CC=g++ -Werror
++CC=g++
+ LINK=g++
+ MAKE=make
+ 
+Index: krystaldrop/Sources/Makefile.lib
+===================================================================
+--- krystaldrop.orig/Sources/Makefile.lib
++++ krystaldrop/Sources/Makefile.lib
+@@ -30,7 +30,7 @@ STATIC_LIBRARY=no
+ export
+ VERSION=0_7
+ 
+-CC=g++ -Werror
++CC=g++
+ LINK=g++
+ MAKE=make
+ 
diff --git a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
index 877129ab8ad7..02370e1e100b 100644
--- a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
+++ b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.2 2004/06/24 23:06:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.3 2006/05/18 21:08:24 tupone Exp $
 
 inherit eutils games
 
@@ -28,7 +28,9 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack src_${PV}.tgz
 	cd ${S}
-	epatch "${FILESDIR}/krystaldrop-assert.patch"
+	epatch "${FILESDIR}/krystaldrop-assert.patch" \
+		"${FILESDIR}/${P}"-gcc41.patch
+
 	unpack art_${PV}.tgz
 
 	sed -i \
@@ -60,5 +62,8 @@ src_install() {
 	fperms 664 "${GAMES_STATEDIR}/${PN}/survival.sco"
 	dodoc CHANGES README
 	doman doc/kdrop.6
+	newicon art/drop.png ${PN}.png
+	make_desktop_entry kdrop "KrystalDrop" ${PN}.png
+
 	prepgamesdirs
 }