Gentoo Archives: gentoo-commits

From: "Sergei Trofimovich (slyfox)" <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/mc/files: mc-4.8.13-tinfo.patch
Date: Sat, 01 Nov 2014 15:55:31
Message-Id: 20141101155526.764509358@oystercatcher.gentoo.org
1 slyfox 14/11/01 15:55:26
2
3 Added: mc-4.8.13-tinfo.patch
4 Log:
5 Fix tinfo underlinking (bug #527118 by Michael Vasiliev and fix by Jeroen).
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
8
9 Revision Changes Path
10 1.1 app-misc/mc/files/mc-4.8.13-tinfo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/mc/files/mc-4.8.13-tinfo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/mc/files/mc-4.8.13-tinfo.patch?rev=1.1&content-type=text/plain
14
15 Index: mc-4.8.13-tinfo.patch
16 ===================================================================
17 Gentoo-bug: https://bugs.gentoo.org/527118
18 --- a/m4.include/mc-with-screen-ncurses.m4
19 +++ b/m4.include/mc-with-screen-ncurses.m4
20 @@ -101,6 +101,9 @@
21 LIBS=
22 AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"],
23 [AC_MSG_ERROR([Cannot find ncurses library])])
24 + AC_SEARCH_LIBS([stdscr],[tinfo ncurses],[MCLIBS="$MCLIBS $LIBS"],
25 + [AC_MSG_ERROR([Cannot find a library providing stdscr])])
26 +
27
28 screen_type=ncurses
29 screen_msg="Ncurses library"
30 @@ -111,10 +114,15 @@
31 AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
32 [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
33
34 + AC_SEARCH_LIBS([stdscr],[tinfo ncursesw ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
35 + [AC_MSG_ERROR([Cannot find a library providing stdscr])])
36 +
37 if test x"$ncursesw_found" = "x"; then
38 LIBS=
39 AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"],
40 [AC_MSG_ERROR([Cannot find ncurses library])])
41 + AC_SEARCH_LIBS([stdscr],[tinfo ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
42 + [AC_MSG_ERROR([Cannot find a library providing stdscr])])
43 fi
44
45 dnl Check the header
46 @@ -166,6 +174,9 @@
47 LIBS=
48 AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
49 [AC_MSG_ERROR([Cannot find ncursesw library])])
50 + AC_SEARCH_LIBS([stdscr],[tinfow ncursesw],[MCLIBS="$MCLIBS $LIBS"],
51 + [AC_MSG_ERROR([Cannot find a library providing stdscr])])
52 +
53
54 dnl Check the header
55 ncurses_h_found=