upstream fixups patch

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

4 files changed, 64 insertions, 4 deletions

diff --git a/games-fps/alienarena/ChangeLog b/games-fps/alienarena/ChangeLog
index 60f3c95d35ae..0617964e2fd5 100644
--- a/games-fps/alienarena/ChangeLog
+++ b/games-fps/alienarena/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/alienarena
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.19 2010/05/07 18:10:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.20 2010/05/10 02:22:11 mr_bones_ Exp $
+
+  10 May 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  alienarena-20100504.ebuild, +files/alienarena-20100504-fixups.patch:
+  upstream fixups patch
 
 *alienarena-20100504 (07 May 2010)
 
diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
index ed233186fce5..48f542de0753 100644
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -1,7 +1,8 @@
 AUX alienarena-20091227-jpeg8.patch 520 RMD160 78db549899420db6c7fce5ec329f408a8c15f5fc SHA1 5d2b21abaaac94356a9d5c7ac69b18b0561f983e SHA256 d7d67c026b17537658078dc45fe3c10f09e4a624787126d6ed6b22e7513553bc
+AUX alienarena-20100504-fixups.patch 1593 RMD160 0dda6b277581067fa288f9b1e2273461e4777533 SHA1 13e419221e765c119ef762605ed0514b5eafb536 SHA256 f302d4b7d32cc91f7a0f2ae1ba71f18e1a675b4adb2d118424802991ff6e64ff
 DIST alienarena-linux20100504.zip 352048649 RMD160 06eb5bffaa7055aaa92e8f707bc2b8b685376030 SHA1 118b3d469c7462f7838950ff319ca39b107706b2 SHA256 731dd7f6f5b3f531ac289a8ed4303512bb182c51a3c41d803d81c26c545c9bf1
 DIST alienarena7_33-linux20091227.zip 299663490 RMD160 52b16d43bb8eee04567242440360df929b5be05a SHA1 6e02ae715ee0203d9adbe7898dcafd48c8bd6936 SHA256 5d5ab6ab16a8c277035b7b2cbeba96ba6f3cbcb14aa84217c9b41f54b3f6df74
 EBUILD alienarena-20091227.ebuild 2233 RMD160 ed134af25500fa4d2befc5062866b5550f306577 SHA1 e2bb3a47dc53d30bb5d79feddeeb935195b14ab3 SHA256 f975615a514107db717eca9f9e30f78450171804c9d2f29025e6a2d86fb3cf6d
-EBUILD alienarena-20100504.ebuild 2194 RMD160 d9ff98005ccea053524155b95aec0bf0cd6e86f5 SHA1 c08f891b90d9d0e88bfcbaa3c05395dfdd6e9651 SHA256 9fab428840100a336c6405fc86bab01f8f0eeae572cc7c6e9325cf327dfb05cb
-MISC ChangeLog 3348 RMD160 6c11e86315a0ddc0b0756a481feb8257ce2fee4d SHA1 db7787b247a649c90c10765f5d836947fe6d5095 SHA256 c90761496e2a8dfd3f5d4e379d289c858c8d1ea8f6bcb6a1f19dcb829d8f9a64
+EBUILD alienarena-20100504.ebuild 2234 RMD160 cf4ac9712b4e9b18cd5b442279c91e7463763ee3 SHA1 d7a7b04cc131dfe9dfee4cf3ce2d6a38656ec2ea SHA256 d5f5a5ceff54f05b14810eacb70b8813de54646dd686bf429b978cd6f574f2e2
+MISC ChangeLog 3499 RMD160 4b5d850da712d2efad899e8e321aebbcd3d04f10 SHA1 d543d187c8fc49e1dfeb6dbc9a664996ec413c7e SHA256 24fd9065be7f7747d9bb80fce327783249ef07701b3e31e1d8f7c6b1c17d9841
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-fps/alienarena/alienarena-20100504.ebuild b/games-fps/alienarena/alienarena-20100504.ebuild
index 3279b78c902e..8ad2e8c4c28a 100644
--- a/games-fps/alienarena/alienarena-20100504.ebuild
+++ b/games-fps/alienarena/alienarena-20100504.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20100504.ebuild,v 1.1 2010/05/07 18:10:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20100504.ebuild,v 1.2 2010/05/10 02:22:11 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -41,6 +41,7 @@ src_prepare() {
 		-e 's:\($(SHLIBLDFLAGS)\):$(LDFLAGS) \1:' \
 		Makefile \
 		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-fixups.patch
 }
 
 src_compile() {
diff --git a/games-fps/alienarena/files/alienarena-20100504-fixups.patch b/games-fps/alienarena/files/alienarena-20100504-fixups.patch
new file mode 100644
index 000000000000..f5eb279f64ec
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20100504-fixups.patch
@@ -0,0 +1,54 @@
+diff -ru alienarena7_40.orig/source/client/cl_scrn.c alienarena7_40/source/client/cl_scrn.c
+--- alienarena7_40.orig/source/client/cl_scrn.c	2010-03-20 17:18:58.000000000 -0400
++++ alienarena7_40/source/client/cl_scrn.c	2010-05-02 14:36:49.000000000 -0400
+@@ -1306,7 +1306,7 @@
+ 				value = cl.frame.playerstate.stats[atoi(token)];
+ 				if (value >= MAX_IMAGES)
+ 					Com_Error (ERR_DROP, "Pic >= MAX_IMAGES");
+-				if (cl.configstrings[CS_IMAGES+value])
++				if( cl.configstrings[CS_IMAGES+value][0] )
+ 				{
+ 					SCR_AddDirtyPoint (x, y);
+ 					SCR_AddDirtyPoint (x+23*scale, y+23*scale);
+diff -ru alienarena7_40.orig/source/game/p_weapon.c alienarena7_40/source/game/p_weapon.c
+--- alienarena7_40.orig/source/game/p_weapon.c	2010-03-12 23:22:38.000000000 -0500
++++ alienarena7_40/source/game/p_weapon.c	2010-05-02 14:36:49.000000000 -0400
+@@ -175,6 +175,21 @@
+ 

+ 	game = gi.cvar("game", "", 0);

+ 

++#ifdef DATADIR

++	if ( game && *game->string ) {

++		sprintf( name, DATADIR"/%s/%s", game->string, filename );

++		*file = fopen( name, "rb" );

++		if( *file )

++			return 1;

++	}

++	sprintf( name, "%s/%s/%s", DATADIR, GAMEVERSION, filename );

++	*file = fopen (name, "rb");

++	if( *file )

++		return 1;

++

++	return -1;

++#else

++

+ 	if (!*game->string) //if there is a gamedir try here first

+ 		sprintf (name, "%s/%s", GAMEVERSION, filename);

+ 	else

+@@ -188,6 +203,7 @@
+ 	else

+ 		return 1;

+ 

++

+ 	if(!found) { //try basedir

+ 		sprintf (name, "%s/%s", GAMEVERSION, filename);

+ 		*file = fopen (name, "rb");

+@@ -200,6 +216,8 @@
+ 	}

+ 	else

+ 		return -1;

++#endif

++

+ }

+ 

+ /*