diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-06-01 04:48:21 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-06-01 04:48:21 +0000 |
| commit | c558496297a69e836d1412e54c3a37e26ed28e06 (patch) | |
| tree | 9eb408b229c3beb4efbe78b9187ee155cef8620c /games-fps | |
| parent | prevent etexec-flags function from rewriting CFLAGS when not using the harden... (diff) | |
| download | gentoo-2-c558496297a69e836d1412e54c3a37e26ed28e06.tar.gz gentoo-2-c558496297a69e836d1412e54c3a37e26ed28e06.tar.bz2 gentoo-2-c558496297a69e836d1412e54c3a37e26ed28e06.zip | |
Add gcc-3.4 patch #49573 by Felix Riemann.
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/prboom/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/prboom/files/2.2.4-gcc34.patch | 11 | ||||
| -rw-r--r-- | games-fps/prboom/prboom-2.2.4.ebuild | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog index dfe07d1cb795..f18e3b4f23a0 100644 --- a/games-fps/prboom/ChangeLog +++ b/games-fps/prboom/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/prboom # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.4 2004/03/10 02:19:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.5 2004/06/01 04:48:21 vapier Exp $ + + 01 Jun 2004; Mike Frysinger <vapier@gentoo.org> +files/2.2.4-gcc34.patch, + prboom-2.2.4.ebuild: + Add gcc-3.4 patch #49573 by Felix Riemann. 09 Mar 2004; Chris Gianelloni <wolf31o2@gentoo.org> prboom-2.2.4.ebuild: Added ~amd64 KEYWORD. Closing bug #44190. diff --git a/games-fps/prboom/files/2.2.4-gcc34.patch b/games-fps/prboom/files/2.2.4-gcc34.patch new file mode 100644 index 000000000000..c9e5284b6a8f --- /dev/null +++ b/games-fps/prboom/files/2.2.4-gcc34.patch @@ -0,0 +1,11 @@ +--- src/p_maputl.h.old 2004-05-28 15:12:50.480520304 +0200 ++++ src/p_maputl.h 2004-05-28 15:07:49.160327936 +0200 +@@ -82,7 +82,7 @@ + void P_SetThingPosition(mobj_t *thing); + boolean P_BlockLinesIterator (int x, int y, boolean func(line_t *)); + boolean P_BlockThingsIterator(int x, int y, boolean func(mobj_t *)); +-boolean ThingIsOnLine(const mobj_t *t, const line_t *l); /* killough 3/15/98 */ ++boolean CONSTFUNC ThingIsOnLine(const mobj_t *t, const line_t *l); /* killough 3/15/98 */ + boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, + int flags, boolean trav(intercept_t *)); + diff --git a/games-fps/prboom/prboom-2.2.4.ebuild b/games-fps/prboom/prboom-2.2.4.ebuild index 8323b1a8b4df..eac3a4361558 100644 --- a/games-fps/prboom/prboom-2.2.4.ebuild +++ b/games-fps/prboom/prboom-2.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.2.4.ebuild,v 1.4 2004/03/10 17:31:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.2.4.ebuild,v 1.5 2004/06/01 04:48:21 vapier Exp $ inherit games eutils gcc @@ -24,6 +24,7 @@ DEPEND="virtual/x11 src_unpack() { unpack ${A} cd ${S} + epatch ${FILESDIR}/${PV}-gcc34.patch ebegin "Detecting NVidia GL/prboom bug" $(gcc-getCC) ${FILESDIR}/${PV}-nvidia-test.c 2> /dev/null local ret=$? @@ -41,7 +42,7 @@ src_compile() { --disable-cpu-opt \ || die # configure script doesnt do opengl properly - [ `use opengl` ] || sed -i '/GL_DOOM/s:.*::' config.h + use opengl || sed -i '/GL_DOOM/s:.*::' config.h emake || die } |