Add patch for building on 64bit from Franz Fellner (bug #284464)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 43 insertions, 4 deletions

diff --git a/games-sports/xmoto/ChangeLog b/games-sports/xmoto/ChangeLog
index e305250267d2..0e43490d7585 100644
--- a/games-sports/xmoto/ChangeLog
+++ b/games-sports/xmoto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/xmoto
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.38 2009/09/09 15:43:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.39 2009/09/11 22:04:53 mr_bones_ Exp $
+
+  11 Sep 2009; Michael Sterrett <mr_bones_@gentoo.org> xmoto-0.5.2.ebuild,
+  +files/xmoto-0.5.2-64bit.patch:
+  Add patch for building on 64bit from Franz Fellner (bug #284464)
 
 *xmoto-0.5.2 (09 Sep 2009)
 
diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
index f5a534bd0d51..e064a0721ecd 100644
--- a/games-sports/xmoto/Manifest
+++ b/games-sports/xmoto/Manifest
@@ -1,4 +1,5 @@
 AUX xmoto-0.5.1-gcc44.patch 1458 RMD160 cc01e3b08e9253e7bff7e541ac65fd7962401208 SHA1 8ec31754116f42ee7bc021fa5b0a94bcf556aa9d SHA256 5f770bad2a34a73babac16df39c56350bf60745b5e5ad976808bb91acc26fb7e
+AUX xmoto-0.5.2-64bit.patch 954 RMD160 1cac31931069d9ef855d8af731df17d6b1864edd SHA1 170cb0d1bb204893ae58fd4509585ddb0abce20e SHA256 1c6c5a0a31037b27ea9ed5f3f8e8b3aaae22bd699cca460a20737e63792988a8
 DIST inksmoto-0.5.0~rc2.tar.gz 1624726 RMD160 ad435643878455bbb401a6972d583313bcdf2f95 SHA1 656e5577a558ae1f174a216c6ab88d69badc270b SHA256 3f39cc5fec762d90b959e6917ef573f03b99db9e4fbac52663e93ecd8bd29e68
 DIST inksmoto-0.5.1.tar.gz 1954399 RMD160 55d70d3ed0a15047746df748cd8673fe4b4d7a0c SHA1 a6c4cbcf8193a04b10f913dd20909390a452a551 SHA256 653f866d571e8ee327e896a6e08f6e4a5f849468f4d63aadb4845df77cbc12e0
 DIST inksmoto-0.6.0.tar.gz 2493402 RMD160 6cf76101e70e764aa74e8eeff90abe266d36f855 SHA1 8f318a0b1ac01054b879fd5510e2f27784896416 SHA256 d85b81b2b299c3a18c7f81ef69f44786218c409e8d90a6dd7661e1b15eba8b77
@@ -7,6 +8,6 @@ DIST xmoto-0.5.1-src.tar.gz 22003514 RMD160 648a6395f7fe979480c2df50f136352de5c1
 DIST xmoto-0.5.2-src.tar.gz 38170502 RMD160 a8323336814261b0c2bb0acf13d5e65ac92e921d SHA1 aa819872f06beb114025c490cea8e229cd85135d SHA256 a8c91378ed439b640157267981b423dceea3584a439d25eea8aa28181458058f
 EBUILD xmoto-0.5.0-r1.ebuild 2165 RMD160 7c5c5b3353a632ee1aefdc2239a4961b6020e1ea SHA1 1d5068f4431adb749107047a6b92779b56fc347a SHA256 85dd2c03be480bb4538c94b1976327c45eac3dd2049c9d8d2806ff40d2d44e81
 EBUILD xmoto-0.5.1.ebuild 2388 RMD160 ea55b572742ee67832984f25f000197a89b20665 SHA1 240bdd4be8100bdc74bec9436c70d8dcf0ac35df SHA256 14d11df4a19377aadfab12ebbc9e3e35a583cd743a3af8d25d847c7c64b2691e
-EBUILD xmoto-0.5.2.ebuild 2342 RMD160 e43c4a4299244420302c8a64f57d02ba4539fcc4 SHA1 4b6193d0a0d6bccff4dc1c36e6a9dd74e8573962 SHA256 c9395f5b2eac0ad9124ef9065822c5b4e00b425bdbbb039feb7c38119cc58111
-MISC ChangeLog 5373 RMD160 0036155fb69da69c629c2d361cd86e73c93f067c SHA1 2840460cfd0e3f9fa8fd784c130f997c82d78f1b SHA256 955fafddd78f68eec93b15897297c9432266462edbe9351f75075ab2854f90bf
+EBUILD xmoto-0.5.2.ebuild 2381 RMD160 b3ceb2736562dc1eded2e96ffda77b167522f639 SHA1 f520516790d1815097240d5604df63153e05a8ed SHA256 e5535c30068744f9731de012015acb69be0ce6ccfb2f5fae7a7a09aeb9d3f5df
+MISC ChangeLog 5550 RMD160 c84e3a2332cd1e7ed05bb7aaab3ed92b837cea35 SHA1 1d84de7239a1cd8f536898d44523a3f3d59dd759 SHA256 998f198376f584bb71e7d054f77422db535706ddc4c0904bbcc6e71a07441934
 MISC metadata.xml 339 RMD160 b003e2b8bb90a2ada8c8ba870aab3e6e73f7de71 SHA1 aa5548496eb75effe84bb3849e0f021cdbeac476 SHA256 019501d6ea5973371f60c6407a8fe9e0cd13daef856182fd2974c5145dd2dfed
diff --git a/games-sports/xmoto/files/xmoto-0.5.2-64bit.patch b/games-sports/xmoto/files/xmoto-0.5.2-64bit.patch
new file mode 100644
index 000000000000..01afb15e0115
--- /dev/null
+++ b/games-sports/xmoto/files/xmoto-0.5.2-64bit.patch
@@ -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));
+   }
diff --git a/games-sports/xmoto/xmoto-0.5.2.ebuild b/games-sports/xmoto/xmoto-0.5.2.ebuild
index e792680748ff..40febdfafc52 100644
--- a/games-sports/xmoto/xmoto-0.5.2.ebuild
+++ b/games-sports/xmoto/xmoto-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/xmoto-0.5.2.ebuild,v 1.1 2009/09/09 15:43:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/xmoto-0.5.2.ebuild,v 1.2 2009/09/11 22:04:53 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -45,6 +45,7 @@ src_prepare() {
 		-e '/^gettextsrcdir/s:=.*:= @localedir@/gettext/po:' \
 		po/Makefile.in.in \
 		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-64bit.patch
 }
 
 src_configure() {