summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2017-12-02 11:53:25 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2017-12-02 12:12:46 +0000
commitaeb256e8007ae4b1a0394f2b677214d1a9a78245 (patch)
tree89f29a0dc89be4c85f20eff5ecda327ad0459ee7
parentnet-libs/libnet: Fix libnet-1.0-config --defines. (diff)
downloadgentoo-aeb256e8007ae4b1a0394f2b677214d1a9a78245.tar.gz
gentoo-aeb256e8007ae4b1a0394f2b677214d1a9a78245.tar.bz2
gentoo-aeb256e8007ae4b1a0394f2b677214d1a9a78245.zip
app-misc/mc: fix selected size handling gin filemanager
Bug: http://midnight-commander.org/ticket/3883 Package-Manager: Portage-2.3.16, Repoman-2.3.6
-rw-r--r--app-misc/mc/files/mc-4.8.19-selected-size.patch30
-rw-r--r--app-misc/mc/mc-4.8.20-r1.ebuild (renamed from app-misc/mc/mc-4.8.20.ebuild)1
2 files changed, 31 insertions, 0 deletions
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
+
diff --git a/app-misc/mc/mc-4.8.20.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild
index cb720f326c5f..1a2e5e3918ae 100644
--- a/app-misc/mc/mc-4.8.20.ebuild
+++ b/app-misc/mc/mc-4.8.20-r1.ebuild
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+ "${FILESDIR}"/${PN}-4.8.19-selected-size.patch
)
S=${WORKDIR}/${MY_P}