rpms/Maelstrom/devel Maelstrom-3.0.6-64bit.patch, NONE, 1.1 Maelstrom.spec, 1.2, 1.3

Bill Nottingham (notting) fedora-extras-commits at redhat.com
Thu May 26 17:47:58 UTC 2005


Author: notting

Update of /cvs/extras/rpms/Maelstrom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21209

Modified Files:
	Maelstrom.spec 
Added Files:
	Maelstrom-3.0.6-64bit.patch 
Log Message:

fix x86_64 build


Maelstrom-3.0.6-64bit.patch:

--- NEW FILE Maelstrom-3.0.6-64bit.patch ---
--- Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp.foo	2005-05-26 13:43:00.000000000 -0400
+++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp	2005-05-26 13:44:25.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
+					((unsigned long)dirtymap[i]-(unsigned long)updatelist) +
+								(unsigned long)newlist
 					);
 				}
 			}


Index: Maelstrom.spec
===================================================================
RCS file: /cvs/extras/rpms/Maelstrom/devel/Maelstrom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Maelstrom.spec	23 May 2005 20:47:16 -0000	1.2
+++ Maelstrom.spec	26 May 2005 17:47:56 -0000	1.3
@@ -8,6 +8,7 @@
 Source1:   maelstrom.png
 Patch0: Maelstrom-3.0.5-setgid.patch
 Patch1: Maelstrom-3.0.6-gcc34.patch
+Patch2: Maelstrom-3.0.6-64bit.patch
 URL:       http://www.devolution.com/~slouken/Maelstrom/
 BuildRoot: %{_tmppath}/Maelstrom-%{PACKAGE_VERSION}-root
 BuildPrereq: SDL-devel, SDL_net-devel
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1 -b .setgid
 %patch1 -p1 -b .gcc34
+%patch2 -p1 -b .64bit
 
 %build
 touch Makefile.in
@@ -73,8 +75,8 @@
 %{_datadir}/icons
 
 %changelog
-* Mon May 23 2005 Bill Nottingham <notting at redhat.com>
-- bump for rebuild
+* Thu May 26 2005 Bill Nottingham <notting at redhat.com>
+- fix x86_64 build
 
 * Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt




More information about the fedora-extras-commits mailing list