app-misc/abook: Fix link to tinfo and vformat

Closes: https://bugs.gentoo.org/679322
Bug: https://bugs.gentoo.org/699968
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Cédric Krier <cedk@gentoo.org>
This commit is contained in:
Cédric Krier
2020-05-24 19:23:00 +02:00
parent 644b0903d1
commit 4005f7db3a
4 changed files with 18 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -28,6 +28,7 @@ S="${WORKDIR}/${MY_P}"
DOCS=( BUGS ChangeLog FAQ README TODO sample.abookrc )
PATCHES=(
"${FILESDIR}"/${PN}-0.6.1-tinfo.patch
"${FILESDIR}"/${PN}-0.6.1-vformat.patch
)
src_prepare() {

View File

@@ -4,7 +4,7 @@
AC_CHECK_LIB(ncursesw, initscr,
[LIBS="$LIBS -lncursesw"
+ AC_SEARCH_LIBS(cbreak, tinfo)
+ AC_SEARCH_LIBS(cbreak, tinfow, LIBS="$LIBS -ltinfow")
if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
fi
@@ -12,7 +12,7 @@
ac_widec_possible=no
AC_CHECK_LIB(ncurses, initscr,
[LIBS="$LIBS -lncurses"
+ AC_SEARCH_LIBS(cbreak, tinfo)
+ AC_SEARCH_LIBS(cbreak, tinfo, LIBS="$LIBS -ltinfo")
if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
fi

View File

@@ -0,0 +1,11 @@
diff -ru abook-0.6.1.orig/configure.ac abook-0.6.1/configure.ac
--- abook-0.6.1.orig/configure.ac 2020-05-24 19:10:09.826143646 +0200
+++ abook-0.6.1/configure.ac 2020-05-24 19:10:52.088381318 +0200
@@ -140,6 +140,7 @@
if test x$vformat = xtrue; then
AC_CHECK_HEADER([vf_iface.h], [
AC_CHECK_LIB([vformat], [vf_read_file], [
+ LIBS="$LIBS -lvformat"
MODULES="$MODULES m_vcf"
AC_DEFINE(HAVE_VFORMAT,1,[Defined if the vformat library is available])
have_vformat=yes

View File

@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<email>cedk@gentoo.org</email>
</maintainer>
<longdescription>abook is a text-based addressbook program for the mutt mail client.</longdescription>
<upstream>
<remote-id type="sourceforge">abook</remote-id>