diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-05-10 02:22:12 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-05-10 02:22:12 +0000 |
| commit | b0502cceffd68cb5e1f5a919ee9cf5f09e1142ea (patch) | |
| tree | 0c587d6b6a4bbe24c4691bd4e4126018dd35187a /games-fps | |
| parent | Fix inconsistency in JDK versions that caused the build to fail and migrated ... (diff) | |
| download | gentoo-2-b0502cceffd68cb5e1f5a919ee9cf5f09e1142ea.tar.gz gentoo-2-b0502cceffd68cb5e1f5a919ee9cf5f09e1142ea.tar.bz2 gentoo-2-b0502cceffd68cb5e1f5a919ee9cf5f09e1142ea.zip | |
upstream fixups patch
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/alienarena/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/alienarena/alienarena-20100504.ebuild | 3 | ||||
| -rw-r--r-- | games-fps/alienarena/files/alienarena-20100504-fixups.patch | 54 |
3 files changed, 61 insertions, 2 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/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
++
+ }
+
+ /*
|