* [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/, app-shells/hstr/
@ 2015-08-28 13:01 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2015-08-28 13:01 UTC (permalink / raw
To: gentoo-commits
commit: c3d6591184f4753e5583f4b2a0ebe196c278b4cf
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 12:59:35 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 12:59:41 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d65911
app-shells/hstr: New package, ebuild written by me for monsieurp
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=527122
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
app-shells/hstr/Manifest | 1 +
app-shells/hstr/files/hstr-1.17-tinfo.patch | 48 +++++++++++++++++++++++++++++
app-shells/hstr/hstr-1.17.ebuild | 34 ++++++++++++++++++++
app-shells/hstr/metadata.xml | 8 +++++
4 files changed, 91 insertions(+)
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
new file mode 100644
index 0000000..1e13647
--- /dev/null
+++ b/app-shells/hstr/Manifest
@@ -0,0 +1 @@
+DIST hstr-1.17.tar.gz 37289 SHA256 9e4b6e74bb7852945e25727105c5339c49c9ce1218481845c8d0205514d85e70 SHA512 eb89496c8554eb29ebb30430aa01179f7265a8ec15b0b9452f7e3ac4867ae4349e6141e11f0af01a4d15ba06131c18ec9ab760c8e68100fa2b8f2a793b237f9b WHIRLPOOL 2b33f485525b2cb033a82b249976d7c670d8f02948e84e73f350b19bdc955e551014f14ad4cfc845144ff0e0d8c3690c50b4444a414c7909f0106242d13a9cc2
diff --git a/app-shells/hstr/files/hstr-1.17-tinfo.patch b/app-shells/hstr/files/hstr-1.17-tinfo.patch
new file mode 100644
index 0000000..5c9ea9b
--- /dev/null
+++ b/app-shells/hstr/files/hstr-1.17-tinfo.patch
@@ -0,0 +1,48 @@
+ configure.ac | 22 ++++++++++++----------
+ src/Makefile.am | 2 ++
+ 2 files changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9cf6a53..7367a32 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,17 +18,19 @@ AC_PROG_CC
+
+ # Platform specific ncurses check.
+ AC_CANONICAL_HOST
+-AS_CASE([$host_os],
+- [darwin*],
++PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
++ AS_CASE([$host_os],
++ [darwin*],
++ [
++ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
++ AC_CHECK_HEADER(curses.h)
++ ],
+ [
+- AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
+- AC_CHECK_HEADER(curses.h)
+- ],
+- [
+- AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
+- AC_CHECK_HEADER(ncursesw/curses.h)
+- ]
+-)
++ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
++ AC_CHECK_HEADER(ncursesw/curses.h)
++ ]
++ )
++])
+
+ # Checks for libraries.
+ AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5765613..ee411a9 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,3 +15,5 @@ hh_SOURCES = \
+ hstr_regexp.c include/hstr_regexp.h \
+ radixsort.c include/radixsort.h \
+ hstr.c
++
++hh_LDADD = $(NCURSES_LIBS)
diff --git a/app-shells/hstr/hstr-1.17.ebuild b/app-shells/hstr/hstr-1.17.ebuild
new file mode 100644
index 0000000..ae0765f
--- /dev/null
+++ b/app-shells/hstr/hstr-1.17.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Shell history suggest box - easily view, navigate, search and manage your command history"
+HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
+SRC_URI="https://github.com/dvorka/hstr/archive/1.17.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
+
+DOCS=( CONFIGURATION.md README.md )
+
+src_prepare() {
+ sed \
+ -e 's:-O2::g' \
+ -i src/Makefile.am || die
+ autotools-utils_src_prepare
+}
diff --git a/app-shells/hstr/metadata.xml b/app-shells/hstr/metadata.xml
new file mode 100644
index 0000000..c166166
--- /dev/null
+++ b/app-shells/hstr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <name>Justin Lecher</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/, app-shells/hstr/
@ 2017-10-16 11:48 Jeroen Roovers
0 siblings, 0 replies; 7+ messages in thread
From: Jeroen Roovers @ 2017-10-16 11:48 UTC (permalink / raw
To: gentoo-commits
commit: 67ad15bb7a3095df22fb33bb6891cfa78a856bea
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 16 11:46:37 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 11:48:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67ad15bb
app-shells/hstr: Fix building against sys-libs/ncurses[tinfo] (bug #634428).
Package-Manager: Portage-2.3.11, Repoman-2.3.3
app-shells/hstr/files/hstr-1.23-tinfo.patch | 11 +++++++++++
app-shells/hstr/hstr-1.23.ebuild | 3 +++
2 files changed, 14 insertions(+)
diff --git a/app-shells/hstr/files/hstr-1.23-tinfo.patch b/app-shells/hstr/files/hstr-1.23-tinfo.patch
new file mode 100644
index 00000000000..2dbd8dcf0c9
--- /dev/null
+++ b/app-shells/hstr/files/hstr-1.23-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,7 +76,7 @@
+ AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
+ AC_CHECK_LIB(readline, using_history, [], [AC_MSG_ERROR([Could not find readline library])])
+ # ncurses might be linked in libtinfo
+-#AC_CHECK_LIB(tinfo, keypad, [], [AC_MSG_ERROR([Could not find tinfo library])])
++AC_CHECK_LIB(tinfo, keypad, [], [AC_MSG_ERROR([Could not find tinfo library])])
+
+ # Checks for header files.
+ AC_CHECK_HEADER(assert.h)
diff --git a/app-shells/hstr/hstr-1.23.ebuild b/app-shells/hstr/hstr-1.23.ebuild
index 8c05b341c62..aa0d958ff0d 100644
--- a/app-shells/hstr/hstr-1.23.ebuild
+++ b/app-shells/hstr/hstr-1.23.ebuild
@@ -20,6 +20,9 @@ DEPEND="
virtual/pkgconfig"
DOCS=( CONFIGURATION.md README.md )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.23-tinfo.patch
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/, app-shells/hstr/
@ 2018-04-09 22:29 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2018-04-09 22:29 UTC (permalink / raw
To: gentoo-commits
commit: 030bc2ae565a37260ce8b379a2e4f9f0eca8b248
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Sun Apr 8 20:16:02 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Apr 9 22:29:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030bc2ae
app-shells/hstr: clean duplicate patches.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7897
app-shells/hstr/files/hstr-1.24-tinfo.patch | 11 -----------
app-shells/hstr/hstr-1.23.ebuild | 4 ++--
app-shells/hstr/hstr-1.24.ebuild | 2 +-
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/app-shells/hstr/files/hstr-1.24-tinfo.patch b/app-shells/hstr/files/hstr-1.24-tinfo.patch
deleted file mode 100644
index 85a4743c0e9..00000000000
--- a/app-shells/hstr/files/hstr-1.24-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,7 @@
- AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
- AC_CHECK_LIB(readline, using_history, [], [AC_MSG_ERROR([Could not find readline library])])
- # ncurses might be linked in libtinfo
--#AC_CHECK_LIB(tinfo, keypad, [], [AC_MSG_ERROR([Could not find tinfo library])])
-+AC_SEARCH_LIBS(keypad, tinfo, [], [AC_MSG_ERROR([Could not find tinfo library])])
-
- # Checks for header files.
- AC_CHECK_HEADER(assert.h)
diff --git a/app-shells/hstr/hstr-1.23.ebuild b/app-shells/hstr/hstr-1.23.ebuild
index cc9f3fc66fa..6fbe6ef2f86 100644
--- a/app-shells/hstr/hstr-1.23.ebuild
+++ b/app-shells/hstr/hstr-1.23.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
@@ -20,7 +20,7 @@ DEPEND="
virtual/pkgconfig"
DOCS=( CONFIGURATION.md README.md )
-PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.23-tinfo.patch" )
src_prepare() {
default
diff --git a/app-shells/hstr/hstr-1.24.ebuild b/app-shells/hstr/hstr-1.24.ebuild
index fc44e8039c0..4e958038c0c 100644
--- a/app-shells/hstr/hstr-1.24.ebuild
+++ b/app-shells/hstr/hstr-1.24.ebuild
@@ -20,7 +20,7 @@ DEPEND="
virtual/pkgconfig"
DOCS=( CONFIGURATION.md README.md )
-PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.23-tinfo.patch" )
src_prepare() {
default
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/, app-shells/hstr/
@ 2019-05-07 21:27 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2019-05-07 21:27 UTC (permalink / raw
To: gentoo-commits
commit: c4007cf22d100c3fa2ce942480671d49b39cd80a
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 13:26:21 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue May 7 21:27:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4007cf2
app-shells/hstr: force tinfow use.
Courtesy of vapier <AT> gentoo.org.
Closes: https://bugs.gentoo.org/651720
Closes: https://github.com/gentoo/gentoo/pull/11867
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
app-shells/hstr/files/hstr-1.23-tinfo.patch | 2 +-
app-shells/hstr/hstr-2.0.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-shells/hstr/files/hstr-1.23-tinfo.patch b/app-shells/hstr/files/hstr-1.23-tinfo.patch
index 85a4743c0e9..fd4eb414b12 100644
--- a/app-shells/hstr/files/hstr-1.23-tinfo.patch
+++ b/app-shells/hstr/files/hstr-1.23-tinfo.patch
@@ -5,7 +5,7 @@
AC_CHECK_LIB(readline, using_history, [], [AC_MSG_ERROR([Could not find readline library])])
# ncurses might be linked in libtinfo
-#AC_CHECK_LIB(tinfo, keypad, [], [AC_MSG_ERROR([Could not find tinfo library])])
-+AC_SEARCH_LIBS(keypad, tinfo, [], [AC_MSG_ERROR([Could not find tinfo library])])
++AC_SEARCH_LIBS(tinfow, tinfo, [], [AC_MSG_ERROR([Could not find tinfow library])])
# Checks for header files.
AC_CHECK_HEADER(assert.h)
diff --git a/app-shells/hstr/hstr-2.0.ebuild b/app-shells/hstr/hstr-2.0.ebuild
index 69a54df0bce..887a5f6d55a 100644
--- a/app-shells/hstr/hstr-2.0.ebuild
+++ b/app-shells/hstr/hstr-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
KEYWORDS="amd64 x86 ~amd64-fbsd"
RDEPEND="
- sys-libs/ncurses:0="
+ sys-libs/ncurses:0=[unicode]"
DEPEND="
${RDEPEND}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/, app-shells/hstr/
@ 2019-06-07 9:32 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2019-06-07 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 20725653235f81bd300844d453fae38d8a521620
Author: Vincent de Phily <vincent.dephily <AT> mobile-devices <DOT> fr>
AuthorDate: Thu Jun 6 10:44:00 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 09:32:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20725653
app-shells/hstr: remove obsolete patch.
Signed-off-by: Vincent de Phily <moltonel <AT> gmail.com>
Suggested-by: Thomas Beinicke <merlin <AT> liao.homelinux.org>
Closes: https://bugs.gentoo.org/685562
Closes: https://github.com/gentoo/gentoo/pull/12206
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
app-shells/hstr/files/hstr-1.23-tinfo.patch | 11 -----------
app-shells/hstr/hstr-2.0.ebuild | 1 -
2 files changed, 12 deletions(-)
diff --git a/app-shells/hstr/files/hstr-1.23-tinfo.patch b/app-shells/hstr/files/hstr-1.23-tinfo.patch
deleted file mode 100644
index fd4eb414b12..00000000000
--- a/app-shells/hstr/files/hstr-1.23-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,7 @@
- AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
- AC_CHECK_LIB(readline, using_history, [], [AC_MSG_ERROR([Could not find readline library])])
- # ncurses might be linked in libtinfo
--#AC_CHECK_LIB(tinfo, keypad, [], [AC_MSG_ERROR([Could not find tinfo library])])
-+AC_SEARCH_LIBS(tinfow, tinfo, [], [AC_MSG_ERROR([Could not find tinfow library])])
-
- # Checks for header files.
- AC_CHECK_HEADER(assert.h)
diff --git a/app-shells/hstr/hstr-2.0.ebuild b/app-shells/hstr/hstr-2.0.ebuild
index 887a5f6d55a..0f78fdf6d9a 100644
--- a/app-shells/hstr/hstr-2.0.ebuild
+++ b/app-shells/hstr/hstr-2.0.ebuild
@@ -21,7 +21,6 @@ DEPEND="
virtual/pkgconfig"
DOCS=( CONFIGURATION.md README.md )
-PATCHES=( "${FILESDIR}/${PN}-1.23-tinfo.patch" )
src_prepare() {
default
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/, app-shells/hstr/
@ 2019-11-28 22:01 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2019-11-28 22:01 UTC (permalink / raw
To: gentoo-commits
commit: 50942d513fa2c878cd975a822cc3ca70b55e8b56
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 22:00:48 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 22:01:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50942d51
app-shells/hstr: fix ncurses configure.
Patch courtesy of Dan Goodliffe <gentoo <AT> randomdan.homeip.net>.
Closes: https://bugs.gentoo.org/690232
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../files/hstr-2.0-fix-ncurses-configure.patch | 81 ++++++++++++++++++++++
app-shells/hstr/hstr-2.0.ebuild | 2 +
2 files changed, 83 insertions(+)
diff --git a/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch b/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch
new file mode 100644
index 00000000000..215fd5cedfc
--- /dev/null
+++ b/app-shells/hstr/files/hstr-2.0-fix-ncurses-configure.patch
@@ -0,0 +1,81 @@
+diff --git a/configure.ac b/configure.ac
+index 1676ec8..73c8be5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,39 +47,33 @@ then
+ fi
+
+ # PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed
+-AC_CHECK_LIB(ncursesw, killwchar, [],
+-[
+- AC_CHECK_LIB(ncurses, killwchar, [],
+- [
+- AC_SUBST([NCURSESW_CFLAGS])
+- AC_SUBST([NCURSESW_LIBS])
+- if pkg-config --exists ncursesw
+- then
+- AC_MSG_NOTICE([Module ncursesw found])
+- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
+- NCURSESW_LIBS=`pkg-config --libs ncursesw`
+- else
+- if pkg-config --exists ncurses
+- then
+- AC_MSG_NOTICE([Module ncurses found])
+- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
+- NCURSESW_LIBS=`pkg-config --libs ncurses`
+- else
+- AS_CASE([$host_os],
+- [darwin*],
+- [
+- AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
+- AC_CHECK_HEADER(curses.h)
+- ],
+- [
+- AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
+- AC_CHECK_HEADER(ncursesw/curses.h)
+- ]
+- )
+- fi
+- fi
+- ]) # FAIL of ncurses
+-]) # FAIL of ncursesw
++AC_SUBST([NCURSESW_CFLAGS])
++AC_SUBST([NCURSESW_LIBS])
++if pkg-config --exists ncursesw
++then
++ AC_MSG_NOTICE([Module ncursesw found])
++ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
++ NCURSESW_LIBS=`pkg-config --libs ncursesw`
++else
++ if pkg-config --exists ncurses
++ then
++ AC_MSG_NOTICE([Module ncurses found])
++ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
++ NCURSESW_LIBS=`pkg-config --libs ncurses`
++ else
++ AS_CASE([$host_os],
++ [darwin*],
++ [
++ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
++ AC_CHECK_HEADER(curses.h)
++ ],
++ [
++ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
++ AC_CHECK_HEADER(ncursesw/curses.h)
++ ]
++ )
++ fi
++fi
+
+
+ # Checks for libraries.
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7640d21..17a82b7 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -37,4 +37,4 @@ hstr_SOURCES = \
+ install-exec-hook:
+ ln $(DESTDIR)$(bindir)/hstr$(EXEEXT) $(DESTDIR)$(bindir)/hh$(EXEEXT)
+
+-hstr_LDADD = $(NCURSES_LIBS)
++hstr_LDADD = $(NCURSESW_LIBS)
diff --git a/app-shells/hstr/hstr-2.0.ebuild b/app-shells/hstr/hstr-2.0.ebuild
index 206760fd98b..b2332147a9b 100644
--- a/app-shells/hstr/hstr-2.0.ebuild
+++ b/app-shells/hstr/hstr-2.0.ebuild
@@ -22,6 +22,8 @@ DEPEND="
DOCS=( CONFIGURATION.md README.md )
+PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch )
+
src_prepare() {
default
sed \
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/, app-shells/hstr/
@ 2020-06-26 19:10 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2020-06-26 19:10 UTC (permalink / raw
To: gentoo-commits
commit: 22e8c1793ab27d5d18180e225a02c8dce798e656
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 26 19:04:41 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 26 19:04:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e8c179
app-shells/hstr: Drop duplicate file
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/hstr-2.1-fix-ncurses-configure.patch | 81 ----------------------
app-shells/hstr/hstr-2.1.ebuild | 2 +-
2 files changed, 1 insertion(+), 82 deletions(-)
diff --git a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch b/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
deleted file mode 100644
index 215fd5cedfc..00000000000
--- a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1676ec8..73c8be5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,39 +47,33 @@ then
- fi
-
- # PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed
--AC_CHECK_LIB(ncursesw, killwchar, [],
--[
-- AC_CHECK_LIB(ncurses, killwchar, [],
-- [
-- AC_SUBST([NCURSESW_CFLAGS])
-- AC_SUBST([NCURSESW_LIBS])
-- if pkg-config --exists ncursesw
-- then
-- AC_MSG_NOTICE([Module ncursesw found])
-- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-- NCURSESW_LIBS=`pkg-config --libs ncursesw`
-- else
-- if pkg-config --exists ncurses
-- then
-- AC_MSG_NOTICE([Module ncurses found])
-- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-- NCURSESW_LIBS=`pkg-config --libs ncurses`
-- else
-- AS_CASE([$host_os],
-- [darwin*],
-- [
-- AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
-- AC_CHECK_HEADER(curses.h)
-- ],
-- [
-- AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
-- AC_CHECK_HEADER(ncursesw/curses.h)
-- ]
-- )
-- fi
-- fi
-- ]) # FAIL of ncurses
--]) # FAIL of ncursesw
-+AC_SUBST([NCURSESW_CFLAGS])
-+AC_SUBST([NCURSESW_LIBS])
-+if pkg-config --exists ncursesw
-+then
-+ AC_MSG_NOTICE([Module ncursesw found])
-+ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-+ NCURSESW_LIBS=`pkg-config --libs ncursesw`
-+else
-+ if pkg-config --exists ncurses
-+ then
-+ AC_MSG_NOTICE([Module ncurses found])
-+ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-+ NCURSESW_LIBS=`pkg-config --libs ncurses`
-+ else
-+ AS_CASE([$host_os],
-+ [darwin*],
-+ [
-+ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
-+ AC_CHECK_HEADER(curses.h)
-+ ],
-+ [
-+ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
-+ AC_CHECK_HEADER(ncursesw/curses.h)
-+ ]
-+ )
-+ fi
-+fi
-
-
- # Checks for libraries.
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7640d21..17a82b7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -37,4 +37,4 @@ hstr_SOURCES = \
- install-exec-hook:
- ln $(DESTDIR)$(bindir)/hstr$(EXEEXT) $(DESTDIR)$(bindir)/hh$(EXEEXT)
-
--hstr_LDADD = $(NCURSES_LIBS)
-+hstr_LDADD = $(NCURSESW_LIBS)
diff --git a/app-shells/hstr/hstr-2.1.ebuild b/app-shells/hstr/hstr-2.1.ebuild
index f9bffba4e61..95a0c74991a 100644
--- a/app-shells/hstr/hstr-2.1.ebuild
+++ b/app-shells/hstr/hstr-2.1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
DOCS=( CONFIGURATION.md README.md )
-PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch )
+PATCHES=( ${FILESDIR}/${PN}-2.0-fix-ncurses-configure.patch )
src_prepare() {
default
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-06-26 19:10 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-09 22:29 [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/, app-shells/hstr/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2020-06-26 19:10 Matt Turner
2019-11-28 22:01 Patrice Clement
2019-06-07 9:32 Patrice Clement
2019-05-07 21:27 Patrice Clement
2017-10-16 11:48 Jeroen Roovers
2015-08-28 13:01 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox