diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-05-05 17:03:37 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-05-05 17:03:37 +0000 |
| commit | 8f2926c55e6a7713f4059ec5a37627ef890ff6e9 (patch) | |
| tree | f66259081bfa415dcb19572dfd4d83eddf50932c /games-arcade | |
| parent | Fixed for gcc-4.5, thanks Xarthisius, bug #318575 (diff) | |
| download | gentoo-2-8f2926c55e6a7713f4059ec5a37627ef890ff6e9.tar.gz gentoo-2-8f2926c55e6a7713f4059ec5a37627ef890ff6e9.tar.bz2 gentoo-2-8f2926c55e6a7713f4059ec5a37627ef890ff6e9.zip | |
Don't try to look in pwd for a 'data' directory (bug #318005)
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/slimevolley/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/slimevolley/files/slimevolley-2.4.1-nodatalocal.patch | 23 | ||||
| -rw-r--r-- | games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild | 5 |
3 files changed, 31 insertions, 3 deletions
diff --git a/games-arcade/slimevolley/ChangeLog b/games-arcade/slimevolley/ChangeLog index 536097e77edc..e3adc1549335 100644 --- a/games-arcade/slimevolley/ChangeLog +++ b/games-arcade/slimevolley/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/slimevolley # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/slimevolley/ChangeLog,v 1.3 2010/05/01 20:11:21 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/slimevolley/ChangeLog,v 1.4 2010/05/05 17:03:36 mr_bones_ Exp $ + + 05 May 2010; Michael Sterrett <mr_bones_@gentoo.org> + slimevolley-2.4.1-r1.ebuild, +files/slimevolley-2.4.1-nodatalocal.patch: + Don't try to look in pwd for a "data" directory (bug #318005) *slimevolley-2.4.1-r1 (01 May 2010) diff --git a/games-arcade/slimevolley/files/slimevolley-2.4.1-nodatalocal.patch b/games-arcade/slimevolley/files/slimevolley-2.4.1-nodatalocal.patch new file mode 100644 index 000000000000..a1ab7616a645 --- /dev/null +++ b/games-arcade/slimevolley/files/slimevolley-2.4.1-nodatalocal.patch @@ -0,0 +1,23 @@ +diff -ru slimevolley-2.4.1.orig/src/themes_std.c slimevolley-2.4.1/src/themes_std.c +--- slimevolley-2.4.1.orig/src/themes_std.c 2008-11-30 04:36:52.000000000 -0500 ++++ slimevolley-2.4.1/src/themes_std.c 2010-05-05 13:00:23.875723904 -0400 +@@ -30,7 +30,6 @@ + #include "audio.h" + #include "themes.h" + +-#define DATA_LOCAL "data" + #define DOSS_THEMES "themes" + #define DOSS_SLIMES "slimes" + #define SLIME_D_NOM "slimeJD%d.png" +@@ -74,10 +73,7 @@ + chemin[0] = '\0'; + + if(var_env == NULL) { +- if(access(DATA_LOCAL, R_OK | X_OK) == 0) { +- strncpy(chemin, DATA_LOCAL, sizeof(chemin) - 1); +- +- } else if(access(DATA_DIR, R_OK | X_OK) == 0) { ++ if(access(DATA_DIR, R_OK | X_OK) == 0) { + strncpy(chemin, DATA_DIR, sizeof(chemin) - 1); + } + diff --git a/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild b/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild index 6ad9e00aebc8..7de594f2d475 100644 --- a/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild +++ b/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild,v 1.1 2010/05/01 20:11:21 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild,v 1.2 2010/05/05 17:03:36 mr_bones_ Exp $ EAPI=2 -inherit cmake-utils games +inherit cmake-utils eutils games DESCRIPTION="A simple volleyball game" HOMEPAGE="http://slime.tuxfamily.org/index.php" @@ -32,6 +32,7 @@ src_prepare() { sed -i \ -e "/DESTINATION/s:games:${GAMES_BINDIR}:" \ CMakeLists.txt || die + epatch "${FILESDIR}"/${P}-nodatalocal.patch # bug #318005 } src_configure() { |