rpms/mc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- "shave" patches

Browse Source 
- reneme patch taken from VCS
This commit is contained in:
Your Name 2022-12-16 15:29:41 +00:00
parent c2eafa223d
commit b37813ed9b
5 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mc-Ticket-4374-fix-file-sort-by-version.patch Normal file
View File

@ -0,0 +1,31 @@
From db109be8a28f1556495979ee7d1967e982cca6fd Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Mon, 23 May 2022 20:52:30 +0300
Subject: [PATCH] Ticket #4374: fix file sort by version.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
src/filemanager/dir.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/filemanager/dir.c b/src/filemanager/dir.c
index 5862da6f9c..65a80cf12f 100644
--- a/src/filemanager/dir.c
+++ b/src/filemanager/dir.c
@@ -358,7 +358,15 @@ sort_vers (file_entry_t * a, file_entry_t * b)
int bd = MY_ISDIR (b);
if (ad == bd || panels_options.mix_all_files)
- return filevercmp (a->fname->str, b->fname->str) * reverse;
+ {
+ int result;
+
+ result = filevercmp (a->fname->str, b->fname->str);
+ if (result != 0)
+ return result * reverse;
+
+ return sort_name (a, b);
+ }
return bd - ad;
}

4
mc-default_setup.patch
View File

@ -1,5 +1,5 @@
--- mc-4.8.23.orig/src/setup.c 2019-06-16 18:49:31.000000000 +0100 --- a/src/setup.c
+++ mc-4.8.23/src/setup.c 2019-07-06 13:13:22.792243501 +0100 +++ b/src/setup.c
@@ -138,8 +138,8 @@ @@ -138,8 +138,8 @@
.fast_reload_msg_shown = FALSE, .fast_reload_msg_shown = FALSE,
.mark_moves_down = TRUE, .mark_moves_down = TRUE,

5
mc-python3.patch
View File

@ -1,6 +1,5 @@
diff -up mc-4.8.24/src/vfs/extfs/helpers/uc1541.python3 mc-4.8.24/src/vfs/extfs/helpers/uc1541 --- a/src/vfs/extfs/helpers/uc1541
--- mc-4.8.24/src/vfs/extfs/helpers/uc1541.python3 2020-01-20 14:40:30.637996501 +0100 +++ b/src/vfs/extfs/helpers/uc1541
+++ mc-4.8.24/src/vfs/extfs/helpers/uc1541 2020-01-20 14:37:55.253442507 +0100
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/env python -#!/usr/bin/env python
+#!/usr/bin/env python3 +#!/usr/bin/env python3

4
mc-spec.syntax.patch
View File

@ -1,5 +1,5 @@
--- mc-4.8.23/misc/syntax/spec.syntax~ 2019-06-16 18:49:31.000000000 +0100 --- a/misc/syntax/spec.syntax
+++ mc-4.8.23/misc/syntax/spec.syntax 2019-04-18 06:02:53.000000000 +0100 +++ b/misc/syntax/spec.syntax
@@ -5,25 +5,24 @@ @@ -5,25 +5,24 @@
keyword whole Build\{Aa\}rch: green keyword whole Build\{Aa\}rch: green
keyword whole Build\{Cc\}onflicts: green keyword whole Build\{Cc\}onflicts: green

9
mc-tmpdir.patch
View File

@ -1,6 +1,5 @@
diff -up mc-4.8.24/contrib/mc-wrapper.sh.in.tmpdir mc-4.8.24/contrib/mc-wrapper.sh.in --- a/contrib/mc-wrapper.sh.in
--- mc-4.8.24/contrib/mc-wrapper.sh.in.tmpdir 2020-01-27 09:17:46.815515791 +0100 +++ b/contrib/mc-wrapper.sh.in
+++ mc-4.8.24/contrib/mc-wrapper.sh.in 2020-01-27 09:18:01.430712110 +0100
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
MC_USER=`whoami` MC_USER=`whoami`
-MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$" -MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$"
@ -19,8 +18,8 @@ diff -up mc-4.8.24/contrib/mc-wrapper.sh.in.tmpdir mc-4.8.24/contrib/mc-wrapper.
#define SCRIPT_SUFFIX "" #define SCRIPT_SUFFIX ""
#define get_default_editor() "vi" #define get_default_editor() "vi"
#define OS_SORT_CASE_SENSITIVE_DEFAULT TRUE #define OS_SORT_CASE_SENSITIVE_DEFAULT TRUE
--- mc-4.8.22/contrib/mc-wrapper.csh.in~ --- a/contrib/mc-wrapper.csh.in
+++ mc-4.8.22/contrib/mc-wrapper.csh.in +++ b/contrib/mc-wrapper.csh.in
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
if ($?TMPDIR) then if ($?TMPDIR) then
setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$ setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$