summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2018-02-25 21:20:32 +0100
committerJeroen Roovers <jer@gentoo.org>2018-02-25 21:21:21 +0100
commit846199f922b0b1c92a3f9808222b7bb9962972b7 (patch)
tree41e8862ee88effba44f0db357b61359c76222385 /games-action
parentmedia-fonts/clearsans: x86 stable (bug #648078) (diff)
downloadgentoo-846199f922b0b1c92a3f9808222b7bb9962972b7.tar.gz
gentoo-846199f922b0b1c92a3f9808222b7bb9962972b7.tar.bz2
gentoo-846199f922b0b1c92a3f9808222b7bb9962972b7.zip
games-action/bzflag: Fix compiling against sys-libs/ncurses[tinfo] (bug #632022).
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'games-action')
-rw-r--r--games-action/bzflag/bzflag-2.4.12.ebuild4
-rw-r--r--games-action/bzflag/files/bzflag-2.4.12-tinfo.patch15
2 files changed, 17 insertions, 2 deletions
diff --git a/games-action/bzflag/bzflag-2.4.12.ebuild b/games-action/bzflag/bzflag-2.4.12.ebuild
index 909cc844079..26da58b1979 100644
--- a/games-action/bzflag/bzflag-2.4.12.ebuild
+++ b/games-action/bzflag/bzflag-2.4.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,9 +24,9 @@ DEPEND="
virtual/opengl )
upnp? ( net-libs/miniupnpc )"
RDEPEND=${DEPEND}
-
PATCHES=(
"${FILESDIR}"/${P}-configure.patch
+ "${FILESDIR}"/${P}-tinfo.patch
)
src_prepare() {
diff --git a/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch b/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch
new file mode 100644
index 00000000000..aa43980b9b6
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,7 +125,11 @@
+ BZ_CONFIGURE_STAGE([arguments], [1 of 9])
+
+ # provide a with-curses option, test for curses
+-MP_WITH_CURSES
++PKG_CHECK_MODULES(ncurses, ncurses,
++ [CURSES_LIB="$ncurses_LIBS"]
++ AC_DEFINE(HAVE_NCURSES_H, , [Use the header file ncurses.h]),
++ AC_MSG_ERROR([Could not find ncurses]))
++AC_SUBST(CURSES_LIB)
+
+ # check for SDL option (enabled by default now)
+ AC_ARG_WITH(SDL, AS_HELP_STRING([--without-SDL | --with-SDL={1,2}],[Do not use Simple DirectMedia Layer or force using a specific version (by default tries 2, then 1, then resorts to native platform code if available]), sdl_version="$withval", sdl_version="detect")