* [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/
@ 2015-08-28 13:09 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2015-08-28 13:09 UTC (permalink / raw
To: gentoo-commits
commit: a9b630af663e3f3b932303b6853478d9b094d325
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 13:09:12 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 13:09:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b630af
app-shells/hstr: Update patch to first detect ncursesw
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
app-shells/hstr/files/hstr-1.17-tinfo.patch | 35 ++++++++++++++---------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/app-shells/hstr/files/hstr-1.17-tinfo.patch b/app-shells/hstr/files/hstr-1.17-tinfo.patch
index 5c9ea9b..0ffbd0c 100644
--- a/app-shells/hstr/files/hstr-1.17-tinfo.patch
+++ b/app-shells/hstr/files/hstr-1.17-tinfo.patch
@@ -1,25 +1,14 @@
- 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
+index 9cf6a53..cbc649d 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -18,17 +18,19 @@ AC_PROG_CC
+@@ -18,17 +18,21 @@ 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)
- ],
@@ -28,10 +17,20 @@ index 9cf6a53..7367a32 100644
- 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)
-+ ]
-+ )
++PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [
++ 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(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
++ AC_CHECK_HEADER(ncursesw/curses.h)
++ ]
++ )
++ ])
+])
# Checks for libraries.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/
@ 2017-02-08 23:33 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2017-02-08 23:33 UTC (permalink / raw
To: gentoo-commits
commit: 70d43e940c342803c7c6af45e8ea64050bdd705b
Author: Bláithín Nic Aoidh <blawheen <AT> gmail <DOT> com>
AuthorDate: Sat Feb 4 01:52:25 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 23:22:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d43e94
app-shells/hstr: remove unused patch files.
Closes: https://github.com/gentoo/gentoo/pull/3796
app-shells/hstr/files/hstr-1.17-tinfo.patch | 47 -----------------------------
app-shells/hstr/files/hstr-1.18-tinfo.patch | 47 -----------------------------
2 files changed, 94 deletions(-)
diff --git a/app-shells/hstr/files/hstr-1.17-tinfo.patch b/app-shells/hstr/files/hstr-1.17-tinfo.patch
deleted file mode 100644
index 0ffbd0cff2..0000000000
--- a/app-shells/hstr/files/hstr-1.17-tinfo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 9cf6a53..cbc649d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,17 +18,21 @@ AC_PROG_CC
-
- # Platform specific ncurses check.
- AC_CANONICAL_HOST
--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)
-- ]
--)
-+PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [
-+ 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(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/files/hstr-1.18-tinfo.patch b/app-shells/hstr/files/hstr-1.18-tinfo.patch
deleted file mode 100644
index 0ffbd0cff2..0000000000
--- a/app-shells/hstr/files/hstr-1.18-tinfo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 9cf6a53..cbc649d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,17 +18,21 @@ AC_PROG_CC
-
- # Platform specific ncurses check.
- AC_CANONICAL_HOST
--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)
-- ]
--)
-+PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [
-+ 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(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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/
@ 2017-10-16 22:29 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2017-10-16 22:29 UTC (permalink / raw
To: gentoo-commits
commit: 187aae663128101c709b9262f8032226e714eca9
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 16 22:28:42 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 22:29:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187aae66
app-shells/hstr: Use AC_SEARCH_LIBS not AC_CHECK_LIB (bug #634428).
Package-Manager: Portage-2.3.11, Repoman-2.3.3
app-shells/hstr/files/hstr-1.23-tinfo.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-shells/hstr/files/hstr-1.23-tinfo.patch b/app-shells/hstr/files/hstr-1.23-tinfo.patch
index 2dbd8dcf0c9..85a4743c0e9 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_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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-16 22:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-16 22:29 [gentoo-commits] repo/gentoo:master commit in: app-shells/hstr/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2017-02-08 23:33 Patrice Clement
2015-08-28 13:09 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox