gentoo resync : 14.07.2018

2 files changed, 69 insertions, 0 deletions

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/files/mc-4.8.19-selected-size.patch b/app-misc/mc/files/mc-4.8.19-selected-size.patch
new file mode 100644
index 000000000000..06d6f46ff325
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.19-selected-size.patch
@@ -0,0 +1,30 @@
+From 069306eb2e7174f431bd3eecbc8f489f9652b782 Mon Sep 17 00:00:00 2001
+From: Andrew Borodin <aborodin@vmail.ru>
+Date: Sat, 2 Dec 2017 14:39:50 +0300
+Subject: [PATCH] Ticket #3883: size_trunc_sep() breaks on multibyte locales.
+
+The bug was introduced in b3867a6e154420833d6a1117f556b9ab2d64c6ab.
+
+Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+---
+ lib/util.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/util.c b/lib/util.c
+index 0326f65e8..c23d91fba 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -383,7 +383,9 @@ size_trunc_sep (uintmax_t size, gboolean use_si)
+     p += strlen (p) - 1;
+     d = x + sizeof (x) - 1;
+     *d-- = '\0';
+-    while (p >= y && (isalpha ((unsigned char) *p) || (unsigned char) *p == ' '))
++    /* @size format is "size unit", i.e. "[digits][space][letters]".
++       Copy all charactes after digits. */
++    while (p >= y && !g_ascii_isdigit (*p))
+         *d-- = *p--;
+     for (count = 0; p >= y; count++)
+     {
+-- 
+2.15.1
+