diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2006-10-25 20:18:34 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2006-10-25 20:18:34 +0000 |
| commit | eddd497d0670e1d1947343a0ec69ef0e4a0fd5b6 (patch) | |
| tree | 2e2d9cdd42f1a43e0cd4afe763d032d1592a0bec /games-engines/exult | |
| parent | Forgot the ChangeLog. (diff) | |
| download | gentoo-2-eddd497d0670e1d1947343a0ec69ef0e4a0fd5b6.tar.gz gentoo-2-eddd497d0670e1d1947343a0ec69ef0e4a0fd5b6.tar.bz2 gentoo-2-eddd497d0670e1d1947343a0ec69ef0e4a0fd5b6.zip | |
Fix for 64 bits CPU. Bug #146049
(Portage version: 2.1.1)
Diffstat (limited to 'games-engines/exult')
| -rw-r--r-- | games-engines/exult/ChangeLog | 6 | ||||
| -rw-r--r-- | games-engines/exult/exult-1.2.ebuild | 3 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-64bits.patch | 20 |
3 files changed, 27 insertions, 2 deletions
diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog index 010551fd38d1..b12c87e7ccde 100644 --- a/games-engines/exult/ChangeLog +++ b/games-engines/exult/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/exult # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.16 2006/10/16 22:04:14 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.17 2006/10/25 20:18:34 tupone Exp $ + + 25 Oct 2006; <tupone@gentoo.org> +files/exult-1.2-64bits.patch, + exult-1.2.ebuild: + Fix for 64 bits CPU. Bug #146049 by Tiago Sousa 16 Oct 2006; Simon Stelling <blubb@gentoo.org> exult-1.2.ebuild: remove useless use flags; bug 151640 diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild index 9f394511cdc3..982da253e189 100644 --- a/games-engines/exult/exult-1.2.ebuild +++ b/games-engines/exult/exult-1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.8 2006/10/16 22:04:14 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.9 2006/10/25 20:18:34 tupone Exp $ inherit eutils autotools games @@ -36,6 +36,7 @@ src_unpack() { unpack U7MusicOGG_{1,2}of2.zip cd "${S}" epatch "${FILESDIR}/${P}"-gcc41.patch \ + "${FILESDIR}"/${P}-64bits.patch \ "${FILESDIR}/${P}"-x11link.patch sed -i \ -e "s/u7siinstrics.data/u7siintrinsics.data/" \ diff --git a/games-engines/exult/files/exult-1.2-64bits.patch b/games-engines/exult/files/exult-1.2-64bits.patch new file mode 100644 index 000000000000..ed4be4a4f2da --- /dev/null +++ b/games-engines/exult/files/exult-1.2-64bits.patch @@ -0,0 +1,20 @@ +--- usecode/useval.cc.old 2006-10-25 21:43:21.000000000 +0200 ++++ usecode/useval.cc 2006-10-25 21:48:49.000000000 +0200 +@@ -464,7 +464,7 @@ + if (buflen < 5) + return -1; + *ptr++ = type; +- Write4(ptr, (int)value.ptr); ++ Write4(ptr, 0); + break; + case string_type: + { +@@ -525,7 +525,7 @@ + case pointer_type: + if (buflen < 5) + return false; +- value.ptr = (Game_object*)Read4(ptr); //DON'T dereference this pointer! ++ value.ptr = 0; //DON'T dereference this pointer! + // Maybe add a new type "serialized_pointer" to prevent "accidents"? + return true; + case string_type: |