diff options
Diffstat (limited to 'main/mc/ncurses.patch')
| -rw-r--r-- | main/mc/ncurses.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/main/mc/ncurses.patch b/main/mc/ncurses.patch new file mode 100644 index 0000000000..8c6f1dc58b --- /dev/null +++ b/main/mc/ncurses.patch @@ -0,0 +1,50 @@ +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= +--- a/lib/tty/tty-ncurses.c ++++ b/lib/tty/tty-ncurses.c +@@ -66,7 +66,7 @@ + + /*** file scope macro definitions ****************************************************************/ + +-#if defined(_AIX) && !defined(CTRL) ++#if !defined(CTRL) + #define CTRL(x) ((x) & 0x1f) + #endif + |