Fixed compilation with gcc4 and on amd64. Closes bug #114949.

(Portage version: 2.1_pre6-r3)

5 files changed, 74 insertions, 7 deletions

diff --git a/games-emulation/dosbox/ChangeLog b/games-emulation/dosbox/ChangeLog
index 710fb411daff..d2e8cfbb3f75 100644
--- a/games-emulation/dosbox/ChangeLog
+++ b/games-emulation/dosbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/dosbox
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.20 2005/07/11 16:25:51 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.21 2006/03/19 11:22:49 eradicator Exp $
+
+  19 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/0.63-gcc41.patch, dosbox-0.63.ebuild:
+  Fixed compilation with gcc4 and on amd64.  Closes bug #114949.
 
   11 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org> dosbox-0.63.ebuild:
   amd64 patch is unconditional upstream so apply it for everyone.
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index 6639e6486316..bf98dd9d7c1c 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,7 +1,24 @@
-MD5 95e2b5bfd7767aeae061c77f7e1a055e metadata.xml 221
-MD5 c4f7ddfbcebee2b679852dae7d92f834 dosbox-0.63.ebuild 1206
 MD5 6ce22d8f331db912f0ea828bf213d59b ChangeLog 2814
+RMD160 f00dd12cb3865efcfd3482a2e5fbb363dab3af4b ChangeLog 2814
+SHA256 ea85fa3ee042cfc566bd1d0d5f6e3fe35b11dcf83c308a932a4f0fa308b454d7 ChangeLog 2814
 MD5 cedd50d841d0e28ecb75c9552d0c291f dosbox-0.58.ebuild 684
+RMD160 e3908ee963a834174a695dcbd831f0ea081ddbc4 dosbox-0.58.ebuild 684
+SHA256 65bc896f9f2d11ab3b41746ded51d8190d3440e5d73d54e161f5d034d796eeac dosbox-0.58.ebuild 684
+MD5 fdf3fb3ef106bbefa6ab82d28eb95e38 dosbox-0.63.ebuild 1246
+RMD160 376858b49a795f8e0306a8579b7396106c2f2e9e dosbox-0.63.ebuild 1246
+SHA256 9628639f08b6066f0727408a270089612905a45cc04e67e2fde5b09ba96d39ea dosbox-0.63.ebuild 1246
 MD5 b656b366678b3dc52f1083e339891186 files/0.63-64bit.patch 446
+RMD160 e11d4fcb30601a718325a4be4f6609565ae59eb6 files/0.63-64bit.patch 446
+SHA256 05c782195b8fccaa6a0424cfc18d85622b768cef97658d358675464a23f201c7 files/0.63-64bit.patch 446
+MD5 8aa5c1f677cfd96ea07d3a2c83e5493c files/0.63-gcc41.patch 579
+RMD160 796fd851e3e3f9ff5fa1b0978e044d39f9657356 files/0.63-gcc41.patch 579
+SHA256 2a602f09331a65b74e81f065ef671bfc4e43e4bdf673149265f4f60ff56ed89f files/0.63-gcc41.patch 579
 MD5 709911d69c3fb90908508f4c3116a07f files/digest-dosbox-0.58 63
-MD5 42f19bd18cae0f81773fbe342847a147 files/digest-dosbox-0.63 63
+RMD160 f40d9e3cf003b9b0b2fe4467f08c69bd4c389994 files/digest-dosbox-0.58 63
+SHA256 bca825d495cb38da885e4b73c898f2107ed335c1d9a9b2ca5d87e74feabae686 files/digest-dosbox-0.58 63
+MD5 cb8caec3e4057d57d48ac03ba37d1a4c files/digest-dosbox-0.63 235
+RMD160 459df45254a27a26edb9e3c307cc386792a1254a files/digest-dosbox-0.63 235
+SHA256 de3cbae3b24af61bc1aa54d79f255cbba290cb477c4797b3fc7600e7c51214ac files/digest-dosbox-0.63 235
+MD5 95e2b5bfd7767aeae061c77f7e1a055e metadata.xml 221
+RMD160 617e2d275f39c937dfdc8ae1ebc0b4fac331d0a9 metadata.xml 221
+SHA256 80c34a967b80bba5f0f27215677fdad5b1ed739678287b62db1f6c345cf69811 metadata.xml 221
diff --git a/games-emulation/dosbox/dosbox-0.63.ebuild b/games-emulation/dosbox/dosbox-0.63.ebuild
index 8887dce3826a..6f3b19e32d42 100644
--- a/games-emulation/dosbox/dosbox-0.63.ebuild
+++ b/games-emulation/dosbox/dosbox-0.63.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/dosbox/dosbox-0.63.ebuild,v 1.4 2005/07/11 16:25:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.63.ebuild,v 1.5 2006/03/19 11:22:49 eradicator Exp $
 
 inherit eutils games
 
