patch for building with gcc44 - submitted by Mike Limansky via bug #271919

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

4 files changed, 47 insertions, 4 deletions

diff --git a/games-sports/xmoto/ChangeLog b/games-sports/xmoto/ChangeLog
index a228d760740f..ce8eb64d48a7 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.34 2009/04/13 17:37:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.35 2009/05/31 02:33:49 mr_bones_ Exp $
+
+  31 May 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/xmoto-0.5.1-gcc44.patch, xmoto-0.5.1.ebuild:
+  patch for building with gcc44 - submitted by Mike Limansky via bug #271919
 
 *xmoto-0.5.1 (13 Apr 2009)
 
diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
index e32600771567..a704cbe88dab 100644
--- a/games-sports/xmoto/Manifest
+++ b/games-sports/xmoto/Manifest
@@ -1,8 +1,9 @@
+AUX xmoto-0.5.1-gcc44.patch 1458 RMD160 cc01e3b08e9253e7bff7e541ac65fd7962401208 SHA1 8ec31754116f42ee7bc021fa5b0a94bcf556aa9d SHA256 5f770bad2a34a73babac16df39c56350bf60745b5e5ad976808bb91acc26fb7e
 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 xmoto-0.5.0-src.tar.gz 21913971 RMD160 a9e2b9f077b17e17bb2ffab04542ee0f737c3e0f SHA1 9d89c0c7fa7da23378577c8ed572cc381267dfae SHA256 705a70c3cda8300179e049c5b1fb8d5d241ede0a3bc1961d5e93682babccc93f
 DIST xmoto-0.5.1-src.tar.gz 22003514 RMD160 648a6395f7fe979480c2df50f136352de5c13773 SHA1 36bac38d9f87ffbba337a0589de87b5408d734e8 SHA256 420af936c7983e84bc0a38aed828851048385b45f608426b52ed919127e18eb2
 EBUILD xmoto-0.5.0-r1.ebuild 2172 RMD160 fd59ae444c3c6171671c27aa8ceabe5c1b070581 SHA1 a78924c173ec83fcf67a5102f505c8ff74c709c2 SHA256 d182e3828d9985cff9abded0a2c1979913fae2785181ed640a4d6be6212c47ea
-EBUILD xmoto-0.5.1.ebuild 2365 RMD160 2a164a99b603994ac675480552f06d2ad7a7c485 SHA1 9c72b8ffe6489513fed869eac446bee21e9006a6 SHA256 1fc48efa6e42e11c26c199a70e5caed0db5ee1711d1a20c289f203bee8c5f2b6
-MISC ChangeLog 4867 RMD160 3a181f9ad10c95bbd8818c2a8443b288fb5a2c1c SHA1 ecff7297984c56bbdcf23285143bbe946fc5fb93 SHA256 91cca431e19fe4e8f0b4fcb14e6ce6548c1f149113c4f392e3b517f1347c9cf5
+EBUILD xmoto-0.5.1.ebuild 2404 RMD160 787369a39eb49cfd0970b0e9afb0731483cee910 SHA1 5ca43b9ec3562004b3f6fc2a79721db7a6445a8c SHA256 1cf7c082857fe7bd895f7f092c821771529e0334984aabc850f1764d7192ab22
+MISC ChangeLog 5054 RMD160 60cfa548e0c0b4c67655ee051d3160d897256e8c SHA1 485d04b39555b3f4e2140e833e788adb66b88e75 SHA256 bed1ff273f079ca7e4656641143a9d52c3cdaaf4ba7f59de369a683dfdc00a3b
 MISC metadata.xml 339 RMD160 b003e2b8bb90a2ada8c8ba870aab3e6e73f7de71 SHA1 aa5548496eb75effe84bb3849e0f021cdbeac476 SHA256 019501d6ea5973371f60c6407a8fe9e0cd13daef856182fd2974c5145dd2dfed
diff --git a/games-sports/xmoto/files/xmoto-0.5.1-gcc44.patch b/games-sports/xmoto/files/xmoto-0.5.1-gcc44.patch
new file mode 100644
index 000000000000..696f8e352611
--- /dev/null
+++ b/games-sports/xmoto/files/xmoto-0.5.1-gcc44.patch
@@ -0,0 +1,37 @@
+diff -urp xmoto-0.5.1.orig/src/XMArgs.cpp xmoto-0.5.1/src/XMArgs.cpp
+--- xmoto-0.5.1.orig/src/XMArgs.cpp	2009-05-31 02:43:52.000000000 +0400
++++ xmoto-0.5.1/src/XMArgs.cpp	2009-05-31 02:45:14.000000000 +0400
+@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite
+ #include "VFileIO.h"
+ #include <sstream>
+ #include <stdlib.h>
++#include <stdio.h>
+ 
+ XMArguments::XMArguments() {
+   m_opt_pack   	       = false;
+diff -urp xmoto-0.5.1.orig/src/helpers/Log.cpp xmoto-0.5.1/src/helpers/Log.cpp
+--- xmoto-0.5.1.orig/src/helpers/Log.cpp	2009-05-31 02:43:52.000000000 +0400
++++ xmoto-0.5.1/src/helpers/Log.cpp	2009-05-31 02:47:51.000000000 +0400
+@@ -21,8 +21,9 @@ Foundation, Inc., 59 Temple Place, Suite
+ #include "Log.h"
+ #include "VExcept.h"
+ #include "../VFileIO.h"
+-#include "assert.h"
++#include <assert.h>
+ #include <stdarg.h>
++#include <stdio.h>
+ 
+ bool  Logger::m_isInitialized = false;
+ bool  Logger::m_activ         = true;
+diff -urp xmoto-0.5.1.orig/src/helpers/Text.cpp xmoto-0.5.1/src/helpers/Text.cpp
+--- xmoto-0.5.1.orig/src/helpers/Text.cpp	2009-05-31 02:43:52.000000000 +0400
++++ xmoto-0.5.1/src/helpers/Text.cpp	2009-05-31 02:46:21.000000000 +0400
+@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite
+ =============================================================================*/
+ 
+ #include "Text.h"
++#include <stdio.h>
+ 
+ std::string txtToLower(const std::string& i_str) {
+     std::string v_res;
+Only in xmoto-0.5.1/src: svnVersion
diff --git a/games-sports/xmoto/xmoto-0.5.1.ebuild b/games-sports/xmoto/xmoto-0.5.1.ebuild
index d2b9ccec19ac..db9a640b039e 100644
--- a/games-sports/xmoto/xmoto-0.5.1.ebuild
+++ b/games-sports/xmoto/xmoto-0.5.1.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.1.ebuild,v 1.2 2009/04/13 17:58:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/xmoto-0.5.1.ebuild,v 1.3 2009/05/31 02:33:49 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -45,6 +45,7 @@ src_prepare() {
 		-e '/^gettextsrcdir/s:=.*:= @localedir@/gettext/po:' \
 		po/Makefile.in.in \
 		|| die "sed failed"
+	epatch "${FILESDIR}/${P}-gcc44.patch"
 }
 
 src_configure() {