summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2012-04-01 17:08:10 +0000
committerAlfredo Tupone <tupone@gentoo.org>2012-04-01 17:08:10 +0000
commit70857320b42a864f011298d3a4f357a85f1a2fec (patch)
tree2b416503b6e9936cd8d8650f658dd036d6b4eaf5 /games-fps/quake2-icculus
parentalpha/ia64/s390/sh/sparc stable wrt #408385 (diff)
downloadgentoo-2-70857320b42a864f011298d3a4f357a85f1a2fec.tar.gz
gentoo-2-70857320b42a864f011298d3a4f357a85f1a2fec.tar.bz2
gentoo-2-70857320b42a864f011298d3a4f357a85f1a2fec.zip
Fix run on amd64. Bug #158415
(Portage version: 2.1.10.52/cvs/Linux i686)
Diffstat (limited to 'games-fps/quake2-icculus')
-rw-r--r--games-fps/quake2-icculus/ChangeLog7
-rw-r--r--games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch13
-rw-r--r--games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild5
3 files changed, 22 insertions, 3 deletions
diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index 4df46fbabb65..b03d012f7586 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-fps/quake2-icculus
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.43 2012/03/28 22:32:18 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.44 2012/04/01 17:08:10 tupone Exp $
+
+ 01 Apr 2012; Tupone Alfredo <tupone@gentoo.org>
+ quake2-icculus-0.16.1-r1.ebuild,
+ +files/quake2-icculus-0.16.1-gnusource.patch:
+ Fix run on amd64. Bug #158415 by B Douglas Hilton
28 Mar 2012; Tupone Alfredo <tupone@gentoo.org>
quake2-icculus-0.16.1-r1.ebuild, +files/quake2-icculus-0.16.1-alsa.patch:
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
new file mode 100644
index 000000000000..cc7c8451293b
--- /dev/null
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
@@ -0,0 +1,13 @@
+diff -Naur quake2-r0.16.1/src/linux/q_shlinux.c quake2-r0.16.1-modified/src/linux/q_shlinux.c
+--- quake2-r0.16.1/src/linux/q_shlinux.c 2002-02-09 17:09:23.000000000 -0500
++++ quake2-r0.16.1-modified/src/linux/q_shlinux.c 2007-06-26 13:40:25.000000000 -0400
+@@ -17,6 +17,9 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ */
++#if !defined(_GNU_SOURCE)
++ #define _GNU_SOURCE
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <errno.h>
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index 0186fcef5b33..5663f4cf5ad6 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.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/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.24 2012/03/28 22:32:18 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.25 2012/04/01 17:08:10 tupone Exp $
EAPI=2
inherit eutils toolchain-funcs games
@@ -15,7 +15,7 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="ppc sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc sparc x86 ~x86-fbsd"
IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl svga X xatrix"
UIDEPEND="aalib? ( media-libs/aalib )
@@ -80,6 +80,7 @@ src_prepare() {
"${FILESDIR}"/${P}-gentoo-paths.patch \
"${FILESDIR}"/${P}-ldflags.patch \
"${FILESDIR}"/${P}-no-asm-io.patch \
+ "${FILESDIR}"/${P}-gnusource.patch \
"${FILESDIR}"/${P}-alsa.patch
if use xatrix ; then