diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2006-03-19 11:22:49 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2006-03-19 11:22:49 +0000 |
| commit | f273719eb0465fa3a2fb8931f7afb0e932900229 (patch) | |
| tree | 16311375cbfbf04e00d1e120a5154ccd00cddb1c /games-emulation/dosbox/files | |
| parent | Stable on x86, see bug #126773. (diff) | |
| download | gentoo-2-f273719eb0465fa3a2fb8931f7afb0e932900229.tar.gz gentoo-2-f273719eb0465fa3a2fb8931f7afb0e932900229.tar.bz2 gentoo-2-f273719eb0465fa3a2fb8931f7afb0e932900229.zip | |
Fixed compilation with gcc4 and on amd64. Closes bug #114949.
(Portage version: 2.1_pre6-r3)
Diffstat (limited to 'games-emulation/dosbox/files')
| -rw-r--r-- | games-emulation/dosbox/files/0.63-gcc41.patch | 43 | ||||
| -rw-r--r-- | games-emulation/dosbox/files/digest-dosbox-0.63 | 2 |
2 files changed, 45 insertions, 0 deletions
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 |