Fix compilation on gcc-4.1

Package-Manager: portage-2.1-r2

5 files changed, 68 insertions, 9 deletions

diff --git a/games-emulation/daphne/ChangeLog b/games-emulation/daphne/ChangeLog
index e177aa7ff786..1ea0c4d6d4ba 100644
--- a/games-emulation/daphne/ChangeLog
+++ b/games-emulation/daphne/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/daphne
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.9 2005/07/10 02:33:40 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.10 2006/08/28 01:53:27 tupone Exp $
+
+  28 Aug 2006; <tupone@gentoo.org> +files/daphne-0.99.6-gcc41.patch,
+  daphne-0.99.6-r2.ebuild:
+  Fix compilation on gcc-4.1
 
   10 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
   daphne-0.99.6-r2.ebuild:
diff --git a/games-emulation/daphne/Manifest b/games-emulation/daphne/Manifest
index 68e1c45ceade..d487a629748c 100644
--- a/games-emulation/daphne/Manifest
+++ b/games-emulation/daphne/Manifest
@@ -1,5 +1,34 @@
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 85284e83790b51e673b35fdcb53f2f77 daphne-0.99.6-r2.ebuild 2006
-MD5 88f57ec49f1b4ceb2d7fc50fbbf7db96 ChangeLog 1175
-MD5 8c819c5ceafbe235dfa7fb2a35bf84ce files/digest-daphne-0.99.6-r2 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.99.6-local-dapinput.patch 669 RMD160 5c9b078a54717010437a39468a7d1e65345bb40d SHA1 18ec9e3c871392a61fbbfca6fd4e29f0a46816b7 SHA256 c641814cac09fa78d7990481cdf87c1f1f0ed2a0d64fdd33c14a11e43982db09
 MD5 b8108296fd1d844b69546291e958bb4c files/0.99.6-local-dapinput.patch 669
+RMD160 5c9b078a54717010437a39468a7d1e65345bb40d files/0.99.6-local-dapinput.patch 669
+SHA256 c641814cac09fa78d7990481cdf87c1f1f0ed2a0d64fdd33c14a11e43982db09 files/0.99.6-local-dapinput.patch 669
+AUX daphne-0.99.6-gcc41.patch 1109 RMD160 1985ce7fa6b25e2f94f9038025b1ea7bddee3e56 SHA1 1ac5c349dbf54dcc5c39d063c1dff5d3f8d2cfee SHA256 99e39b8c94157e97e15f8ef6ea2e0d7ddffcce3fcda99aba71169c1b59c8c9bd
+MD5 ef997d7c8970bb1ef8a1ecf2a71a27a5 files/daphne-0.99.6-gcc41.patch 1109
+RMD160 1985ce7fa6b25e2f94f9038025b1ea7bddee3e56 files/daphne-0.99.6-gcc41.patch 1109
+SHA256 99e39b8c94157e97e15f8ef6ea2e0d7ddffcce3fcda99aba71169c1b59c8c9bd files/daphne-0.99.6-gcc41.patch 1109
+DIST daphne-0.99.6-src.tar.gz 2685633 RMD160 b4e7902887e6dad03d9ad0b8f9fc5b4b34ca9166 SHA1 40ded2e02163047e097f6309e266a9281fb53219 SHA256 ca8e4365d3af7dd484ce14d30eeffafef7947e41956fa12ec7120308ff3658f9
+EBUILD daphne-0.99.6-r2.ebuild 2047 RMD160 55e2da9014ca54bcd1a6afd81fc536ab795912a8 SHA1 8d3de811cc7c02e868f2c6daa209d930e728bab4 SHA256 ff28e6f9c4dff5782e7d14b110d29dce017db6bceb7bc09fcda48ed6006ca781
+MD5 d5848c8fb75201d9b74a585ea60c9c23 daphne-0.99.6-r2.ebuild 2047
+RMD160 55e2da9014ca54bcd1a6afd81fc536ab795912a8 daphne-0.99.6-r2.ebuild 2047
+SHA256 ff28e6f9c4dff5782e7d14b110d29dce017db6bceb7bc09fcda48ed6006ca781 daphne-0.99.6-r2.ebuild 2047
+MISC ChangeLog 1299 RMD160 2f5a9121e5c023e80d7379e0646c651b6558fa7c SHA1 28027eacc9aa1a6bb8cd980924871d17ba7a598c SHA256 8ed78c85ac055b805d9ba7c0eb313750025c655c0e64e0d915d2361b5bade154
+MD5 36561cb2d4cb53de9638a0197e5eb9c5 ChangeLog 1299
+RMD160 2f5a9121e5c023e80d7379e0646c651b6558fa7c ChangeLog 1299
+SHA256 8ed78c85ac055b805d9ba7c0eb313750025c655c0e64e0d915d2361b5bade154 ChangeLog 1299
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 24ea93c7ac728cbe44ba1c4704749623 files/digest-daphne-0.99.6-r2 256
+RMD160 b3f33db51987b0647c67ad8200ac71f97b2aaa27 files/digest-daphne-0.99.6-r2 256
+SHA256 2197b763fb5e84394806c5f7ce628259613f444580b3234a4654c042dafbe3fa files/digest-daphne-0.99.6-r2 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE8kyk2CTtIKiFlQIRArLgAKCoVU9JbPRSIE9b/QdYK2pbAkn6xQCguEnO
+q9jKmttwcXlsOewgOHy26zo=
+=DJWc
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/daphne/daphne-0.99.6-r2.ebuild b/games-emulation/daphne/daphne-0.99.6-r2.ebuild
index c7be23184166..7321347619e6 100644
--- a/games-emulation/daphne/daphne-0.99.6-r2.ebuild
+++ b/games-emulation/daphne/daphne-0.99.6-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/games-emulation/daphne/daphne-0.99.6-r2.ebuild,v 1.9 2005/07/10 02:33:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-0.99.6-r2.ebuild,v 1.10 2006/08/28 01:53:27 tupone Exp $
 
 inherit eutils flag-o-matic games
 
