[cvs] dists/10.4/unstable/main/finkinfo/games maelstrom.patch, NONE, 1.1 maelstrom.info, 1.2, 1.3

[Daniel Johnson]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18099

Modified Files:
        maelstrom.info 
Added Files:
        maelstrom.patch 
Log Message:
Fix x86_64 build and make validate with maintainer's permission.


Index: maelstrom.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/maelstrom.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- maelstrom.info      23 Sep 2009 18:30:06 -0000      1.2
+++ maelstrom.info      23 Sep 2009 18:37:52 -0000      1.3
@@ -1,13 +1,18 @@
 Package: maelstrom
 Version: 3.0.6
-Revision: 1005
+Revision: 1006
 Depends: sdl-net-shlibs (>= 1.2.7-1), sdl-shlibs (>= 1.2.13-1)
-BuildDepends: sdl-net (>= 1.2.7-1), sdl (>= 1.2.13-1)
+BuildDepends: sdl-net (>= 1.2.7-1), sdl (>= 1.2.13-1), fink (>= 0.24.12)
 Source: 
http://archive.ubuntu.com/ubuntu/pool/multiverse/m/%n/%n_1.4.3-L%v.orig.tar.gz
 Source-MD5: 67bd9d0f9e3592ea024508a7ef4a92a4
 SourceDirectory: %n-1.4.3-L%v
 SetCXXFLAGS: -Os
-PatchScript: echo 'grep -rl /games/Maelstrom * | xargs perl -pi -e 
"s,/games/Maelstrom,/share/games/Maelstrom,g"'
+PatchFile: %n.patch
+PatchFile-MD5: 6e924ee44ee174f1e0e7f92e7d09f817
+PatchScript: <<
+       %{default_script}
+       echo 'grep -rl /games/Maelstrom * | xargs perl -pi -e 
"s,/games/Maelstrom,/share/games/Maelstrom,g"'
+<<
 ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking 
--disable-sdltest
 CompileScript: <<
        ./configure %c
@@ -15,7 +20,7 @@
        grep -rl -- "-g -O2" * | xargs perl -pi -e "s,-g -O2,-Os,g"
        make
 <<
-InstallScript: make install DESTDIR=%d prefix=%i && mv %d/%i/bin %i/bin && rm 
-rf %d/%d %d/src
+InstallScript: make install DESTDIR=%d prefix=%i && mv %d/%i/bin %i/bin && rm 
-rf %d/%d %i/src
 DocFiles: COPYING* CREDITS ChangeLog README*
 License: GPL
 Homepage: http://www.devolution.com/~slouken/Maelstrom

--- NEW FILE: maelstrom.patch ---
diff -ru maelstrom-1.4.3-L3.0.6.orig/screenlib/SDL_FrameBuf.cpp 
maelstrom-1.4.3-L3.0.6/screenlib/SDL_FrameBuf.cpp
--- maelstrom-1.4.3-L3.0.6.orig/screenlib/SDL_FrameBuf.cpp      2001-07-22 
17:03:13.000000000 -0400
+++ maelstrom-1.4.3-L3.0.6/screenlib/SDL_FrameBuf.cpp   2009-09-23 
14:12:14.000000000 -0400
@@ -848,8 +848,8 @@
                        for ( i=0; i<dirtymaplen; ++i ) {
                                if ( dirtymap[i] != NULL ) {
                                        dirtymap[i] = (SDL_Rect *)(
-                                       ((int)dirtymap[i]-(int)updatelist) +
-                                                               (int)newlist
+                                       (dirtymap[i]-updatelist) +
+                                                               newlist
                                        );
                                }
                        }


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs