diff options
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch | 81 | ||||
| -rw-r--r-- | app-shells/hstr/hstr-2.1.ebuild | 2 |
2 files changed, 1 insertions, 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 215fd5cedfc9..000000000000 --- 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 f9bffba4e61d..95a0c74991ac 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 |