Fix for fail to compile on a 64 bits CPU. Bug #146153

Package-Manager: portage-2.1.1

diff --git a/games-action/maelstrom/ChangeLog b/games-action/maelstrom/ChangeLog
index b8d6f6c67cdcc429181a5bea569985774186af41..828bbc56584c903a0844fd40897dfe4633165a87 100644 (file)
--- a/games-action/maelstrom/ChangeLog
+++ b/games-action/maelstrom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/maelstrom
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/ChangeLog,v 1.17 2005/08/15 19:03:08 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/ChangeLog,v 1.18 2006/10/25 20:54:31 tupone Exp $
+
+  25 Oct 2006; <tupone@gentoo.org> +files/maelstrom-3.0.6-64bits.patch,
+  maelstrom-3.0.6-r1.ebuild:
+  Fix for fail to compile on a 64 bits CPU. Bug #146153 by Randall Nortman
 
   15 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
   maelstrom-3.0.6-r1.ebuild:

diff --git a/games-action/maelstrom/Manifest b/games-action/maelstrom/Manifest
index 15d0e92eb0ab0dd56dc4f6a4c25f022b407b317e..4eb4f9a2f67d80b615f7cf91688270508dc44aff 100644 (file)
--- a/games-action/maelstrom/Manifest
+++ b/games-action/maelstrom/Manifest
@@ -1,6 +1,38 @@
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 0c77c6ce30ef54ae9649fa8d893b7671 maelstrom-3.0.6-r1.ebuild 1878
-MD5 a034512ceda04e32115d2d9f1cdda84d ChangeLog 2423
-MD5 fc36cbee1c4fbf10dc66ac7a2caf0428 files/maelstrom-gcc34.patch 878
-MD5 e3ab80b2fbf8ddabc7817b0fbb6a3068 files/digest-maelstrom-3.0.6-r1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX maelstrom-3.0.6-64bits.patch 499 RMD160 6d2d4e10f2f0dd68d175becdc876b472d1bdcd7e SHA1 3156c1607727b2dcf9b946b60db3053f650dddef SHA256 6fd7a7cab4f89ec00b123758f4d6a82e930c2a6632ffa00c3172f6c076d7015a
+MD5 471ef416576d1ba7dabfa12a4825e271 files/maelstrom-3.0.6-64bits.patch 499
+RMD160 6d2d4e10f2f0dd68d175becdc876b472d1bdcd7e files/maelstrom-3.0.6-64bits.patch 499
+SHA256 6fd7a7cab4f89ec00b123758f4d6a82e930c2a6632ffa00c3172f6c076d7015a files/maelstrom-3.0.6-64bits.patch 499
+AUX maelstrom-3.0.6-r1-security.patch 14189 RMD160 7509c96a2ee3f91f32824e640bec00c11019adfd SHA1 9bbb7d90620551cdebafb51cf548660e8e153372 SHA256 977d7558b094037ad82177d56ac897e376714e939568b0925ad28708aad6099f
 MD5 5ea58949614a6eab777bda186f607f03 files/maelstrom-3.0.6-r1-security.patch 14189
+RMD160 7509c96a2ee3f91f32824e640bec00c11019adfd files/maelstrom-3.0.6-r1-security.patch 14189
+SHA256 977d7558b094037ad82177d56ac897e376714e939568b0925ad28708aad6099f files/maelstrom-3.0.6-r1-security.patch 14189
+AUX maelstrom-gcc34.patch 878 RMD160 dfa90264cbd1f3cb4aca724c7b566b7d96169971 SHA1 60ebcb0e541fe6d3fe9fbd12f32f7b31c68de913 SHA256 38a0a869c60e32d2873f536badd28e45f1908027d4e40936f533da2c0741dc3a
+MD5 fc36cbee1c4fbf10dc66ac7a2caf0428 files/maelstrom-gcc34.patch 878
+RMD160 dfa90264cbd1f3cb4aca724c7b566b7d96169971 files/maelstrom-gcc34.patch 878
+SHA256 38a0a869c60e32d2873f536badd28e45f1908027d4e40936f533da2c0741dc3a files/maelstrom-gcc34.patch 878
+DIST Maelstrom-3.0.6.tar.gz 1007421 RMD160 9415324e96fdccfc5ff5c453e886d0ce28956c13 SHA1 28b273615d1c375e532d375a4a407a99af63e283 SHA256 bb6ca1952d1080e25f8716a2d08a4241614ee72d54f13c8a60eecadf7ea6198d
+EBUILD maelstrom-3.0.6-r1.ebuild 1911 RMD160 9c421e3af0e16f8a0f3e7dff6240a245df6250fd SHA1 d145d227e04ba7b41160940d2eaed83133e3cdc5 SHA256 790dd813f567ee4f071ef5626316352e81137b4a6d9ab6602c227ba6cdd56910
+MD5 7bcb6569da40c1df3f97fcbc693d8fc4 maelstrom-3.0.6-r1.ebuild 1911
+RMD160 9c421e3af0e16f8a0f3e7dff6240a245df6250fd maelstrom-3.0.6-r1.ebuild 1911
+SHA256 790dd813f567ee4f071ef5626316352e81137b4a6d9ab6602c227ba6cdd56910 maelstrom-3.0.6-r1.ebuild 1911
+MISC ChangeLog 2597 RMD160 d702e5ea1251d9cc7fbd5b7b1a7ac60ebe31dbf4 SHA1 cfddae41e5be4f451a789c17365a2f73c2d502ac SHA256 fbdbca226fae877ff63d5ec503a3e60c1501680f0a068f6b90be46621678b701
+MD5 34624cf72c2d9b6403701df0a693644a ChangeLog 2597
+RMD160 d702e5ea1251d9cc7fbd5b7b1a7ac60ebe31dbf4 ChangeLog 2597
+SHA256 fbdbca226fae877ff63d5ec503a3e60c1501680f0a068f6b90be46621678b701 ChangeLog 2597
+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 9dfd5b17fb0c2d2281bc8ab139177719 files/digest-maelstrom-3.0.6-r1 250
+RMD160 4b1603429f82771f94c556ba322fa72ec8ed423e files/digest-maelstrom-3.0.6-r1 250
+SHA256 d2a0c063ec40f9630bc8ecb89662dd4bc1538fa1e57990427a1ab98edc490a27 files/digest-maelstrom-3.0.6-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFP88SbfN2jvlVAhwRAqLYAJ9R3mj2Vh7UqEufX/Hc9u8o37mVrwCfQEu+
+Vo3b6o2FpwHI6UsCfZ0DvMg=
+=zALU
+-----END PGP SIGNATURE-----

