diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-10-14 21:08:56 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-10-14 21:08:56 +0000 |
| commit | b01143a37b5aa132eeb0684f8942302435fd9005 (patch) | |
| tree | 10ef1976f7983d27f83cc7286098797325232747 /games-fps | |
| parent | old (diff) | |
| download | gentoo-2-b01143a37b5aa132eeb0684f8942302435fd9005.tar.gz gentoo-2-b01143a37b5aa132eeb0684f8942302435fd9005.tar.bz2 gentoo-2-b01143a37b5aa132eeb0684f8942302435fd9005.zip | |
Fix building with sanitized kernel headers #187083 by Colin Macdonald.
(Portage version: 2.1.3.12)
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/quakeforge/ChangeLog | 8 | ||||
| -rw-r--r-- | games-fps/quakeforge/files/quakeforge-0.5.5-no-page-size.patch | 15 | ||||
| -rw-r--r-- | games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild | 18 |
3 files changed, 32 insertions, 9 deletions
diff --git a/games-fps/quakeforge/ChangeLog b/games-fps/quakeforge/ChangeLog index ddc06ab34dae..3f642c17f1a4 100644 --- a/games-fps/quakeforge/ChangeLog +++ b/games-fps/quakeforge/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/quakeforge -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.17 2007/07/08 22:36:21 tupone Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.18 2007/10/14 21:08:56 vapier Exp $ + + 14 Oct 2007; Mike Frysinger <vapier@gentoo.org> + +files/quakeforge-0.5.5-no-page-size.patch, quakeforge-0.5.5-r2.ebuild: + Fix building with sanitized kernel headers #187083 by Colin Macdonald. *quakeforge-0.5.5-r2 (08 Jul 2007) diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-no-page-size.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-no-page-size.patch new file mode 100644 index 000000000000..c18ec176fbf8 --- /dev/null +++ b/games-fps/quakeforge/files/quakeforge-0.5.5-no-page-size.patch @@ -0,0 +1,15 @@ +do not use kernel headers' asm/page.h + +http://bugs.gentoo.org/187083 + +--- libs/video/targets/vid_fbdev.c ++++ libs/video/targets/vid_fbdev.c +@@ -58,7 +58,7 @@ + #include <signal.h> + #include <stdio.h> + #include <stdlib.h> +-#include <asm/page.h> ++#define PAGE_MASK sysconf(_SC_PAGE_SIZE) + #include <linux/kd.h> + #include <linux/vt.h> + #include <sys/stat.h> diff --git a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild index e333c5e1f25a..5022025af8b3 100644 --- a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild +++ b/games-fps/quakeforge/quakeforge-0.5.5-r2.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/quakeforge/quakeforge-0.5.5-r2.ebuild,v 1.1 2007/07/08 22:36:21 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild,v 1.2 2007/10/14 21:08:56 vapier Exp $ inherit eutils autotools games @@ -21,14 +21,16 @@ RDEPEND="3dfx? ( media-libs/glide-v3 ) X? ( x11-libs/libX11 x11-libs/libXext - x11-libs/libXxf86vm ) + x11-libs/libXxf86vm + ) ncurses? ( sys-libs/ncurses ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) xv? ( x11-libs/libX11 x11-libs/libXext - x11-libs/libXxf86vm ) + x11-libs/libXxf86vm + ) dga? ( x11-libs/libXxf86dga ) alsa? ( media-libs/alsa-lib )" DEPEND="${RDEPEND} @@ -39,10 +41,12 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${PV}"-ipv6.patch \ - "${FILESDIR}/${P}"-gcc41.patch \ - "${FILESDIR}/${P}"-keys.patch \ - "${FILESDIR}/${P}"-amd64.patch + epatch \ + "${FILESDIR}"/${P}-no-page-size.patch \ + "${FILESDIR}"/${PV}-ipv6.patch \ + "${FILESDIR}"/${P}-gcc41.patch \ + "${FILESDIR}"/${P}-keys.patch \ + "${FILESDIR}"/${P}-amd64.patch } src_compile() { |