@@ -27,6 +27,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PV}-64bit.patch
+	epatch "${FILESDIR}"/${PV}-gcc41.patch
 }
 
 src_compile() {
diff --git a/games-emulation/dosbox/files/0.63-gcc41.patch b/games-emulation/dosbox/files/0.63-gcc41.patch
new file mode 100644
index 000000000000..442a1b540daa
--- /dev/null
+++ b/games-emulation/dosbox/files/0.63-gcc41.patch
@@ -0,0 +1,43 @@
+diff -Naurp dosbox-0.63.orig/include/programs.h dosbox-0.63/include/programs.h
+--- dosbox-0.63.orig/include/programs.h	2004-08-04 02:12:51.000000000 -0700
++++ dosbox-0.63/include/programs.h	2006-03-19 03:09:29.000000000 -0800
+@@ -40,7 +40,7 @@ public:
+ 	CommandLine * cmd;
+ 	DOS_PSP * psp;
+ 	virtual void Run(void)=0;
+-	bool Program::GetEnvStr(const char * entry,std::string & result);
++	bool GetEnvStr(const char * entry,std::string & result);
+ 	bool GetEnvNum(Bitu num,std::string & result);
+ 	Bitu GetEnvCount(void);
+ 	bool SetEnv(const char * entry,const char * new_string);
+diff -Naurp dosbox-0.63.orig/src/dos/drive_cache.cpp dosbox-0.63/src/dos/drive_cache.cpp
+--- dosbox-0.63.orig/src/dos/drive_cache.cpp	2004-11-13 04:08:43.000000000 -0800
++++ dosbox-0.63/src/dos/drive_cache.cpp	2006-03-19 03:13:30.000000000 -0800
+@@ -317,12 +317,12 @@ int DOS_Drive_Cache::CompareShortname(co
+ {
+ 	char* cpos = strchr(shortName,'~');
+ 	if (cpos) {
+-		Bits compareCount1	= (int)cpos - (int)shortName;
++		Bits compareCount1	= cpos - shortName;
+ 		char* endPos		= strchr(cpos,'.');
+-		Bitu numberSize		= endPos ? int(endPos)-int(cpos) : strlen(cpos);
++		Bitu numberSize		= endPos ? endPos - cpos : strlen(cpos);
+ 		
+ 		char* lpos			= strchr(compareName,'.');
+-		Bits compareCount2	= lpos ? int(lpos)-int(compareName) : strlen(compareName);
++		Bits compareCount2	= lpos ? lpos - compareName : strlen(compareName);
+ 		if (compareCount2>8) compareCount2 = 8;
+ 
+ 		compareCount2 -= numberSize;
+diff -Naurp dosbox-0.63.orig/src/gui/midi_alsa.h dosbox-0.63/src/gui/midi_alsa.h
+--- dosbox-0.63.orig/src/gui/midi_alsa.h	2004-08-04 02:12:54.000000000 -0700
++++ dosbox-0.63/src/gui/midi_alsa.h	2006-03-19 03:14:59.000000000 -0800
+@@ -112,7 +112,7 @@ public:
+ 			}
+ 			break;
+ 		default:
+-			LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08x", (int)msg);
++			LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08x", (const char *)msg);
+ 			send_event(1);
+ 			break;
+ 		}
diff --git a/games-emulation/dosbox/files/digest-dosbox-0.63 b/games-emulation/dosbox/files/digest-dosbox-0.63
index 4721bbf74ae5..1cf489b1075c 100644
--- a/games-emulation/dosbox/files/digest-dosbox-0.63
+++ b/games-emulation/dosbox/files/digest-dosbox-0.63
@@ -1 +1,3 @@
 MD5 629413e41224ae9cdd115fdafd55cbdc dosbox-0.63.tar.gz 648762
+RMD160 c6c6e5206f3f3671652405aafbf244cd90742ef9 dosbox-0.63.tar.gz 648762
+SHA256 f4eeee90f076d891034faf1268b6352b8df9cb262b787384ed4386cf6ea4faa7 dosbox-0.63.tar.gz 648762