From: "Akinori Hattori" <hattya@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/
Date: Mon, 28 May 2018 14:56:20 +0000 (UTC) [thread overview]
Message-ID: <1527519359.323cb12463345fb51e34f2ac42fd167efd9d3789.hattya@gentoo> (raw)
commit: 323cb12463345fb51e34f2ac42fd167efd9d3789
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 14:54:09 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon May 28 14:55:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=323cb124
app-i18n/uim: fix build with sys-libs/ncurses[tinfo]
Closes: https://bugs.gentoo.org/588172
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-i18n/uim/files/uim-1.8.6-tinfo.patch | 65 ++++++++++++++++++++++++++++++++
app-i18n/uim/uim-1.8.6-r1.ebuild | 1 +
app-i18n/uim/uim-1.8.6-r2.ebuild | 1 +
3 files changed, 67 insertions(+)
diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
new file mode 100644
index 00000000000..51105c909f5
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
@@ -0,0 +1,65 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1058,27 +1058,25 @@
+ ;;
+ yes|*)
+ use_uim_fep="yes"
+- AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
+- AC_CHECK_FUNCS(forkpty)
+- if test $ac_cv_func_forkpty = no; then
+- AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
+- fi
+- AC_SUBST(FEP_LIBADD)
+ ;;
+ esac
+ ],
+- [ use_uim_fep="yes"
+- AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
+- AC_CHECK_FUNCS(forkpty)
+- if test $ac_cv_func_forkpty = no; then
+- AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
+- fi
+- AC_SUBST(FEP_LIBADD)
+- ])
++ [use_uim_fep="yes"])
++
++if test "x$use_uim_fep" != "xno"; then
++ PKG_CHECK_MODULES(CURSES, ncurses,
++ [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
++ [
++ AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
++ [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
++ AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
++ ])
++ AC_CHECK_FUNCS(forkpty)
++ if test $ac_cv_func_forkpty = no; then
++ AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
++ fi
++ AC_SUBST(FEP_LIBADD)
++fi
+
+ AC_ARG_ENABLE(emacs,
+ AC_HELP_STRING([--disable-emacs],
+@@ -1210,10 +1208,14 @@
+ saved_LDFLAGS=$LDFLAGS
+ CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
+ LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
+- AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
+- [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
+- AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
+- use_libedit="no")])
++ PKG_CHECK_MODULES(CURSES, ncurses,
++ [LIBEDIT_LIBS="$CURSES_LIBS"],
++ [
++ AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
++ [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
++ AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
++ use_libedit="no")])
++ ])
+ if test "x$use_libedit" != "xno"; then
+ AC_CHECK_LIB(edit, el_init,
+ [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index 7b43e2abb80..84c5fa527eb 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -78,6 +78,7 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${PN}-zh-TW.patch
)
DOCS=( AUTHORS NEWS README RELNOTE )
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index b7fb23b5ab8..ccec49f2869 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -82,6 +82,7 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-libressl.patch
+ "${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${PN}-zh-TW.patch
)
DOCS=( AUTHORS NEWS README RELNOTE )
next reply other threads:[~2018-05-28 14:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-28 14:56 Akinori Hattori [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-23 13:28 [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/ Akinori Hattori
2022-10-04 7:09 Sam James
2022-09-24 13:32 Akinori Hattori
2022-09-06 15:29 Akinori Hattori
2021-10-23 14:32 Akinori Hattori
2020-11-28 23:10 David Seifert
2018-07-23 13:29 Akinori Hattori
2018-06-03 2:19 Akinori Hattori
2018-05-28 15:13 Akinori Hattori
2018-05-28 14:56 Akinori Hattori
2016-07-28 17:10 Anthony G. Basile
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1527519359.323cb12463345fb51e34f2ac42fd167efd9d3789.hattya@gentoo \
--to=hattya@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox