* [gentoo-commits] repo/gentoo:master commit in: app-misc/abook/, app-misc/abook/files/
@ 2018-03-02 10:14 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2018-03-02 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 693c7eae47ff7bee2bd2a0eb1fe5dfaa4a3c6fd6
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 2 10:14:16 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 10:14:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=693c7eae
app-misc/abook: Fix building against sys-libs/ncurses[tinfo] (bug #606478).
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-misc/abook/abook-0.6.1-r1.ebuild | 7 ++++---
app-misc/abook/files/abook-0.6.1-tinfo.patch | 18 ++++++++++++++++++
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/app-misc/abook/abook-0.6.1-r1.ebuild b/app-misc/abook/abook-0.6.1-r1.ebuild
index 4d1dccd13b8..37e0289c6c3 100644
--- a/app-misc/abook/abook-0.6.1-r1.ebuild
+++ b/app-misc/abook/abook-0.6.1-r1.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
@@ -26,11 +26,12 @@ DEPEND="nls? ( sys-devel/gettext )"
S="${WORKDIR}/${MY_P}"
DOCS=( BUGS ChangeLog FAQ README TODO sample.abookrc )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.6.1-tinfo.patch
+)
src_prepare() {
default
-
- # TODO: do the right thing and find out whats wrong with Makefile.in
eautoreconf
}
diff --git a/app-misc/abook/files/abook-0.6.1-tinfo.patch b/app-misc/abook/files/abook-0.6.1-tinfo.patch
new file mode 100644
index 00000000000..e8c4585dbcb
--- /dev/null
+++ b/app-misc/abook/files/abook-0.6.1-tinfo.patch
@@ -0,0 +1,18 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,6 +86,7 @@
+
+ AC_CHECK_LIB(ncursesw, initscr,
+ [LIBS="$LIBS -lncursesw"
++ AC_SEARCH_LIBS(cbreak, tinfo)
+ if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+ fi
+@@ -93,6 +94,7 @@
+ ac_widec_possible=no
+ AC_CHECK_LIB(ncurses, initscr,
+ [LIBS="$LIBS -lncurses"
++ AC_SEARCH_LIBS(cbreak, tinfo)
+ if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+ fi
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/abook/, app-misc/abook/files/
@ 2020-05-24 17:24 Cédric Krier
0 siblings, 0 replies; 2+ messages in thread
From: Cédric Krier @ 2020-05-24 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 4005f7db3a9be036144792e24e1ab8446b52f3a2
Author: Cédric Krier <cedk <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 17:23:00 2020 +0000
Commit: Cédric Krier <cedk <AT> gentoo <DOT> org>
CommitDate: Sun May 24 17:23:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4005f7db
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 <AT> gentoo.org>
.../abook/{abook-0.6.1-r1.ebuild => abook-0.6.1-r2.ebuild} | 3 ++-
app-misc/abook/files/abook-0.6.1-tinfo.patch | 4 ++--
app-misc/abook/files/abook-0.6.1-vformat.patch | 11 +++++++++++
app-misc/abook/metadata.xml | 4 +++-
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/app-misc/abook/abook-0.6.1-r1.ebuild b/app-misc/abook/abook-0.6.1-r2.ebuild
similarity index 92%
rename from app-misc/abook/abook-0.6.1-r1.ebuild
rename to app-misc/abook/abook-0.6.1-r2.ebuild
index 37e0289c6c3..787ecf2af56 100644
--- a/app-misc/abook/abook-0.6.1-r1.ebuild
+++ b/app-misc/abook/abook-0.6.1-r2.ebuild
@@ -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() {
diff --git a/app-misc/abook/files/abook-0.6.1-tinfo.patch b/app-misc/abook/files/abook-0.6.1-tinfo.patch
index e8c4585dbcb..3c12032932f 100644
--- a/app-misc/abook/files/abook-0.6.1-tinfo.patch
+++ b/app-misc/abook/files/abook-0.6.1-tinfo.patch
@@ -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
diff --git a/app-misc/abook/files/abook-0.6.1-vformat.patch b/app-misc/abook/files/abook-0.6.1-vformat.patch
new file mode 100644
index 00000000000..0808852e6b2
--- /dev/null
+++ b/app-misc/abook/files/abook-0.6.1-vformat.patch
@@ -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
diff --git a/app-misc/abook/metadata.xml b/app-misc/abook/metadata.xml
index d55809e3844..164d4e3717b 100644
--- a/app-misc/abook/metadata.xml
+++ b/app-misc/abook/metadata.xml
@@ -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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-24 17:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-02 10:14 [gentoo-commits] repo/gentoo:master commit in: app-misc/abook/, app-misc/abook/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2020-05-24 17:24 Cédric Krier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox