gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

games-misc/robotfindskitten: Fixed build with sys-libs/ncurses[tinfo]

Browse Source 
Closes: https://bugs.gentoo.org/690114
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
2019-07-18 17:01:44 +02:00
parent 8d2041da5a
commit 58e2de5888
3 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch
View File

@@ -1,24 +1,20 @@
--- robotfindskitten-2.7182818.701.orig/nki/Makefile.in
+++ robotfindskitten-2.7182818.701/nki/Makefile.in
@@ -197,7 +197,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
--- robotfindskitten-2.7182818.701/nki/Makefile.am
+++ robotfindskitten-2.7182818.701/nki/Makefile.am
@@ -1,4 +1,4 @@
-nkidir = $(datadir)/games/robotfindskitten
+nkidir = $(datadir)/robotfindskitten
nki_DATA = vanilla.nki
all: all-am
--- robotfindskitten-2.7182818.701.orig/src/Makefile.in
+++ robotfindskitten-2.7182818.701/src/Makefile.in
@@ -199,8 +199,8 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-execgamesdir = $(prefix)/games
uninstall:
--- robotfindskitten-2.7182818.701/src/Makefile.am
+++ robotfindskitten-2.7182818.701/src/Makefile.am
@@ -1,7 +1,7 @@
-execgamesdir= $(prefix)/games
+execgamesdir= $(bindir)
execgames_PROGRAMS=robotfindskitten
-AM_CPPFLAGS = -DSYSTEM_NKI_DIR=\"$(datadir)/games/robotfindskitten\"
+execgamesdir = $(bindir)
+AM_CPPFLAGS = -DSYSTEM_NKI_DIR=\"$(datadir)/robotfindskitten\"
robotfindskitten_SOURCES = robotfindskitten.c
SPLINT_SUPPRESSIONS = +charintliteral +charindex
all: all-am
robotfindskitten_SOURCES= robotfindskitten.c
#robotfindskitten_LDADD= -lncurses

20
games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-tinfo.patch Normal file
View File

@@ -0,0 +1,20 @@
https://bugs.gentoo.org/690114
--- robotfindskitten-2.7182818.701/configure.in
+++ robotfindskitten-2.7182818.701/configure.in
@@ -11,9 +11,14 @@
AC_PROG_CC
AM_PROG_LIBTOOL
AC_PROG_INSTALL
+PKG_PROG_PKG_CONFIG
dnl Checks for libraries.
-AC_CHECK_LIB(ncurses, initscr, ,curses)
+PKG_CHECK_MODULES(NCURSES, ncurses, [
+ LIBS="$LIBS $NCURSES_LIBS"
+ ],[
+ AC_MSG_ERROR([Cannot find ncurses lib])
+ ])
dnl Checks for header files.
AC_CHECK_HEADERS(signal.h)

18
games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild
View File

@@ -1,8 +1,9 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils
EAPI=7
inherit autotools
DESCRIPTION="Help robot find kitten"
HOMEPAGE="http://robotfindskitten.org/"
@@ -13,13 +14,20 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="sys-libs/ncurses:0"
RDEPEND=${DEPEND}
DEPEND="sys-libs/ncurses:0="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-tinfo.patch
)
src_prepare() {
default
eautoreconf
}
src_install() {
DOCS="AUTHORS BUGS ChangeLog NEWS" \
default