| 1 |
commit: 323cb12463345fb51e34f2ac42fd167efd9d3789 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 28 14:54:09 2018 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 28 14:55:59 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=323cb124 |
| 7 |
|
| 8 |
app-i18n/uim: fix build with sys-libs/ncurses[tinfo] |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/588172 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
app-i18n/uim/files/uim-1.8.6-tinfo.patch | 65 ++++++++++++++++++++++++++++++++ |
| 14 |
app-i18n/uim/uim-1.8.6-r1.ebuild | 1 + |
| 15 |
app-i18n/uim/uim-1.8.6-r2.ebuild | 1 + |
| 16 |
3 files changed, 67 insertions(+) |
| 17 |
|
| 18 |
diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..51105c909f5 |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-i18n/uim/files/uim-1.8.6-tinfo.patch |
| 23 |
@@ -0,0 +1,65 @@ |
| 24 |
+--- a/configure.ac |
| 25 |
++++ b/configure.ac |
| 26 |
+@@ -1058,27 +1058,25 @@ |
| 27 |
+ ;; |
| 28 |
+ yes|*) |
| 29 |
+ use_uim_fep="yes" |
| 30 |
+- AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD", |
| 31 |
+- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD", |
| 32 |
+- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")]) |
| 33 |
+- AC_CHECK_FUNCS(forkpty) |
| 34 |
+- if test $ac_cv_func_forkpty = no; then |
| 35 |
+- AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"]) |
| 36 |
+- fi |
| 37 |
+- AC_SUBST(FEP_LIBADD) |
| 38 |
+ ;; |
| 39 |
+ esac |
| 40 |
+ ], |
| 41 |
+- [ use_uim_fep="yes" |
| 42 |
+- AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD", |
| 43 |
+- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD", |
| 44 |
+- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")]) |
| 45 |
+- AC_CHECK_FUNCS(forkpty) |
| 46 |
+- if test $ac_cv_func_forkpty = no; then |
| 47 |
+- AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"]) |
| 48 |
+- fi |
| 49 |
+- AC_SUBST(FEP_LIBADD) |
| 50 |
+- ]) |
| 51 |
++ [use_uim_fep="yes"]) |
| 52 |
++ |
| 53 |
++if test "x$use_uim_fep" != "xno"; then |
| 54 |
++ PKG_CHECK_MODULES(CURSES, ncurses, |
| 55 |
++ [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"], |
| 56 |
++ [ |
| 57 |
++ AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD", |
| 58 |
++ [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD", |
| 59 |
++ AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")]) |
| 60 |
++ ]) |
| 61 |
++ AC_CHECK_FUNCS(forkpty) |
| 62 |
++ if test $ac_cv_func_forkpty = no; then |
| 63 |
++ AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"]) |
| 64 |
++ fi |
| 65 |
++ AC_SUBST(FEP_LIBADD) |
| 66 |
++fi |
| 67 |
+ |
| 68 |
+ AC_ARG_ENABLE(emacs, |
| 69 |
+ AC_HELP_STRING([--disable-emacs], |
| 70 |
+@@ -1210,10 +1208,14 @@ |
| 71 |
+ saved_LDFLAGS=$LDFLAGS |
| 72 |
+ CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" |
| 73 |
+ LDFLAGS="${LDFLAGS} -L$libedit_path/lib" |
| 74 |
+- AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", |
| 75 |
+- [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", |
| 76 |
+- AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") |
| 77 |
+- use_libedit="no")]) |
| 78 |
++ PKG_CHECK_MODULES(CURSES, ncurses, |
| 79 |
++ [LIBEDIT_LIBS="$CURSES_LIBS"], |
| 80 |
++ [ |
| 81 |
++ AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", |
| 82 |
++ [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", |
| 83 |
++ AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") |
| 84 |
++ use_libedit="no")]) |
| 85 |
++ ]) |
| 86 |
+ if test "x$use_libedit" != "xno"; then |
| 87 |
+ AC_CHECK_LIB(edit, el_init, |
| 88 |
+ [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib" |
| 89 |
|
| 90 |
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild |
| 91 |
index 7b43e2abb80..84c5fa527eb 100644 |
| 92 |
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild |
| 93 |
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild |
| 94 |
@@ -78,6 +78,7 @@ RDEPEND="${CDEPEND} |
| 95 |
|
| 96 |
PATCHES=( |
| 97 |
"${FILESDIR}"/${P}-gentoo.patch |
| 98 |
+ "${FILESDIR}"/${P}-tinfo.patch |
| 99 |
"${FILESDIR}"/${PN}-zh-TW.patch |
| 100 |
) |
| 101 |
DOCS=( AUTHORS NEWS README RELNOTE ) |
| 102 |
|
| 103 |
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild |
| 104 |
index b7fb23b5ab8..ccec49f2869 100644 |
| 105 |
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild |
| 106 |
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild |
| 107 |
@@ -82,6 +82,7 @@ RDEPEND="${CDEPEND} |
| 108 |
PATCHES=( |
| 109 |
"${FILESDIR}"/${P}-gentoo.patch |
| 110 |
"${FILESDIR}"/${P}-libressl.patch |
| 111 |
+ "${FILESDIR}"/${P}-tinfo.patch |
| 112 |
"${FILESDIR}"/${PN}-zh-TW.patch |
| 113 |
) |
| 114 |
DOCS=( AUTHORS NEWS README RELNOTE ) |
Archives