1 |
commit: aeb256e8007ae4b1a0394f2b677214d1a9a78245 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 2 11:53:25 2017 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 2 12:12:46 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb256e8 |
7 |
|
8 |
app-misc/mc: fix selected size handling gin filemanager |
9 |
|
10 |
Bug: http://midnight-commander.org/ticket/3883 |
11 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
12 |
|
13 |
app-misc/mc/files/mc-4.8.19-selected-size.patch | 30 ++++++++++++++++++++++ |
14 |
.../mc/{mc-4.8.20.ebuild => mc-4.8.20-r1.ebuild} | 1 + |
15 |
2 files changed, 31 insertions(+) |
16 |
|
17 |
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 |
18 |
new file mode 100644 |
19 |
index 00000000000..06d6f46ff32 |
20 |
--- /dev/null |
21 |
+++ b/app-misc/mc/files/mc-4.8.19-selected-size.patch |
22 |
@@ -0,0 +1,30 @@ |
23 |
+From 069306eb2e7174f431bd3eecbc8f489f9652b782 Mon Sep 17 00:00:00 2001 |
24 |
+From: Andrew Borodin <aborodin@×××××.ru> |
25 |
+Date: Sat, 2 Dec 2017 14:39:50 +0300 |
26 |
+Subject: [PATCH] Ticket #3883: size_trunc_sep() breaks on multibyte locales. |
27 |
+ |
28 |
+The bug was introduced in b3867a6e154420833d6a1117f556b9ab2d64c6ab. |
29 |
+ |
30 |
+Signed-off-by: Andrew Borodin <aborodin@×××××.ru> |
31 |
+--- |
32 |
+ lib/util.c | 4 +++- |
33 |
+ 1 file changed, 3 insertions(+), 1 deletion(-) |
34 |
+ |
35 |
+diff --git a/lib/util.c b/lib/util.c |
36 |
+index 0326f65e8..c23d91fba 100644 |
37 |
+--- a/lib/util.c |
38 |
++++ b/lib/util.c |
39 |
+@@ -383,7 +383,9 @@ size_trunc_sep (uintmax_t size, gboolean use_si) |
40 |
+ p += strlen (p) - 1; |
41 |
+ d = x + sizeof (x) - 1; |
42 |
+ *d-- = '\0'; |
43 |
+- while (p >= y && (isalpha ((unsigned char) *p) || (unsigned char) *p == ' ')) |
44 |
++ /* @size format is "size unit", i.e. "[digits][space][letters]". |
45 |
++ Copy all charactes after digits. */ |
46 |
++ while (p >= y && !g_ascii_isdigit (*p)) |
47 |
+ *d-- = *p--; |
48 |
+ for (count = 0; p >= y; count++) |
49 |
+ { |
50 |
+-- |
51 |
+2.15.1 |
52 |
+ |
53 |
|
54 |
diff --git a/app-misc/mc/mc-4.8.20.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild |
55 |
similarity index 98% |
56 |
rename from app-misc/mc/mc-4.8.20.ebuild |
57 |
rename to app-misc/mc/mc-4.8.20-r1.ebuild |
58 |
index cb720f326c5..1a2e5e3918a 100644 |
59 |
--- a/app-misc/mc/mc-4.8.20.ebuild |
60 |
+++ b/app-misc/mc/mc-4.8.20-r1.ebuild |
61 |
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND} |
62 |
|
63 |
PATCHES=( |
64 |
"${FILESDIR}"/${PN}-4.8.13-tinfo.patch |
65 |
+ "${FILESDIR}"/${PN}-4.8.19-selected-size.patch |
66 |
) |
67 |
|
68 |
S=${WORKDIR}/${MY_P} |