diff options
| -rw-r--r-- | app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch | 12 | ||||
| -rw-r--r-- | app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 2 | ||||
| -rw-r--r-- | app-editors/xemacs/xemacs-21.4.24.ebuild | 4 |
3 files changed, 17 insertions, 1 deletions
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch new file mode 100644 index 000000000000..19b8984db2d0 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch @@ -0,0 +1,12 @@ +diff -r e2da872593c0 configure.in +--- a/configure.in Tue Mar 24 22:15:53 2015 -0400 ++++ b/configure.in Mon Apr 17 10:13:05 2017 +0200 +@@ -4449,7 +4449,7 @@ + AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h) + AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h) + XE_ADD_OBJS(terminfo.o) +- XE_PREPEND(-lncurses, LIBS) ++ XE_PREPEND($(pkg-config ncurses --libs), LIBS) + + if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then + dnl Try again, and check for the bogus ncurses/ include bug. diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild index e9e6f8a04e28..9f1e61beeecb 100644 --- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild @@ -64,6 +64,8 @@ src_prepare() { # see bug 576512 epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch epatch "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch + # see bug 615544 + epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch # Some binaries and man pages are installed under suffixed names # to avoid collions with their GNU Emacs counterparts (see below). diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild index 9305b8ed2eb2..6f9245c0ea78 100644 --- a/app-editors/xemacs/xemacs-21.4.24.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Note: xemacs currently does not work with a hardened profile. If you @@ -63,6 +63,8 @@ src_prepare() { epatch "${FILESDIR}"/xemacs-21.4.19-db.patch # see bug 576512 epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch + # see bug 615544 + epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch # Some binaries and man pages are installed under suffixed names # to avoid collions with their GNU Emacs counterparts (see below). |