1 |
commit: 846199f922b0b1c92a3f9808222b7bb9962972b7 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 25 20:20:32 2018 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 25 20:21:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846199f9 |
7 |
|
8 |
games-action/bzflag: Fix compiling against sys-libs/ncurses[tinfo] (bug #632022). |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
games-action/bzflag/bzflag-2.4.12.ebuild | 4 ++-- |
13 |
games-action/bzflag/files/bzflag-2.4.12-tinfo.patch | 15 +++++++++++++++ |
14 |
2 files changed, 17 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/games-action/bzflag/bzflag-2.4.12.ebuild b/games-action/bzflag/bzflag-2.4.12.ebuild |
17 |
index 909cc844079..26da58b1979 100644 |
18 |
--- a/games-action/bzflag/bzflag-2.4.12.ebuild |
19 |
+++ b/games-action/bzflag/bzflag-2.4.12.ebuild |
20 |
@@ -1,4 +1,4 @@ |
21 |
-# Copyright 1999-2017 Gentoo Foundation |
22 |
+# Copyright 1999-2018 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
EAPI=6 |
26 |
@@ -24,9 +24,9 @@ DEPEND=" |
27 |
virtual/opengl ) |
28 |
upnp? ( net-libs/miniupnpc )" |
29 |
RDEPEND=${DEPEND} |
30 |
- |
31 |
PATCHES=( |
32 |
"${FILESDIR}"/${P}-configure.patch |
33 |
+ "${FILESDIR}"/${P}-tinfo.patch |
34 |
) |
35 |
|
36 |
src_prepare() { |
37 |
|
38 |
diff --git a/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch b/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch |
39 |
new file mode 100644 |
40 |
index 00000000000..aa43980b9b6 |
41 |
--- /dev/null |
42 |
+++ b/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch |
43 |
@@ -0,0 +1,15 @@ |
44 |
+--- a/configure.ac |
45 |
++++ b/configure.ac |
46 |
+@@ -125,7 +125,11 @@ |
47 |
+ BZ_CONFIGURE_STAGE([arguments], [1 of 9]) |
48 |
+ |
49 |
+ # provide a with-curses option, test for curses |
50 |
+-MP_WITH_CURSES |
51 |
++PKG_CHECK_MODULES(ncurses, ncurses, |
52 |
++ [CURSES_LIB="$ncurses_LIBS"] |
53 |
++ AC_DEFINE(HAVE_NCURSES_H, , [Use the header file ncurses.h]), |
54 |
++ AC_MSG_ERROR([Could not find ncurses])) |
55 |
++AC_SUBST(CURSES_LIB) |
56 |
+ |
57 |
+ # check for SDL option (enabled by default now) |
58 |
+ 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") |