packages: xmoto/xmoto.spec, xmoto/xmoto-gcc.patch (NEW) - rel 4; x86_64 bui...

[arekm]

Author: arekm                        Date: Fri Jan 29 22:35:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; x86_64 build fix

---- Files affected:
packages/xmoto:
   xmoto.spec (1.69 -> 1.70) , xmoto-gcc.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xmoto/xmoto.spec
diff -u packages/xmoto/xmoto.spec:1.69 packages/xmoto/xmoto.spec:1.70
--- packages/xmoto/xmoto.spec:1.69	Thu Jan 28 19:42:42 2010
+++ packages/xmoto/xmoto.spec	Fri Jan 29 23:34:56 2010
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):	Klon gry across/elma
 Name:		xmoto
 Version:	0.5.2
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	http://download.tuxfamily.org/xmoto/xmoto/%{version}/%{name}-%{version}-src.tar.gz
@@ -15,6 +15,7 @@
 Source2:	%{name}.desktop
 Patch0:		%{name}-lua51.patch
 Patch1:		libpng-1.4.patch
+Patch2:		%{name}-gcc.patch
 URL:		http://xmoto.sourceforge.net/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	SDL-devel
@@ -57,6 +58,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 # fix lv translation
 %{__sed} -i -e 's/lv_LV/lv/g;s/da_DK/da/g;s/pt_PT/pt/g;s/tr_TR/tr/g' configure.in
@@ -128,6 +130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70  2010/01/29 22:34:56  arekm
+- rel 4; x86_64 build fix
+
 Revision 1.69  2010/01/28 18:42:42  arekm
 - rel 3; libpng fix
 

================================================================
Index: packages/xmoto/xmoto-gcc.patch
diff -u /dev/null packages/xmoto/xmoto-gcc.patch:1.1
--- /dev/null	Fri Jan 29 23:35:02 2010
+++ packages/xmoto/xmoto-gcc.patch	Fri Jan 29 23:34:56 2010
@@ -0,0 +1,33 @@
+--- src/DBuffer.h.org	2009-09-10 11:58:28.000000000 +0200
++++ src/DBuffer.h	2009-09-10 12:07:30.000000000 +0200
+@@ -69,6 +69,8 @@
+       void operator >>(unsigned char &c);
+       void operator <<(unsigned int n);
+       void operator >>(unsigned int &n);
++      void operator <<(unsigned long n);
++      void operator >>(unsigned long &n);
+       void operator <<(float n);
+       void operator >>(float &n);
+       void operator <<(std::string s);
+
+--- src/DBuffer.cpp.org	2009-09-10 11:58:38.000000000 +0200
++++ src/DBuffer.cpp	2009-09-10 12:08:18.000000000 +0200
+@@ -210,6 +210,18 @@
+     n = (unsigned int) sn;
+   }
+   
++  void DBuffer::operator <<(unsigned long n) {
++      int sn;
++      sn = (int) (n);
++      *this << sn;
++  }
++  
++  void DBuffer::operator >>(unsigned long &n) {
++      int sn;
++      *this >> sn;
++      n = (unsigned long) sn;
++  }
++  
+   void DBuffer::operator <<(float n) {
+     writeBuf_LE((char *)&n, sizeof(float));
+   }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xmoto/xmoto.spec?r1=1.69&r2=1.70&f=u