diff --git a/games-action/maelstrom/files/digest-maelstrom-3.0.6-r1 b/games-action/maelstrom/files/digest-maelstrom-3.0.6-r1
index 1fbf791cebf6129c3e7a66ee8da9e63d164d51d5..14b5f526d05d3c1bcc6ba82ae5ca012ad7a5b9c0 100644 (file)
--- a/games-action/maelstrom/files/digest-maelstrom-3.0.6-r1
+++ b/games-action/maelstrom/files/digest-maelstrom-3.0.6-r1
@@ -1 +1,3 @@
 MD5 8aab0e75ca52808fd6777535ebb1f1c4 Maelstrom-3.0.6.tar.gz 1007421
+RMD160 9415324e96fdccfc5ff5c453e886d0ce28956c13 Maelstrom-3.0.6.tar.gz 1007421
+SHA256 bb6ca1952d1080e25f8716a2d08a4241614ee72d54f13c8a60eecadf7ea6198d Maelstrom-3.0.6.tar.gz 1007421

diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-64bits.patch b/games-action/maelstrom/files/maelstrom-3.0.6-64bits.patch
new file mode 100644 (file)
index 0000000..bdf04d3
--- /dev/null
+++ b/games-action/maelstrom/files/maelstrom-3.0.6-64bits.patch
@@ -0,0 +1,15 @@
+--- screenlib/SDL_FrameBuf.cpp.old     2006-10-25 22:37:21.000000000 +0200
++++ screenlib/SDL_FrameBuf.cpp 2006-10-25 22:38:26.000000000 +0200
+@@ -847,10 +847,8 @@
+                       /* Update the dirty rectangle map with the new list */
+                       for ( i=0; i<dirtymaplen; ++i ) {
+                               if ( dirtymap[i] != NULL ) {
+-                                      dirtymap[i] = (SDL_Rect *)(
+-                                      ((int)dirtymap[i]-(int)updatelist) +
+-                                                              (int)newlist
+-                                      );
++                                      dirtymap[i] = newlist
++                                              + (dirtymap[i]-updatelist);
+                               }
+                       }
+                       delete[] updatelist;

diff --git a/games-action/maelstrom/maelstrom-3.0.6-r1.ebuild b/games-action/maelstrom/maelstrom-3.0.6-r1.ebuild
index 8193c59d98981aa484795fef6390b447eed755fc..1db3d5f52803ed932a3edd3b018249db3bee7ade 100644 (file)
--- a/games-action/maelstrom/maelstrom-3.0.6-r1.ebuild
+++ b/games-action/maelstrom/maelstrom-3.0.6-r1.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-action/maelstrom/maelstrom-3.0.6-r1.ebuild,v 1.8 2005/08/15 19:03:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/maelstrom-3.0.6-r1.ebuild,v 1.9 2006/10/25 20:54:31 tupone Exp $
 
 inherit eutils games
 
@@ -25,6 +25,7 @@ src_unpack() {
 
        epatch \
                "${FILESDIR}"/${PF}-security.patch \
+               "${FILESDIR}"/${P}-64bits.patch \
                "${FILESDIR}"/${PN}-gcc34.patch
 
        # Install the data into $(datadir)/..., not $(prefix)/games/...