commit: bae9e3bd15978477f4f14ac01a4fc64786ec3a57 Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Thu Sep 14 03:56:08 2017 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Thu Sep 14 03:56:08 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae9e3bd
sys-apps/pick: fix building against ncurses with split out libtinfo Closes: https://bugs.gentoo.org/630864 sys-apps/pick/files/pick-1.8.0-tinfo.patch | 24 ++++++++++++++++++++++++ sys-apps/pick/pick-1.8.0.ebuild | 10 +++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/sys-apps/pick/files/pick-1.8.0-tinfo.patch b/sys-apps/pick/files/pick-1.8.0-tinfo.patch new file mode 100644 index 00000000000..fec89fb90d4 --- /dev/null +++ b/sys-apps/pick/files/pick-1.8.0-tinfo.patch @@ -0,0 +1,24 @@ +Use pkg-config to determine ncurses libs and cflags to use. Fixes when building +against ncurses with libtinfo split out. + +--- pick-1.8.0/configure.ac ++++ pick-1.8.0/configure.ac +@@ -5,13 +5,10 @@ + AC_PROG_CC + AM_PROG_CC_C_O + AC_CHECK_FUNCS([pledge reallocarray strtonum]) +-AC_SEARCH_LIBS([setupterm], [curses], [], +- [ +- AC_SEARCH_LIBS([setupterm], [ncursesw], +- [AC_DEFINE([HAVE_NCURSESW_H], [1], [Define if ncursesw is available])], +- [AC_MSG_ERROR([unable to find setupterm function])] +- ) +- ] +-) ++PKG_CHECK_MODULES([NCURSES], [ncursesw], ++ [AC_DEFINE([HAVE_NCURSESW_H], [1], [Define if ncursesw is available])], ++ [PKG_CHECK_MODULES([NCURSES], [ncurses])]) ++CFLAGS="$CFLAGS $NCURSES_CFLAGS" ++LIBS="$LIBS $NCURSES_LIBS" + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT diff --git a/sys-apps/pick/pick-1.8.0.ebuild b/sys-apps/pick/pick-1.8.0.ebuild index c1bf032eb81..5354631f457 100644 --- a/sys-apps/pick/pick-1.8.0.ebuild +++ b/sys-apps/pick/pick-1.8.0.ebuild @@ -14,10 +14,14 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="sys-libs/ncurses:0=" -RDEPEND="${DEPEND}" +RDEPEND="sys-libs/ncurses:0=" +DEPEND="${RDEPEND} + virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${P}-cflags.patch ) +PATCHES=( + "${FILESDIR}"/${P}-cflags.patch + "${FILESDIR}"/${P}-tinfo.patch +) src_prepare() { default
