Fix for 64 bits CPU. Bug #146049

Package-Manager: portage-2.1.1

diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog
index 010551fd38d1668806929a00e9256b740398dd29..b12c87e7ccde543e4562f47011e9941a51f5d033 100644 (file)
--- 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/Manifest b/games-engines/exult/Manifest
index 9233612d221b5542566867a28dd7e94a3e2bc457..873770587ebf891ae2358904af99b514b59675d4 100644 (file)
--- a/games-engines/exult/Manifest
+++ b/games-engines/exult/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX exult-1.2-64bits.patch 591 RMD160 8674319c38bb9f06975e52494e00f8a4b5c47a96 SHA1 1a5d1db8212be32ed20cf0e41edbb137d6ed19ea SHA256 723cd3a9cc76909db45429192fb88c0cbb941eb10822a8acba7da87a370a5675
+MD5 64875f59a842bf6a32b965dab343160d files/exult-1.2-64bits.patch 591
+RMD160 8674319c38bb9f06975e52494e00f8a4b5c47a96 files/exult-1.2-64bits.patch 591
+SHA256 723cd3a9cc76909db45429192fb88c0cbb941eb10822a8acba7da87a370a5675 files/exult-1.2-64bits.patch 591
 AUX exult-1.2-gcc41.patch 1357 RMD160 c18a2bf589d106e265a543821502be55a9cdbe60 SHA1 7ad3d82641f1e3f355c7085cc3c7349e5687b008 SHA256 cee50e50c21e00d832552d659d08e4b985b84cbeb6ed07e32e0af8b71eee5c04
 MD5 a7f6894ec9b22dce8d5420cfbea5c32c files/exult-1.2-gcc41.patch 1357
 RMD160 c18a2bf589d106e265a543821502be55a9cdbe60 files/exult-1.2-gcc41.patch 1357
@@ -9,14 +16,14 @@ SHA256 c0b971e64fb04e8ec91fea77b530755aa9c448d1421bca176f56b5561c2ab308 files/ex
 DIST U7MusicOGG_1of2.zip 12614413 RMD160 2818c026664f6c8ef79201ea34a507091340fbb8 SHA1 50684766f3ca3eb33a777b752e904939a1470bd8 SHA256 ccf748b346345986b08355ae3bf21c72e3bfffe30ecf9f70fe10fdc8c573a503
 DIST U7MusicOGG_2of2.zip 11382878 RMD160 830a718674e1a2acf79ef131d30929c55fb91b44 SHA1 91250accd89bf931ce5fee6433ae988d55266a2f SHA256 58627a090f3f75cc4f5731053d5a2b02c6ba0edff1db0551bcd565d04089baaa
 DIST exult-1.2.tar.gz 1722259 RMD160 339231edf84507f05115ab3189875cb15be9c04f SHA1 81f9d3d428c80990b8e970a4dee5c85a7236dace SHA256 a6dd9d4e399281ed2db691ede21dbb79818ee11b08ef717e3eac255e290cf21a
-EBUILD exult-1.2.ebuild 2654 RMD160 9ffdc2cad3c0d0a8bd7ec8eeefdebe35efa5eff1 SHA1 dad29cc05e98d5c5afa8553b8913ff940e071223 SHA256 ae158ca3b3da0710dc956d3532d93e272a42f8474f79c1fbbd1fb095d88007da
-MD5 ac9015ebf17e0049fa4c0d4c78b5e5e7 exult-1.2.ebuild 2654
-RMD160 9ffdc2cad3c0d0a8bd7ec8eeefdebe35efa5eff1 exult-1.2.ebuild 2654
-SHA256 ae158ca3b3da0710dc956d3532d93e272a42f8474f79c1fbbd1fb095d88007da exult-1.2.ebuild 2654
-MISC ChangeLog 2108 RMD160 6a39a9667fb0ec065d1aecf4e03bed6f175e172a SHA1 cf1ae612136fbc152575f800058f9a7c715cf8da SHA256 3e2cb46f95b6a6f7e2ad95c0dc3a4632ed86a84a73d86526d2d6de8ddc8e991d
-MD5 34bdab13584fa350236caef1e221f4e0 ChangeLog 2108
-RMD160 6a39a9667fb0ec065d1aecf4e03bed6f175e172a ChangeLog 2108
-SHA256 3e2cb46f95b6a6f7e2ad95c0dc3a4632ed86a84a73d86526d2d6de8ddc8e991d ChangeLog 2108
+EBUILD exult-1.2.ebuild 2691 RMD160 2edd026acfcbff3a49211fc05db69946c1ec4013 SHA1 8763e97c66a25eecb9f856928447b93925d86982 SHA256 7a63eb17e4b4b407cb09422213329b3e3421176380f78376ca5f53c3c37b36d9
+MD5 8fe45b4877a9f0feb882d0c9a0fe557f exult-1.2.ebuild 2691
+RMD160 2edd026acfcbff3a49211fc05db69946c1ec4013 exult-1.2.ebuild 2691
+SHA256 7a63eb17e4b4b407cb09422213329b3e3421176380f78376ca5f53c3c37b36d9 exult-1.2.ebuild 2691
+MISC ChangeLog 2246 RMD160 8c3361ffc934297919f676b24947b47bebfa7b77 SHA1 ce7806596c1cd5a512e4eaec8c8395de06e21a20 SHA256 6615708ac3f2570329622e3e554cb86936e3e406c0d4bd91a30dffb2823b59b4
+MD5 7894c9aadfabd2f69fa66a6dd7910363 ChangeLog 2246
+RMD160 8c3361ffc934297919f676b24947b47bebfa7b77 ChangeLog 2246
+SHA256 6615708ac3f2570329622e3e554cb86936e3e406c0d4bd91a30dffb2823b59b4 ChangeLog 2246
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -24,3 +31,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 a1e63bc6fa75e2cc687adf8fed610dd1 files/digest-exult-1.2 720
 RMD160 3d319c0f344c19b27036ac76175c7bde5895ab14 files/digest-exult-1.2 720
 SHA256 dbcafca8691e0a531c3216a814b0843a539a071032e7c5533ec7049e5bfab400 files/digest-exult-1.2 720
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFP8aobfN2jvlVAhwRAi5QAJ4ualtqSTzh9hhuGjSO+TFasB4WrACdEqlF
+PGo7L8S6qRnvCDzQ1+gCG78=
+=41T9
+-----END PGP SIGNATURE-----

diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild
index 9f394511cdc341a21ce88c802dd1a4c340ac771b..982da253e189114812c6ab4021f1932be1349b4b 100644 (file)
--- 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 (file)
index 0000000..ed4be4a
--- /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: