diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2007-07-06 06:24:53 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2007-07-06 06:24:53 +0000 |
| commit | 531b46c7549b76def3805f23e9c5c11c5d288a1e (patch) | |
| tree | d194a8bfec590add8525dc89f6c208a339288fd2 /games-action | |
| parent | Fixed gcc-4.2/namespace issue (bug #162165) (diff) | |
| download | gentoo-2-531b46c7549b76def3805f23e9c5c11c5d288a1e.tar.gz gentoo-2-531b46c7549b76def3805f23e9c5c11c5d288a1e.tar.bz2 gentoo-2-531b46c7549b76def3805f23e9c5c11c5d288a1e.zip | |
Fix bad data path: bug #184363
(Portage version: 2.1.2.9)
Diffstat (limited to 'games-action')
| -rw-r--r-- | games-action/xshipwars/ChangeLog | 6 | ||||
| -rw-r--r-- | games-action/xshipwars/files/xshipwars-2.5.5-build.patch | 17 | ||||
| -rw-r--r-- | games-action/xshipwars/xshipwars-2.5.5.ebuild | 5 |
3 files changed, 26 insertions, 2 deletions
diff --git a/games-action/xshipwars/ChangeLog b/games-action/xshipwars/ChangeLog index 92c584b79cb4..eaf764d146b2 100644 --- a/games-action/xshipwars/ChangeLog +++ b/games-action/xshipwars/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/xshipwars # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/ChangeLog,v 1.17 2007/01/31 19:57:47 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/ChangeLog,v 1.18 2007/07/06 06:24:53 tupone Exp $ + + 06 Jul 2007; Tupone Alfredo <tupone@gentoo.org> + files/xshipwars-2.5.5-build.patch, xshipwars-2.5.5.ebuild: + Fix bad data path: bug #184363 by Ken Rushia 31 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> +files/xshipwars-2.5.5-64bit.patch, xshipwars-2.5.5.ebuild: diff --git a/games-action/xshipwars/files/xshipwars-2.5.5-build.patch b/games-action/xshipwars/files/xshipwars-2.5.5-build.patch index 8e59e35b0a9f..60316cd34350 100644 --- a/games-action/xshipwars/files/xshipwars-2.5.5-build.patch +++ b/games-action/xshipwars/files/xshipwars-2.5.5-build.patch @@ -66,3 +66,20 @@ UNVEDIT_IMAGES_DIR = $(XSW_DATA_DIR)/images/unvedit HR = "-------------------------------------------------------------------------" +--- client/xsw.h.old 2007-07-06 08:02:07.000000000 +0200 ++++ client/xsw.h 2007-07-06 08:04:05.000000000 +0200 +@@ -135,10 +135,10 @@ + #define XSW_DEF_SW_SERVER_DIR CWD_STR + #else + #define XSW_DEF_LOCAL_DATA_DIR ".shipwars" +-#define XSW_DEF_GLOBAL_DATA_DIR PREFIX "/share/games/xshipwars" +-#define XSW_DEF_GLOBAL_IMAGES_DIR PREFIX "/share/games/xshipwars/images" +-#define XSW_DEF_GLOBAL_SOUNDS_DIR PREFIX "/share/games/xshipwars/sounds" +-#define XSW_DEF_GLOBAL_ETC_DIR PREFIX "/share/games/xshipwars/etc" ++#define XSW_DEF_GLOBAL_DATA_DIR "@GENTOO_DATADIR@" ++#define XSW_DEF_GLOBAL_IMAGES_DIR "@GENTOO_DATADIR@/images" ++#define XSW_DEF_GLOBAL_SOUNDS_DIR "@GENTOO_DATADIR@/sounds" ++#define XSW_DEF_GLOBAL_ETC_DIR "@GENTOO_DATADIR@/etc" + #define XSW_DEF_SW_SERVER_DIR "/home/swserv" + #endif + diff --git a/games-action/xshipwars/xshipwars-2.5.5.ebuild b/games-action/xshipwars/xshipwars-2.5.5.ebuild index 5b462b19f6fd..a2f894ce6ad2 100644 --- a/games-action/xshipwars/xshipwars-2.5.5.ebuild +++ b/games-action/xshipwars/xshipwars-2.5.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-2.5.5.ebuild,v 1.3 2007/01/31 19:57:47 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-2.5.5.ebuild,v 1.4 2007/07/06 06:24:53 tupone Exp $ inherit toolchain-funcs eutils games @@ -35,6 +35,9 @@ src_unpack() { -e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \ -e "/^DATADIR/s:=.*:=${GAMES_DATADIR}:" \ */Makefile.install.UNIX || die + sed -i \ + -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \ + client/xsw.h || die "sed on xsw.h failed" } src_compile() { |