* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pick/files/, sys-apps/pick/
@ 2017-09-14 3:59 Tim Harder
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder @ 2017-09-14 3:59 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pick/files/, sys-apps/pick/
@ 2017-12-20 8:29 Tim Harder
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder @ 2017-12-20 8:29 UTC (permalink / raw
To: gentoo-commits
commit: 086572fa2bf42948b2caa54ca8c74c4f05f19bcb
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 08:24:24 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 08:24:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086572fa
sys-apps/pick: remove old
sys-apps/pick/Manifest | 2 --
sys-apps/pick/files/pick-1.8.0-tinfo.patch | 24 ------------------------
sys-apps/pick/pick-1.8.0.ebuild | 29 -----------------------------
sys-apps/pick/pick-1.9.0.ebuild | 28 ----------------------------
4 files changed, 83 deletions(-)
diff --git a/sys-apps/pick/Manifest b/sys-apps/pick/Manifest
index 77e5a6c330a..be4d0d5b418 100644
--- a/sys-apps/pick/Manifest
+++ b/sys-apps/pick/Manifest
@@ -1,3 +1 @@
-DIST pick-1.8.0.tar.gz 101366 BLAKE2B 2399c59af9168ec79092aed3a731b20ed9da5e10fc287a01760545049b9e8dfcf3c5463d5b524526df570c594e4e4c3a1f2a2535a83237b67ef429e01ca79802 SHA512 ed8198dfefeafc1397cdc9f80f8b1b88e7fb813f044ae296b8e6ca2789c8790149d334fdf305bb0e57bb0d42262ad73c4f1e9201132ef059f6b1c289989c3c9f
-DIST pick-1.9.0.tar.gz 106379 BLAKE2B 9c25c980e83fe9b3ee00c8a05ccfbd55f1d051ee00025b5384dc2e59c67bea344ceb7c4582850986a7eb065b22831b4e2e6de2412f3f524be415217e72056b6b SHA512 78b799be40f6ba8c312edf7f970d6bd304c6fdf24531182c601ef04465806f5697ffa78015547b8908dd5df57d1c08798b5dc27146eef818425a476fdc247085
DIST pick-2.0.0.tar.gz 107860 BLAKE2B 95fccada43a7295876cc1d198c77eb9f2479d75e4b420cbd20e576dbb30962b34fe82811ff9d13f110b317d4d0f31143e39e092796f66e38fb509a0594719228 SHA512 ac5783902895fd76b5e936faf811c40b46ceb136a2383c4e1fc714f5e59c77f41591694241d9a42807cd78aabfb4d3a237d41f04e1c941e5aac40fe9ddfa4545
diff --git a/sys-apps/pick/files/pick-1.8.0-tinfo.patch b/sys-apps/pick/files/pick-1.8.0-tinfo.patch
deleted file mode 100644
index fec89fb90d4..00000000000
--- a/sys-apps/pick/files/pick-1.8.0-tinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 5354631f457..00000000000
--- a/sys-apps/pick/pick-1.8.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="a fuzzy search tool for the command-line"
-HOMEPAGE="https://github.com/calleerlandsson/pick"
-SRC_URI="https://github.com/calleerlandsson/pick/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-cflags.patch
- "${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/sys-apps/pick/pick-1.9.0.ebuild b/sys-apps/pick/pick-1.9.0.ebuild
deleted file mode 100644
index 88c100aa340..00000000000
--- a/sys-apps/pick/pick-1.9.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="a fuzzy search tool for the command-line"
-HOMEPAGE="https://github.com/calleerlandsson/pick"
-SRC_URI="https://github.com/calleerlandsson/pick/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.0-cflags.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pick/files/, sys-apps/pick/
@ 2021-01-09 23:54 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2021-01-09 23:54 UTC (permalink / raw
To: gentoo-commits
commit: 57a6d693e11bdd54254a4f0b0e58089344c57934
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 23:53:46 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 23:53:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a6d693
sys-apps/pick: Bump to version 4.0.0
fix build against sys-libs/ncurses[tinfo]
Closes: https://bugs.gentoo.org/685712
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/pick/Manifest | 1 +
sys-apps/pick/files/pick-4.0.0-tinfo.patch | 28 ++++++++++++++++++++++
sys-apps/pick/pick-4.0.0.ebuild | 37 ++++++++++++++++++++++++++++++
3 files changed, 66 insertions(+)
diff --git a/sys-apps/pick/Manifest b/sys-apps/pick/Manifest
index 9805f2d3028..f15d007fff6 100644
--- a/sys-apps/pick/Manifest
+++ b/sys-apps/pick/Manifest
@@ -1 +1,2 @@
DIST pick-3.0.1.tar.gz 29878 BLAKE2B 8910bf726102802a76717ecc20360882c1c25bc346324c33173eb64872066ff284636557bf10a98a6cfbecc50dd4c8cd87b68aa924b976b072e5fead8989e316 SHA512 7448e7937640f69d397bd1bd48526865b8866a8f47eb04b7af918df992f36b6e932a1cb68e845f9262faa9c88c1afcb354368b7e1c6b1dd8503aafdb53e4b70f
+DIST pick-4.0.0.tar.gz 29786 BLAKE2B c1d119cfb5dd91bd3c71171d32a6ce92d06ab8ea1cfa5a40c042448b7b90ef5d24c02dc04962b24ef91fd3ea5cb56858b231901c7035f47e2c04682f99e5c61e SHA512 690f8ee174f69ec5897831b71f22bc82dbdaf71329e2b540cfb06e49963231196efe6192d1f564c1c7029c7335736d42f02483850ccbb2bd5bcd1dc52b034f56
diff --git a/sys-apps/pick/files/pick-4.0.0-tinfo.patch b/sys-apps/pick/files/pick-4.0.0-tinfo.patch
new file mode 100644
index 00000000000..7797f1422d9
--- /dev/null
+++ b/sys-apps/pick/files/pick-4.0.0-tinfo.patch
@@ -0,0 +1,28 @@
+From a21522afa9fcd0f299923767f71577feac34be4c Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sun, 10 Jan 2021 00:51:36 +0100
+Subject: [PATCH] configure: Fix build against ncurses with separate tinfo lib
+
+Gentoo-bug: https://bugs.gentoo.org/685712
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 857ce4e..e0f26ee 100755
+--- a/configure
++++ b/configure
+@@ -161,6 +161,9 @@ set -x
+ if (LDFLAGS=-lcurses check_curses); then
+ HAVE_CURSES=1
+ LDFLAGS="${LDFLAGS} -lcurses"
++elif (LDFLAGS=-ltinfow check_curses); then
++ HAVE_NCURSESW=1
++ LDFLAGS="${LDFLAGS} -ltinfow"
+ elif (LDFLAGS=-lncursesw check_curses); then
+ HAVE_NCURSESW=1
+ LDFLAGS="${LDFLAGS} -lncursesw"
+--
+2.30.0
+
diff --git a/sys-apps/pick/pick-4.0.0.ebuild b/sys-apps/pick/pick-4.0.0.ebuild
new file mode 100644
index 00000000000..9bf033c64ad
--- /dev/null
+++ b/sys-apps/pick/pick-4.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="a fuzzy search tool for the command-line"
+HOMEPAGE="https://github.com/mptre/pick"
+SRC_URI="https://github.com/mptre/pick/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.0-tinfo.patch"
+)
+
+src_configure() {
+ # not autoconf
+ ./configure || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake DESTDIR="${ED}" BINDIR=/usr/bin MANDIR=/usr/share/man install
+ dodoc CHANGELOG.md
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-09 23:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-20 8:29 [gentoo-commits] repo/gentoo:master commit in: sys-apps/pick/files/, sys-apps/pick/ Tim Harder
-- strict thread matches above, loose matches on Subject: below --
2021-01-09 23:54 Lars Wendler
2017-09-14 3:59 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox