diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-10-12 12:30:54 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-10-12 12:30:54 +0000 |
| commit | aca600c2cbc8925c7cbe377eb81c340e89afa9f5 (patch) | |
| tree | 66075093a2a76a69c04a36a46c582d4a2d296331 /games-fps/warsow | |
| parent | stable ppc ppc64, bug #437184 (diff) | |
| download | gentoo-2-aca600c2cbc8925c7cbe377eb81c340e89afa9f5.tar.gz gentoo-2-aca600c2cbc8925c7cbe377eb81c340e89afa9f5.tar.bz2 gentoo-2-aca600c2cbc8925c7cbe377eb81c340e89afa9f5.zip | |
make patch upstream compatible
(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)
Diffstat (limited to 'games-fps/warsow')
| -rw-r--r-- | games-fps/warsow/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/warsow/files/warsow-1.01-build.patch | 17 | ||||
| -rw-r--r-- | games-fps/warsow/warsow-1.01.ebuild | 6 |
3 files changed, 8 insertions, 21 deletions
diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog index 2a061881f5ba..fdfa855ff695 100644 --- a/games-fps/warsow/ChangeLog +++ b/games-fps/warsow/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/warsow # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.40 2012/10/11 15:39:24 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.41 2012/10/12 12:30:54 hasufell Exp $ + + 12 Oct 2012; Julian Ospald <hasufell@gentoo.org> warsow-1.01.ebuild, + files/warsow-1.01-build.patch: + make patch upstream compatible *warsow-1.01 (11 Oct 2012) diff --git a/games-fps/warsow/files/warsow-1.01-build.patch b/games-fps/warsow/files/warsow-1.01-build.patch index 6b5b5b5dc461..003c391f6721 100644 --- a/games-fps/warsow/files/warsow-1.01-build.patch +++ b/games-fps/warsow/files/warsow-1.01-build.patch @@ -46,23 +46,6 @@ g) address parallel make issues else BINDIR=release endif -@@ -116,14 +116,14 @@ - LIBROCKET_DIR=../libsrcs/libRocket/libRocket - LIBROCKET_MAKEFILE=Makefile.warsow - LIBROCKET_INC=$(LIBROCKET_DIR)/Include --LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a -+LIBROCKET_LIB=$(LIBROCKET_DIR)/bin/libRocketWSW.a - - CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC) - # add the base of ui to inclusions - CFLAGS_ROCKET+=-Iui - - # static link to custombuilt lib --LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype -+LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/bin -lRocketWSW -lfreetype - # dynamic link to 'official' build - # LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/Build -lRocketCore -lRocketControls -lfreetype - @@ -196,8 +196,8 @@ X11BASE?=/usr/X11R6 diff --git a/games-fps/warsow/warsow-1.01.ebuild b/games-fps/warsow/warsow-1.01.ebuild index e2e755b93acf..aa7c9ffc871f 100644 --- a/games-fps/warsow/warsow-1.01.ebuild +++ b/games-fps/warsow/warsow-1.01.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.01.ebuild,v 1.1 2012/10/11 15:39:24 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.01.ebuild,v 1.2 2012/10/12 12:30:54 hasufell Exp $ EAPI=4 inherit eutils check-reqs gnome2-utils games @@ -107,14 +107,14 @@ src_compile() { emake \ BASE_ARCH=${arch} \ - BINDIR=bin \ + BINDIR=lib \ BUILD_ANGELWRAP=$(yesno angelscript) \ DEBUG_BUILD=$(yesno debug) \ ${myconf[@]} } src_install() { - cd bin + cd lib if ! use dedicated ; then newgamesbin ${PN}.* ${PN} |