@@ -26,7 +26,9 @@ src_unpack() {
 
 	replace-cpu-flags i686 pentium3 pentium4 i586 #18807
 
-	cd "${S}/src"
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc41.patch
+	cd src
 	sed \
 		-e "/^DFLAGS/d" \
 		-e "/-fexpensive-optimizations/d " \
diff --git a/games-emulation/daphne/files/daphne-0.99.6-gcc41.patch b/games-emulation/daphne/files/daphne-0.99.6-gcc41.patch
new file mode 100644
index 000000000000..b136ebd387f8
--- /dev/null
+++ b/games-emulation/daphne/files/daphne-0.99.6-gcc41.patch
@@ -0,0 +1,22 @@
+--- src/game/game.h.old	2006-08-27 18:45:27.000000000 +0200
++++ src/game/game.h	2006-08-27 18:45:43.000000000 +0200
+@@ -121,7 +121,7 @@
+ 	int get_video_col_offset();
+ 	SDL_Surface *get_video_overlay(int index);	// returns pointer to video overlay specified, or NULL if index is out of range
+ 	SDL_Surface *get_active_video_overlay();	// returns the current active video overlay (that is currently being drawn)
+-	SDL_Surface *game::get_finished_video_overlay();	// returns the last complete video overlay (that isn't currently being drawn)
++	SDL_Surface *get_finished_video_overlay();	// returns the last complete video overlay (that isn't currently being drawn)
+ 	bool is_overlay_size_dynamic();	// returns m_overlay_size_is_dynamic
+ 
+ 	void enable_cheat();
+--- src/ldp-out/pioneer.h.old	2006-08-27 18:47:55.000000000 +0200
++++ src/ldp-out/pioneer.h	2006-08-27 18:48:12.000000000 +0200
+@@ -45,7 +45,7 @@
+ 	bool pioneer_audio1;
+ 	bool pioneer_audio2;
+ 	bool check_result(Uint32, bool);
+-	bool pioneer::getstring(char *, int, Uint32,bool);
++	bool getstring(char *, int, Uint32,bool);
+ 	void printmodel();
+ };
+ 
diff --git a/games-emulation/daphne/files/digest-daphne-0.99.6-r2 b/games-emulation/daphne/files/digest-daphne-0.99.6-r2
index 115b93db4360..344ba83b7d7b 100644
--- a/games-emulation/daphne/files/digest-daphne-0.99.6-r2
+++ b/games-emulation/daphne/files/digest-daphne-0.99.6-r2
@@ -1 +1,3 @@
 MD5 7602c8c1c7d54f61e23e55fe55b44ffd daphne-0.99.6-src.tar.gz 2685633
+RMD160 b4e7902887e6dad03d9ad0b8f9fc5b4b34ca9166 daphne-0.99.6-src.tar.gz 2685633
+SHA256 ca8e4365d3af7dd484ce14d30eeffafef7947e41956fa12ec7120308ff3658f9 daphne-0.99.6-src.tar.gz 2685633