summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-09-02 12:54:25 +0200
committerLars Wendler <polynomial-c@gentoo.org>2019-09-02 12:55:47 +0200
commit4b94328cd41359aa9a120a34b758e468f39849b8 (patch)
treebd63a7e53fcd77156dbc7d037361a053f34d2cc0 /app-text/hunspell/files
parentapp-admin/exo: Version bump to 1.5.0 - remove old. (diff)
downloadgentoo-4b94328cd41359aa9a120a34b758e468f39849b8.tar.gz
gentoo-4b94328cd41359aa9a120a34b758e468f39849b8.tar.bz2
gentoo-4b94328cd41359aa9a120a34b758e468f39849b8.zip
app-text/hunspell: Revbump fix build against sys-libs/ncurses[tinfo]
Thanks-to: zimous <zimous@matfyz.cz> Bug: https://bugs.gentoo.org/692614 Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'app-text/hunspell/files')
-rw-r--r--app-text/hunspell/files/hunspell-1.7.0-tinfo.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
new file mode 100644
index 000000000000..1fb992b0c9d5
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
@@ -0,0 +1,61 @@
+From ce41cfc39129ee2be67667f2d9b78cc7f7d24dca Mon Sep 17 00:00:00 2001
+From: zimous <zimous@matfyz.cz>
+Date: Mon, 2 Sep 2019 12:46:53 +0200
+Subject: [PATCH] Fix build against ncurses with separate tinfo lib
+
+Gentoo-bug: https://bugs.gentoo.org/692614
+---
+ configure.ac | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9426a94..bc5e39d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,11 +52,23 @@ AC_ARG_WITH(
+ AS_IF([test "x$with_ui" != xno], [
+ AC_CHECK_LIB([ncursesw],[tparm],[
+ CURSESLIB=-lncursesw
++ AC_CHECK_LIB([tinfow],[tgetent], [
++ CURSESLIB="$CURSESLIB -ltinfow"
++ ])
+ ],[AC_CHECK_LIB([curses],[tparm],[
+ CURSESLIB=-lcurses
++ AC_CHECK_LIB([tinfow],[tgetent], [
++ CURSESLIB="$CURSESLIB -ltinfo"
++ ])
+ ],[AC_CHECK_LIB([ncurses],[tparm],[
+ CURSESLIB=-lncurses
+- ])])])
++ AC_CHECK_LIB([tinfow],[tgetent], [
++ CURSESLIB="$CURSESLIB -ltinfo"
++ ])
++ ],
++ [-ltinfo])],
++ [-ltinfo])],
++ [-ltinfow])
+ if test "$CURSESLIB" != "" ; then
+ echo Compiling with curses user interface.
+ AC_CHECK_HEADERS([curses.h])
+@@ -78,13 +90,15 @@ AC_ARG_WITH(
+ )
+ READLINELIB=""
+ AS_IF([test "x$with_readline" != xno],
+- [AC_CHECK_LIB([tinfo],[tgetent], [
++ [AC_CHECK_LIB([tinfow],[tgetent], [
++ TERMLIB=-ltinfow
++ ],[AC_CHECK_LIB([tinfo],[tgetent], [
+ TERMLIB=-ltinfo
+- ],[AC_CHECK_LIB([curses],[tparm],[
++ ],[AC_CHECK_LIB([curses],[tparm],[
+ TERMLIB=-lncurses
+ ],[AC_CHECK_LIB([termcap],[tgetent],[
+ TERMLIB=-ltermcap
+- ])])])
++ ])])])])
+ LDSAVE=$LDFLAGS
+ LDFLAGS="$LDFLAGS $TERMLIB"
+ AC_CHECK_LIB([readline],[readline],[
+--
+2.23.0
+