| 1 |
commit: a9b630af663e3f3b932303b6853478d9b094d325 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 28 13:09:12 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 28 13:09:16 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b630af |
| 7 |
|
| 8 |
app-shells/hstr: Update patch to first detect ncursesw |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 12 |
|
| 13 |
app-shells/hstr/files/hstr-1.17-tinfo.patch | 35 ++++++++++++++--------------- |
| 14 |
1 file changed, 17 insertions(+), 18 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-shells/hstr/files/hstr-1.17-tinfo.patch b/app-shells/hstr/files/hstr-1.17-tinfo.patch |
| 17 |
index 5c9ea9b..0ffbd0c 100644 |
| 18 |
--- a/app-shells/hstr/files/hstr-1.17-tinfo.patch |
| 19 |
+++ b/app-shells/hstr/files/hstr-1.17-tinfo.patch |
| 20 |
@@ -1,25 +1,14 @@ |
| 21 |
- configure.ac | 22 ++++++++++++---------- |
| 22 |
- src/Makefile.am | 2 ++ |
| 23 |
- 2 files changed, 14 insertions(+), 10 deletions(-) |
| 24 |
- |
| 25 |
diff --git a/configure.ac b/configure.ac |
| 26 |
-index 9cf6a53..7367a32 100644 |
| 27 |
+index 9cf6a53..cbc649d 100644 |
| 28 |
--- a/configure.ac |
| 29 |
+++ b/configure.ac |
| 30 |
-@@ -18,17 +18,19 @@ AC_PROG_CC |
| 31 |
+@@ -18,17 +18,21 @@ AC_PROG_CC |
| 32 |
|
| 33 |
# Platform specific ncurses check. |
| 34 |
AC_CANONICAL_HOST |
| 35 |
-AS_CASE([$host_os], |
| 36 |
- [darwin*], |
| 37 |
-+PKG_CHECK_MODULES([NCURSES], [ncurses], [], [ |
| 38 |
-+ AS_CASE([$host_os], |
| 39 |
-+ [darwin*], |
| 40 |
-+ [ |
| 41 |
-+ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) |
| 42 |
-+ AC_CHECK_HEADER(curses.h) |
| 43 |
-+ ], |
| 44 |
- [ |
| 45 |
+- [ |
| 46 |
- AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) |
| 47 |
- AC_CHECK_HEADER(curses.h) |
| 48 |
- ], |
| 49 |
@@ -28,10 +17,20 @@ index 9cf6a53..7367a32 100644 |
| 50 |
- AC_CHECK_HEADER(ncursesw/curses.h) |
| 51 |
- ] |
| 52 |
-) |
| 53 |
-+ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) |
| 54 |
-+ AC_CHECK_HEADER(ncursesw/curses.h) |
| 55 |
-+ ] |
| 56 |
-+ ) |
| 57 |
++PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [ |
| 58 |
++ PKG_CHECK_MODULES([NCURSES], [ncurses], [], [ |
| 59 |
++ AS_CASE([$host_os], |
| 60 |
++ [darwin*], |
| 61 |
++ [ |
| 62 |
++ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) |
| 63 |
++ AC_CHECK_HEADER(curses.h) |
| 64 |
++ ], |
| 65 |
++ [ |
| 66 |
++ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) |
| 67 |
++ AC_CHECK_HEADER(ncursesw/curses.h) |
| 68 |
++ ] |
| 69 |
++ ) |
| 70 |
++ ]) |
| 71 |
+]) |
| 72 |
|
| 73 |
# Checks for libraries. |
Archives