diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2007-06-13 18:53:14 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2007-06-13 18:53:14 +0000 |
| commit | a3de5eb52feeee01ab30b63f45d222b9b855edf4 (patch) | |
| tree | 61b850d30abb2ef3a2a11acfb6708fdfb59ffa93 /games-fps | |
| parent | Version bump (diff) | |
| download | gentoo-2-a3de5eb52feeee01ab30b63f45d222b9b855edf4.tar.gz gentoo-2-a3de5eb52feeee01ab30b63f45d222b9b855edf4.tar.bz2 gentoo-2-a3de5eb52feeee01ab30b63f45d222b9b855edf4.zip | |
Patch for gcc-4.2
(Portage version: 2.1.2.9)
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/blackshades-cvs/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/blackshades-cvs/blackshades-cvs-20031110-r1.ebuild | 8 | ||||
| -rw-r--r-- | games-fps/blackshades-cvs/files/blackshades-cvs-gcc42.patch | 35 |
3 files changed, 45 insertions, 4 deletions
diff --git a/games-fps/blackshades-cvs/ChangeLog b/games-fps/blackshades-cvs/ChangeLog index ceda756d9518..5598c4acb56a 100644 --- a/games-fps/blackshades-cvs/ChangeLog +++ b/games-fps/blackshades-cvs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/blackshades-cvs # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades-cvs/ChangeLog,v 1.14 2007/03/07 16:51:30 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades-cvs/ChangeLog,v 1.15 2007/06/13 18:53:14 nyhm Exp $ + + 13 Jun 2007; Tristan Heaven <nyhm@gentoo.org> + +files/blackshades-cvs-gcc42.patch, blackshades-cvs-20031110-r1.ebuild: + Patch for gcc-4.2 07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> blackshades-cvs-20031110-r1.ebuild: diff --git a/games-fps/blackshades-cvs/blackshades-cvs-20031110-r1.ebuild b/games-fps/blackshades-cvs/blackshades-cvs-20031110-r1.ebuild index 1d599aa3eb64..e5e107f19280 100644 --- a/games-fps/blackshades-cvs/blackshades-cvs-20031110-r1.ebuild +++ b/games-fps/blackshades-cvs/blackshades-cvs-20031110-r1.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-fps/blackshades-cvs/blackshades-cvs-20031110-r1.ebuild,v 1.4 2007/03/07 16:51:30 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/blackshades-cvs/blackshades-cvs-20031110-r1.ebuild,v 1.5 2007/06/13 18:53:14 nyhm Exp $ #ECVS_PASS="anonymous" #ECVS_SERVER="icculus.org:/cvs/cvsroot" @@ -39,7 +39,7 @@ src_unpack() { rm -rf Data/Textures mv "${WORKDIR}"/Textures Data/ || die "mv failed" sed -i \ - -e "/^CFLAGS/s:$: ${CFLAGS}:" Makefile \ + -e "/^CFLAGS/s:-O2 -Wall -g:-Wall ${CXXFLAGS}:" Makefile \ || die "sed Makefile failed" find "${S}" -type d -name CVS -exec rm -rf \{\} \; 2> /dev/null find "${S}/Data/Textures" -type f -name ".*" -exec rm -f \{\} \; @@ -49,7 +49,9 @@ src_unpack() { sed -i \ -e "/glut.h/d" Source/Decals.h \ || die "removing glut include failed" - epatch "${FILESDIR}"/${PN}-freealut.patch + epatch \ + "${FILESDIR}"/${PN}-freealut.patch \ + "${FILESDIR}"/${PN}-gcc42.patch } src_install() { diff --git a/games-fps/blackshades-cvs/files/blackshades-cvs-gcc42.patch b/games-fps/blackshades-cvs/files/blackshades-cvs-gcc42.patch new file mode 100644 index 000000000000..fecf8f67d82c --- /dev/null +++ b/games-fps/blackshades-cvs/files/blackshades-cvs-gcc42.patch @@ -0,0 +1,35 @@ +--- Source/GameDraw.cpp ++++ Source/GameDraw.cpp +@@ -36,7 +36,7 @@ + + /*********************> DrawGLScene() <*****/ + +-int Game::DrawGLScene(GLvoid) ++int Game::DrawGLScene(void) + + { + +--- Source/Game.h ++++ Source/Game.h +@@ -75,8 +75,8 @@ + + //GL functions + GLvoid ReSizeGLScene(float fov, float near); +- int DrawGLScene(GLvoid); +- int InitGL(GLvoid); ++ int DrawGLScene(void); ++ int InitGL(void); + void LoadingScreen(float percent); + + //Game Functions +--- Source/GameInitDispose.cpp ++++ Source/GameInitDispose.cpp +@@ -3913,7 +3913,7 @@ + + + +-int Game::InitGL(GLvoid) ++int Game::InitGL(void) + + { + |