| 1 |
commit: 1d26ca1814811aca0463644dc3ebe920470a9357 |
| 2 |
Author: Mats Lidell <matsl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 17 20:07:36 2017 +0000 |
| 4 |
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 17 20:08:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d26ca18 |
| 7 |
|
| 8 |
app-editors/xemacs: Build with ncurses using tinfo, bug #615544 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch | 12 ++++++++++++ |
| 13 |
app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 2 ++ |
| 14 |
app-editors/xemacs/xemacs-21.4.24.ebuild | 4 +++- |
| 15 |
3 files changed, 17 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..19b8984db2d |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch |
| 22 |
@@ -0,0 +1,12 @@ |
| 23 |
+diff -r e2da872593c0 configure.in |
| 24 |
+--- a/configure.in Tue Mar 24 22:15:53 2015 -0400 |
| 25 |
++++ b/configure.in Mon Apr 17 10:13:05 2017 +0200 |
| 26 |
+@@ -4449,7 +4449,7 @@ |
| 27 |
+ AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h) |
| 28 |
+ AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h) |
| 29 |
+ XE_ADD_OBJS(terminfo.o) |
| 30 |
+- XE_PREPEND(-lncurses, LIBS) |
| 31 |
++ XE_PREPEND($(pkg-config ncurses --libs), LIBS) |
| 32 |
+ |
| 33 |
+ if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then |
| 34 |
+ dnl Try again, and check for the bogus ncurses/ include bug. |
| 35 |
|
| 36 |
diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild |
| 37 |
index e9e6f8a04e2..9f1e61beeec 100644 |
| 38 |
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild |
| 39 |
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild |
| 40 |
@@ -64,6 +64,8 @@ src_prepare() { |
| 41 |
# see bug 576512 |
| 42 |
epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch |
| 43 |
epatch "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch |
| 44 |
+ # see bug 615544 |
| 45 |
+ epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch |
| 46 |
|
| 47 |
# Some binaries and man pages are installed under suffixed names |
| 48 |
# to avoid collions with their GNU Emacs counterparts (see below). |
| 49 |
|
| 50 |
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild |
| 51 |
index 9305b8ed2eb..6f9245c0ea7 100644 |
| 52 |
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild |
| 53 |
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild |
| 54 |
@@ -1,4 +1,4 @@ |
| 55 |
-# Copyright 1999-2016 Gentoo Foundation |
| 56 |
+# Copyright 1999-2017 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
|
| 59 |
# Note: xemacs currently does not work with a hardened profile. If you |
| 60 |
@@ -63,6 +63,8 @@ src_prepare() { |
| 61 |
epatch "${FILESDIR}"/xemacs-21.4.19-db.patch |
| 62 |
# see bug 576512 |
| 63 |
epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch |
| 64 |
+ # see bug 615544 |
| 65 |
+ epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch |
| 66 |
|
| 67 |
# Some binaries and man pages are installed under suffixed names |
| 68 |
# to avoid collions with their GNU Emacs counterparts (see below). |
Archives