From b37813ed9b25b7222c5c6d16593845a9855e7b76 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 16 Dec 2022 15:29:41 +0000 Subject: [PATCH] - "shave" patches - reneme patch taken from VCS --- mc-Ticket-4374-fix-file-sort-by-version.patch | 31 +++++++++++++++++++ mc-default_setup.patch | 4 +-- mc-python3.patch | 5 ++- mc-spec.syntax.patch | 4 +-- mc-tmpdir.patch | 9 +++--- 5 files changed, 41 insertions(+), 12 deletions(-) create mode 100644 mc-Ticket-4374-fix-file-sort-by-version.patch diff --git a/mc-Ticket-4374-fix-file-sort-by-version.patch b/mc-Ticket-4374-fix-file-sort-by-version.patch new file mode 100644 index 0000000..292ab0b --- /dev/null +++ b/mc-Ticket-4374-fix-file-sort-by-version.patch @@ -0,0 +1,31 @@ +From db109be8a28f1556495979ee7d1967e982cca6fd Mon Sep 17 00:00:00 2001 +From: Andrew Borodin +Date: Mon, 23 May 2022 20:52:30 +0300 +Subject: [PATCH] Ticket #4374: fix file sort by version. + +Signed-off-by: Andrew Borodin +--- + 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; + } diff --git a/mc-default_setup.patch b/mc-default_setup.patch index b2d34b2..1d3801f 100644 --- a/mc-default_setup.patch +++ b/mc-default_setup.patch @@ -1,5 +1,5 @@ ---- mc-4.8.23.orig/src/setup.c 2019-06-16 18:49:31.000000000 +0100 -+++ mc-4.8.23/src/setup.c 2019-07-06 13:13:22.792243501 +0100 +--- a/src/setup.c ++++ b/src/setup.c @@ -138,8 +138,8 @@ .fast_reload_msg_shown = FALSE, .mark_moves_down = TRUE, diff --git a/mc-python3.patch b/mc-python3.patch index 8b74e0d..ce06610 100644 --- a/mc-python3.patch +++ b/mc-python3.patch @@ -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 ---- mc-4.8.24/src/vfs/extfs/helpers/uc1541.python3 2020-01-20 14:40:30.637996501 +0100 -+++ mc-4.8.24/src/vfs/extfs/helpers/uc1541 2020-01-20 14:37:55.253442507 +0100 +--- a/src/vfs/extfs/helpers/uc1541 ++++ b/src/vfs/extfs/helpers/uc1541 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 diff --git a/mc-spec.syntax.patch b/mc-spec.syntax.patch index d2fefbb..17b3623 100644 --- a/mc-spec.syntax.patch +++ b/mc-spec.syntax.patch @@ -1,5 +1,5 @@ ---- mc-4.8.23/misc/syntax/spec.syntax~ 2019-06-16 18:49:31.000000000 +0100 -+++ mc-4.8.23/misc/syntax/spec.syntax 2019-04-18 06:02:53.000000000 +0100 +--- a/misc/syntax/spec.syntax ++++ b/misc/syntax/spec.syntax @@ -5,25 +5,24 @@ keyword whole Build\{Aa\}rch: green keyword whole Build\{Cc\}onflicts: green diff --git a/mc-tmpdir.patch b/mc-tmpdir.patch index 34a29f0..68661ed 100644 --- a/mc-tmpdir.patch +++ b/mc-tmpdir.patch @@ -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 ---- mc-4.8.24/contrib/mc-wrapper.sh.in.tmpdir 2020-01-27 09:17:46.815515791 +0100 -+++ mc-4.8.24/contrib/mc-wrapper.sh.in 2020-01-27 09:18:01.430712110 +0100 +--- a/contrib/mc-wrapper.sh.in ++++ b/contrib/mc-wrapper.sh.in @@ -1,5 +1,5 @@ MC_USER=`whoami` -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 get_default_editor() "vi" #define OS_SORT_CASE_SENSITIVE_DEFAULT TRUE ---- mc-4.8.22/contrib/mc-wrapper.csh.in~ -+++ mc-4.8.22/contrib/mc-wrapper.csh.in +--- a/contrib/mc-wrapper.csh.in ++++ b/contrib/mc-wrapper.csh.in @@ -3,7 +3,7 @@ if ($?TMPDIR) then setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$