diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2014-11-01 15:55:26 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2014-11-01 15:55:26 +0000 |
| commit | dd54c738483bb4329b738dc0c1f1320cd5d2a736 (patch) | |
| tree | 0d80c191e8b329b464e0f41533aa05c40cc1017c /app-misc/mc | |
| parent | Add new snapshot including a ton of bugfixes, also this won't fail to start i... (diff) | |
| download | gentoo-2-dd54c738483bb4329b738dc0c1f1320cd5d2a736.tar.gz gentoo-2-dd54c738483bb4329b738dc0c1f1320cd5d2a736.tar.bz2 gentoo-2-dd54c738483bb4329b738dc0c1f1320cd5d2a736.zip | |
Fix tinfo underlinking (bug #527118 by Michael Vasiliev and fix by Jeroen).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'app-misc/mc')
| -rw-r--r-- | app-misc/mc/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.13-tinfo.patch | 39 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.8.13.ebuild | 7 |
3 files changed, 49 insertions, 3 deletions
diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog index 5ea556c52b48..128eb9ab52ed 100644 --- a/app-misc/mc/ChangeLog +++ b/app-misc/mc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/mc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.311 2014/09/05 21:00:13 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.312 2014/11/01 15:55:26 slyfox Exp $ + + 01 Nov 2014; Sergei Trofimovich <slyfox@gentoo.org> + +files/mc-4.8.13-tinfo.patch, mc-4.8.13.ebuild: + Fix tinfo underlinking (bug #527118 by Michael Vasiliev and fix by Jeroen). *mc-4.8.13 (05 Sep 2014) diff --git a/app-misc/mc/files/mc-4.8.13-tinfo.patch b/app-misc/mc/files/mc-4.8.13-tinfo.patch new file mode 100644 index 000000000000..761c103df654 --- /dev/null +++ b/app-misc/mc/files/mc-4.8.13-tinfo.patch @@ -0,0 +1,39 @@ +Gentoo-bug: https://bugs.gentoo.org/527118 +--- a/m4.include/mc-with-screen-ncurses.m4 ++++ b/m4.include/mc-with-screen-ncurses.m4 +@@ -101,6 +101,9 @@ + LIBS= + AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"], + [AC_MSG_ERROR([Cannot find ncurses library])]) ++ AC_SEARCH_LIBS([stdscr],[tinfo ncurses],[MCLIBS="$MCLIBS $LIBS"], ++ [AC_MSG_ERROR([Cannot find a library providing stdscr])]) ++ + + screen_type=ncurses + screen_msg="Ncurses library" +@@ -111,10 +114,15 @@ + AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes], + [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])]) + ++ AC_SEARCH_LIBS([stdscr],[tinfo ncursesw ncurses curses],[MCLIBS="$MCLIBS $LIBS"], ++ [AC_MSG_ERROR([Cannot find a library providing stdscr])]) ++ + if test x"$ncursesw_found" = "x"; then + LIBS= + AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"], + [AC_MSG_ERROR([Cannot find ncurses library])]) ++ AC_SEARCH_LIBS([stdscr],[tinfo ncurses curses],[MCLIBS="$MCLIBS $LIBS"], ++ [AC_MSG_ERROR([Cannot find a library providing stdscr])]) + fi + + dnl Check the header +@@ -166,6 +174,9 @@ + LIBS= + AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"], + [AC_MSG_ERROR([Cannot find ncursesw library])]) ++ AC_SEARCH_LIBS([stdscr],[tinfow ncursesw],[MCLIBS="$MCLIBS $LIBS"], ++ [AC_MSG_ERROR([Cannot find a library providing stdscr])]) ++ + + dnl Check the header + ncurses_h_found= diff --git a/app-misc/mc/mc-4.8.13.ebuild b/app-misc/mc/mc-4.8.13.ebuild index 7a3d4dd1afbf..1a46b72e7d00 100644 --- a/app-misc/mc/mc-4.8.13.ebuild +++ b/app-misc/mc/mc-4.8.13.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.13.ebuild,v 1.1 2014/09/05 21:00:13 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.13.ebuild,v 1.2 2014/11/01 15:55:26 slyfox Exp $ EAPI=5 -inherit eutils flag-o-matic +inherit autotools eutils flag-o-matic MY_P=${P/_/-} @@ -43,6 +43,9 @@ DEPEND="${RDEPEND} src_prepare() { [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh + + epatch "${FILESDIR}"/${P}-tinfo.patch + eautoreconf } S=${WORKDIR}/${MY_P} |