Accepting request 1201658 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1201658 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=92
This commit is contained in:
commit
bc784ee2c1
@ -3,18 +3,14 @@ Bug-Debian: http://bugs.debian.org/540238
|
||||
Author: Denis Briand <denis@narcan.fr>
|
||||
Author: Jindřich Makovička
|
||||
|
||||
Index: contrib/mc.csh.in
|
||||
===================================================================
|
||||
--- contrib/mc.csh.in.orig 2010-07-05 21:12:51.000000000 +0200
|
||||
+++ contrib/mc.csh.in 2010-07-07 18:54:54.616547000 +0200
|
||||
@@ -1 +1 @@
|
||||
-alias mc 'source @pkglibexecdir@/mc-wrapper.csh'
|
||||
+alias mc 'source @datadir@/mc/mc-wrapper.csh'
|
||||
Index: contrib/Makefile.am
|
||||
===================================================================
|
||||
--- contrib/Makefile.am.orig 2010-07-05 21:12:51.000000000 +0200
|
||||
+++ contrib/Makefile.am 2010-07-07 18:56:25.946339000 +0200
|
||||
@@ -8,7 +8,7 @@ SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapp
|
||||
---
|
||||
contrib/Makefile.am | 2 +-
|
||||
contrib/mc.csh.in | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/contrib/Makefile.am
|
||||
+++ b/contrib/Makefile.am
|
||||
@@ -5,7 +5,7 @@ SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapp
|
||||
SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
|
||||
|
||||
pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
|
||||
@ -23,3 +19,8 @@ Index: contrib/Makefile.am
|
||||
|
||||
cfgdir = $(sysconfdir)/@PACKAGE@
|
||||
cfg_DATA = \
|
||||
--- a/contrib/mc.csh.in
|
||||
+++ b/contrib/mc.csh.in
|
||||
@@ -1 +1 @@
|
||||
-alias mc 'source @pkglibexecdir@/mc-wrapper.csh'
|
||||
+alias mc 'source @datadir@/mc/mc-wrapper.csh'
|
||||
|
@ -1,10 +1,10 @@
|
||||
---
|
||||
src/subshell/common.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
src/subshell/common.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/src/subshell/common.c
|
||||
+++ b/src/subshell/common.c
|
||||
@@ -713,7 +713,7 @@ parse_subshell_prompt_string (const char
|
||||
@@ -715,7 +715,7 @@ parse_subshell_prompt_string (const char
|
||||
|
||||
/* Extract the prompt from the shell output */
|
||||
for (i = 0; i < bytes; i++)
|
||||
|
@ -1,2 +0,0 @@
|
||||
f42f4114ed42f6cf9995f1d896fa6c797ccb36dac57760dda8dd9f78ac462841 mc-4.8.31.tar.bz2
|
||||
24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a mc-4.8.31.tar.xz
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a
|
||||
size 2385632
|
2
mc-4.8.32.sha256
Normal file
2
mc-4.8.32.sha256
Normal file
@ -0,0 +1,2 @@
|
||||
51a039ebd15d5e442312a7053a4ca28276b7f241050b7714d5bae5362ecd3319 mc-4.8.32.tar.bz2
|
||||
4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe mc-4.8.32.tar.xz
|
3
mc-4.8.32.tar.xz
Normal file
3
mc-4.8.32.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe
|
||||
size 2385648
|
@ -1,6 +1,10 @@
|
||||
--- lib/util.c.orig 2014-09-05 20:50:09.000000000 +0200
|
||||
+++ lib/util.c 2014-09-05 20:51:02.000000000 +0200
|
||||
@@ -752,6 +752,8 @@ strip_ctrl_codes (char *s)
|
||||
---
|
||||
lib/util.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/lib/util.c
|
||||
+++ b/lib/util.c
|
||||
@@ -762,6 +762,8 @@ strip_ctrl_codes (char *s)
|
||||
while (*(++r) != '\0' && strchr ("0123456789;:?", *r) != NULL)
|
||||
;
|
||||
}
|
||||
|
@ -1,7 +1,9 @@
|
||||
Index: mc-4.8.31/misc/mc.ext.ini.in
|
||||
===================================================================
|
||||
--- mc-4.8.31.orig/misc/mc.ext.ini.in
|
||||
+++ mc-4.8.31/misc/mc.ext.ini.in
|
||||
---
|
||||
misc/mc.ext.ini.in | 13 ++++++++++++-
|
||||
1 file changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/misc/mc.ext.ini.in
|
||||
+++ b/misc/mc.ext.ini.in
|
||||
@@ -591,23 +591,26 @@ Open=@EXTHELPERSDIR@/image.sh open avif
|
||||
[sound]
|
||||
Regex=\\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv|spx|flac)$
|
||||
|
@ -1,7 +1,9 @@
|
||||
Index: misc/ext.d/doc.sh.in
|
||||
===================================================================
|
||||
--- misc/ext.d/doc.sh.in.orig
|
||||
+++ misc/ext.d/doc.sh.in
|
||||
---
|
||||
misc/ext.d/doc.sh.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/misc/ext.d/doc.sh.in
|
||||
+++ b/misc/ext.d/doc.sh.in
|
||||
@@ -52,7 +52,7 @@ do_view_action() {
|
||||
fi
|
||||
;;
|
||||
|
@ -1,13 +1,21 @@
|
||||
--- misc/ext.d/misc.sh.in.orig 2012-12-27 12:13:20.000000000 +0400
|
||||
+++ misc/ext.d/misc.sh.in 2013-03-09 12:10:56.696615817 +0400
|
||||
@@ -47,3 +47,9 @@
|
||||
---
|
||||
misc/ext.d/misc.sh.in | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/misc/ext.d/misc.sh.in
|
||||
+++ b/misc/ext.d/misc.sh.in
|
||||
@@ -52,7 +52,13 @@ do_view_action() {
|
||||
lyxcat "${MC_EXT_FILENAME}"
|
||||
;;
|
||||
torrent)
|
||||
- ctorrent -x "${MC_EXT_FILENAME}" 2>/dev/null
|
||||
+ if type -p ctorrent >/dev/null 2>&1 ; then
|
||||
+ ctorrent -x "${MC_EXT_FILENAME}" 2>/dev/null
|
||||
+ ctorrent -x "${MC_EXT_FILENAME}" 2>/dev/null
|
||||
+ elif type -p transmission-show >/dev/null 2>&1 ; then
|
||||
+ transmission-show "${MC_EXT_FILENAME}"
|
||||
+ else
|
||||
+ file "${MC_EXT_FILENAME}"
|
||||
+ fi
|
||||
;;
|
||||
javaclass)
|
||||
jad -p "${MC_EXT_FILENAME}" 2>/dev/null || \
|
||||
|
@ -1,7 +1,9 @@
|
||||
Index: misc/ext.d/sound.sh
|
||||
===================================================================
|
||||
--- misc/ext.d/sound.sh.orig
|
||||
+++ misc/ext.d/sound.sh
|
||||
---
|
||||
misc/ext.d/sound.sh | 34 ++++++++++++++++++++++++++--------
|
||||
1 file changed, 26 insertions(+), 8 deletions(-)
|
||||
|
||||
--- a/misc/ext.d/sound.sh
|
||||
+++ b/misc/ext.d/sound.sh
|
||||
@@ -6,22 +6,40 @@
|
||||
action=$1
|
||||
filetype=$2
|
||||
|
@ -1,7 +1,9 @@
|
||||
Index: misc/ext.d/video.sh
|
||||
===================================================================
|
||||
--- misc/ext.d/video.sh.orig
|
||||
+++ misc/ext.d/video.sh
|
||||
---
|
||||
misc/ext.d/video.sh | 17 +++++++++++++++--
|
||||
1 file changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/misc/ext.d/video.sh
|
||||
+++ b/misc/ext.d/video.sh
|
||||
@@ -6,14 +6,27 @@
|
||||
action=$1
|
||||
filetype=$2
|
||||
|
@ -1,7 +1,17 @@
|
||||
Index: misc/ext.d/archive.sh
|
||||
===================================================================
|
||||
--- misc/ext.d/archive.sh.orig
|
||||
+++ misc/ext.d/archive.sh
|
||||
---
|
||||
misc/ext.d/archive.sh | 2 +-
|
||||
misc/ext.d/doc.sh.in | 2 +-
|
||||
misc/ext.d/image.sh | 2 +-
|
||||
misc/ext.d/misc.sh.in | 2 +-
|
||||
misc/ext.d/package.sh | 2 +-
|
||||
misc/ext.d/sound.sh | 2 +-
|
||||
misc/ext.d/text.sh.in | 2 +-
|
||||
misc/ext.d/video.sh | 2 +-
|
||||
misc/ext.d/web.sh.in | 2 +-
|
||||
9 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
--- a/misc/ext.d/archive.sh
|
||||
+++ b/misc/ext.d/archive.sh
|
||||
@@ -210,7 +210,7 @@ view)
|
||||
do_view_action "${filetype}"
|
||||
;;
|
||||
@ -11,10 +21,8 @@ Index: misc/ext.d/archive.sh
|
||||
do_open_action "${filetype}" "${pager}"
|
||||
;;
|
||||
*)
|
||||
Index: misc/ext.d/doc.sh.in
|
||||
===================================================================
|
||||
--- misc/ext.d/doc.sh.in.orig
|
||||
+++ misc/ext.d/doc.sh.in
|
||||
--- a/misc/ext.d/doc.sh.in
|
||||
+++ b/misc/ext.d/doc.sh.in
|
||||
@@ -210,7 +210,7 @@ view)
|
||||
do_view_action "${filetype}"
|
||||
;;
|
||||
@ -24,10 +32,8 @@ Index: misc/ext.d/doc.sh.in
|
||||
do_open_action "${filetype}"
|
||||
;;
|
||||
*)
|
||||
Index: misc/ext.d/image.sh
|
||||
===================================================================
|
||||
--- misc/ext.d/image.sh.orig
|
||||
+++ misc/ext.d/image.sh
|
||||
--- a/misc/ext.d/image.sh
|
||||
+++ b/misc/ext.d/image.sh
|
||||
@@ -64,7 +64,7 @@ view)
|
||||
do_view_action "${filetype}"
|
||||
;;
|
||||
@ -37,10 +43,8 @@ Index: misc/ext.d/image.sh
|
||||
do_open_action "${filetype}"
|
||||
;;
|
||||
*)
|
||||
Index: misc/ext.d/misc.sh.in
|
||||
===================================================================
|
||||
--- misc/ext.d/misc.sh.in.orig
|
||||
+++ misc/ext.d/misc.sh.in
|
||||
--- a/misc/ext.d/misc.sh.in
|
||||
+++ b/misc/ext.d/misc.sh.in
|
||||
@@ -102,7 +102,7 @@ view)
|
||||
do_view_action "${filetype}"
|
||||
;;
|
||||
@ -50,10 +54,8 @@ Index: misc/ext.d/misc.sh.in
|
||||
do_open_action "${filetype}"
|
||||
;;
|
||||
*)
|
||||
Index: misc/ext.d/package.sh
|
||||
===================================================================
|
||||
--- misc/ext.d/package.sh.orig
|
||||
+++ misc/ext.d/package.sh
|
||||
--- a/misc/ext.d/package.sh
|
||||
+++ b/misc/ext.d/package.sh
|
||||
@@ -51,7 +51,7 @@ view)
|
||||
do_view_action "${filetype}"
|
||||
;;
|
||||
@ -63,10 +65,8 @@ Index: misc/ext.d/package.sh
|
||||
do_open_action "${filetype}"
|
||||
;;
|
||||
*)
|
||||
Index: misc/ext.d/sound.sh
|
||||
===================================================================
|
||||
--- misc/ext.d/sound.sh.orig
|
||||
+++ misc/ext.d/sound.sh
|
||||
--- a/misc/ext.d/sound.sh
|
||||
+++ b/misc/ext.d/sound.sh
|
||||
@@ -116,7 +116,7 @@ view)
|
||||
do_view_action "${filetype}"
|
||||
;;
|
||||
@ -76,10 +76,8 @@ Index: misc/ext.d/sound.sh
|
||||
do_open_action "${filetype}"
|
||||
;;
|
||||
*)
|
||||
Index: misc/ext.d/text.sh.in
|
||||
===================================================================
|
||||
--- misc/ext.d/text.sh.in.orig
|
||||
+++ misc/ext.d/text.sh.in
|
||||
--- a/misc/ext.d/text.sh.in
|
||||
+++ b/misc/ext.d/text.sh.in
|
||||
@@ -147,7 +147,7 @@ view)
|
||||
do_view_action "${filetype}"
|
||||
;;
|
||||
@ -89,10 +87,8 @@ Index: misc/ext.d/text.sh.in
|
||||
do_open_action "${filetype}" "${pager}"
|
||||
;;
|
||||
*)
|
||||
Index: misc/ext.d/video.sh
|
||||
===================================================================
|
||||
--- misc/ext.d/video.sh.orig
|
||||
+++ misc/ext.d/video.sh
|
||||
--- a/misc/ext.d/video.sh
|
||||
+++ b/misc/ext.d/video.sh
|
||||
@@ -66,7 +66,7 @@ view)
|
||||
do_view_action "${filetype}"
|
||||
;;
|
||||
@ -102,10 +98,8 @@ Index: misc/ext.d/video.sh
|
||||
do_open_action "${filetype}"
|
||||
;;
|
||||
*)
|
||||
Index: misc/ext.d/web.sh.in
|
||||
===================================================================
|
||||
--- misc/ext.d/web.sh.in.orig
|
||||
+++ misc/ext.d/web.sh.in
|
||||
--- a/misc/ext.d/web.sh.in
|
||||
+++ b/misc/ext.d/web.sh.in
|
||||
@@ -47,7 +47,7 @@ view)
|
||||
do_view_action "${filetype}"
|
||||
;;
|
||||
|
@ -1,6 +1,10 @@
|
||||
--- src/vfs/extfs/helpers/deb.in.orig 2012-04-20 11:21:37.000000000 +0400
|
||||
+++ src/vfs/extfs/helpers/deb.in 2012-07-23 17:21:47.000000000 +0400
|
||||
@@ -176,6 +176,15 @@
|
||||
---
|
||||
src/vfs/extfs/helpers/deb.in | 23 +++++++++++++++++++++++
|
||||
1 file changed, 23 insertions(+)
|
||||
|
||||
--- a/src/vfs/extfs/helpers/deb.in
|
||||
+++ b/src/vfs/extfs/helpers/deb.in
|
||||
@@ -179,6 +179,15 @@ sub mcdebfs_run
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,7 +20,7 @@
|
||||
$pressinstall=<<EOInstall;
|
||||
|
||||
WARNING
|
||||
@@ -192,6 +201,20 @@
|
||||
@@ -195,6 +204,20 @@ EOInstall
|
||||
|
||||
umask 077;
|
||||
|
||||
|
@ -1,16 +0,0 @@
|
||||
Index: src/vfs/extfs/helpers/iso9660.in
|
||||
===================================================================
|
||||
--- src/vfs/extfs/helpers/iso9660.in.orig
|
||||
+++ src/vfs/extfs/helpers/iso9660.in
|
||||
@@ -46,9 +46,9 @@ xorriso_list() {
|
||||
echo "$lsl" | grep "^[-d]" | \
|
||||
while read attr ln usr gr sz dt1 dt2 dt3 nm ; do
|
||||
len=$((${#nm} - 1))
|
||||
- name=$(printf -- "$nm" | cut -c2-$len) # remove quotes
|
||||
+ name=$(printf -- '%s' "$nm" | cut -c2-$len) # remove quotes
|
||||
|
||||
- if test $(printf -- "$attr" | cut -c1-1) != "d"; then
|
||||
+ if test $(printf -- '%s' "$attr" | cut -c1-1) != "d"; then
|
||||
printf -- "%s %s %s %s %s %s %s %s %s/%s\n" "$attr" "$ln" "$usr" "$gr" "$sz" "$dt1" "$dt2" "$dt3" "$dir" "$name"
|
||||
else
|
||||
xorriso_list "$1" "$dir/$name"
|
@ -1,8 +1,10 @@
|
||||
Index: lib/tty/key.c
|
||||
===================================================================
|
||||
--- lib/tty/key.c.orig 2010-07-05 21:12:51.000000000 +0200
|
||||
+++ lib/tty/key.c 2010-07-07 11:35:25.871011522 +0200
|
||||
@@ -300,6 +300,11 @@ static key_define_t xterm_key_defines[]
|
||||
---
|
||||
lib/tty/key.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
--- a/lib/tty/key.c
|
||||
+++ b/lib/tty/key.c
|
||||
@@ -304,6 +304,11 @@ static key_define_t xterm_key_defines[]
|
||||
{KEY_F (9), ESC_STR "[20~", MCKEY_NOACTION},
|
||||
{KEY_F (10), ESC_STR "[21~", MCKEY_NOACTION},
|
||||
|
||||
|
@ -1,8 +1,10 @@
|
||||
Index: m4.include/mc-with-screen-ncurses.m4
|
||||
===================================================================
|
||||
--- m4.include/mc-with-screen-ncurses.m4.orig 2010-07-05 21:12:51.000000000 +0200
|
||||
+++ m4.include/mc-with-screen-ncurses.m4 2010-07-07 17:20:37.294701000 +0200
|
||||
@@ -9,7 +9,14 @@ AC_DEFUN([MC_CHECK_NCURSES_BY_PATH], [
|
||||
---
|
||||
m4.include/mc-with-screen-ncurses.m4 | 12 ++++++++----
|
||||
1 file changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/m4.include/mc-with-screen-ncurses.m4
|
||||
+++ b/m4.include/mc-with-screen-ncurses.m4
|
||||
@@ -9,7 +9,14 @@ AC_DEFUN([mc_CHECK_NCURSES_BY_PATH], [
|
||||
fi
|
||||
|
||||
if test x"$ac_ncurses_lib_path" != x; then
|
||||
@ -18,7 +20,7 @@ Index: m4.include/mc-with-screen-ncurses.m4
|
||||
fi
|
||||
|
||||
saved_CPPFLAGS="$CPPFLAGS"
|
||||
@@ -32,9 +39,6 @@ AC_DEFUN([MC_CHECK_NCURSES_BY_PATH], [
|
||||
@@ -32,9 +39,6 @@ AC_DEFUN([mc_CHECK_NCURSES_BY_PATH], [
|
||||
if test x"$ac_ncurses_inc_path" = x; then
|
||||
ac_ncurses_inc_path="-I/usr/include"
|
||||
fi
|
||||
|
@ -4,11 +4,9 @@ http://www.midnight-commander.org/ticket/287
|
||||
lib/tty/tty-slang.h | 1 +
|
||||
2 files changed, 16 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: mc-4.8.23/lib/tty/key.c
|
||||
===================================================================
|
||||
--- mc-4.8.23.orig/lib/tty/key.c
|
||||
+++ mc-4.8.23/lib/tty/key.c
|
||||
@@ -1050,10 +1050,13 @@ correct_key_code (int code)
|
||||
--- a/lib/tty/key.c
|
||||
+++ b/lib/tty/key.c
|
||||
@@ -1060,10 +1060,13 @@ correct_key_code (int code)
|
||||
mod = KEY_M_SHIFT;
|
||||
}
|
||||
|
||||
@ -23,7 +21,7 @@ Index: mc-4.8.23/lib/tty/key.c
|
||||
/*
|
||||
* We are not interested if Ctrl was pressed when entering control
|
||||
* characters, so assume that it was. When checking for such keys,
|
||||
@@ -1126,6 +1129,16 @@ correct_key_code (int code)
|
||||
@@ -1136,6 +1139,16 @@ correct_key_code (int code)
|
||||
if (c >= KEY_F (1) && c <= KEY_F (20))
|
||||
mod &= ~KEY_M_SHIFT;
|
||||
|
||||
@ -40,7 +38,7 @@ Index: mc-4.8.23/lib/tty/key.c
|
||||
if (!mc_global.tty.alternate_plus_minus)
|
||||
switch (c)
|
||||
{
|
||||
@@ -1909,7 +1922,7 @@ get_key_code (int no_delay)
|
||||
@@ -1889,7 +1902,7 @@ get_key_code (int no_delay)
|
||||
{
|
||||
/* Convert escape-digits to F-keys */
|
||||
if (g_ascii_isdigit (c))
|
||||
@ -49,11 +47,9 @@ Index: mc-4.8.23/lib/tty/key.c
|
||||
else if (c == ' ')
|
||||
c = ESC_CHAR;
|
||||
else
|
||||
Index: mc-4.8.23/lib/tty/tty-slang.h
|
||||
===================================================================
|
||||
--- mc-4.8.23.orig/lib/tty/tty-slang.h
|
||||
+++ mc-4.8.23/lib/tty/tty-slang.h
|
||||
@@ -11,6 +11,7 @@
|
||||
--- a/lib/tty/tty-slang.h
|
||||
+++ b/lib/tty/tty-slang.h
|
||||
@@ -7,6 +7,7 @@
|
||||
/*** typedefs(not structures) and defined constants **********************************************/
|
||||
|
||||
#define KEY_F(x) (1000 + x)
|
||||
|
10
mc-pie.patch
10
mc-pie.patch
@ -1,6 +1,10 @@
|
||||
--- mc-4.8.1.7/src/consaver/Makefile.am.orig 2012-12-28 12:47:48.000000000 +0400
|
||||
+++ mc-4.8.1.7/src/consaver/Makefile.am 2013-03-07 10:00:44.473817319 +0400
|
||||
@@ -4,4 +4,6 @@
|
||||
---
|
||||
src/consaver/Makefile.am | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/src/consaver/Makefile.am
|
||||
+++ b/src/consaver/Makefile.am
|
||||
@@ -4,4 +4,6 @@ pkglibexec_PROGRAMS = cons.saver
|
||||
|
||||
cons_saver_SOURCES = cons.saver.c
|
||||
|
||||
|
@ -1,8 +1,10 @@
|
||||
Index: mc-4.8.31/src/filemanager/file.c
|
||||
===================================================================
|
||||
--- mc-4.8.31.orig/src/filemanager/file.c
|
||||
+++ mc-4.8.31/src/filemanager/file.c
|
||||
@@ -2744,6 +2744,8 @@ copy_file_file (file_op_total_context_t
|
||||
---
|
||||
src/filemanager/file.c | 12 ++++++++----
|
||||
1 file changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/src/filemanager/file.c
|
||||
+++ b/src/filemanager/file.c
|
||||
@@ -2802,6 +2802,8 @@ copy_file_file (file_op_total_context_t
|
||||
continue;
|
||||
if (temp_status == FILE_ABORT)
|
||||
return_status = temp_status;
|
||||
@ -11,7 +13,7 @@ Index: mc-4.8.31/src/filemanager/file.c
|
||||
if (temp_status == FILE_SKIPALL)
|
||||
ctx->skip_all = TRUE;
|
||||
break;
|
||||
@@ -2754,6 +2756,8 @@ copy_file_file (file_op_total_context_t
|
||||
@@ -2812,6 +2814,8 @@ copy_file_file (file_op_total_context_t
|
||||
temp_status = file_error (TRUE, _("Cannot close target file \"%s\"\n%s"), dst_path);
|
||||
if (temp_status == FILE_RETRY)
|
||||
continue;
|
||||
@ -20,7 +22,7 @@ Index: mc-4.8.31/src/filemanager/file.c
|
||||
if (temp_status == FILE_SKIPALL)
|
||||
ctx->skip_all = TRUE;
|
||||
return_status = temp_status;
|
||||
@@ -2785,10 +2789,10 @@ copy_file_file (file_op_total_context_t
|
||||
@@ -2843,10 +2847,10 @@ copy_file_file (file_op_total_context_t
|
||||
if (temp_status == FILE_SKIPALL)
|
||||
{
|
||||
ctx->skip_all = TRUE;
|
||||
@ -33,7 +35,7 @@ Index: mc-4.8.31/src/filemanager/file.c
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -2801,10 +2805,10 @@ copy_file_file (file_op_total_context_t
|
||||
@@ -2859,10 +2863,10 @@ copy_file_file (file_op_total_context_t
|
||||
if (temp_status == FILE_SKIPALL)
|
||||
{
|
||||
ctx->skip_all = TRUE;
|
||||
|
@ -3,10 +3,8 @@
|
||||
contrib/mc.sh.in | 9 ++++++++-
|
||||
2 files changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
Index: mc-4.8.30/contrib/Makefile.am
|
||||
===================================================================
|
||||
--- mc-4.8.30.orig/contrib/Makefile.am
|
||||
+++ mc-4.8.30/contrib/Makefile.am
|
||||
--- a/contrib/Makefile.am
|
||||
+++ b/contrib/Makefile.am
|
||||
@@ -19,10 +19,10 @@ EXTRA_DIST = \
|
||||
$(noinst_DATA)
|
||||
|
||||
@ -20,10 +18,8 @@ Index: mc-4.8.30/contrib/Makefile.am
|
||||
|
||||
mc-wrapper.csh: $(top_builddir)/config.status $(srcdir)/mc-wrapper.csh.in
|
||||
$(SED) "s%@""bindir@%$(bindir)%" $(srcdir)/mc-wrapper.csh.in > mc-wrapper.csh
|
||||
Index: mc-4.8.30/contrib/mc.sh.in
|
||||
===================================================================
|
||||
--- mc-4.8.30.orig/contrib/mc.sh.in
|
||||
+++ mc-4.8.30/contrib/mc.sh.in
|
||||
--- a/contrib/mc.sh.in
|
||||
+++ b/contrib/mc.sh.in
|
||||
@@ -1,3 +1,10 @@
|
||||
# Don't define aliases in plain Bourne shell
|
||||
[ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0
|
||||
|
46
mc.changes
46
mc.changes
@ -1,3 +1,49 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 17 15:04:39 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- Update to 4.8.32:
|
||||
- Core
|
||||
- Tell the current directory to the terminal using OSC 7 sequence (so it can open new tabs there) (#3088)
|
||||
- Preserve ext2fs attributes on copy/move operations (#4532)
|
||||
- Change name of temporary directory: make it unique for each run (#4535)
|
||||
- Hide password in file operation progress dialog (#4541)
|
||||
- Support reget in file move operation (#4563)
|
||||
- Implement nanosecond precision timestamps on non-Linux (macOS, BSD, AIX, Solaris) (#4563)
|
||||
- Remove remaining mmap code to simplify maintenance (#3960)
|
||||
- VFS
|
||||
- extfs: support unrar-7 (#4518)
|
||||
- Editor
|
||||
- Improve syntax highlighting:
|
||||
- C and C++ (MidnightCommander?/mc#195, #4556)
|
||||
- Viewer
|
||||
- Diff viewer
|
||||
- Add man page mcdiff.1 (#4224)
|
||||
- Misc
|
||||
- Code cleanup (#4524)
|
||||
- New skins
|
||||
- xoria256-thin, xoria256root-thin (#4530)
|
||||
- modarcon16-defbg-thin, modarcon16-thin, modarcon16root-defbg-thin, modarcon16root-thin (#4530)
|
||||
- modarin256-defbg-thin, modarin256-thin, modarin256root-defbg-thin, modarin256root-thin (#4530)
|
||||
- julia256root (#4536)
|
||||
- mc.ext.ini: clarify escaping of spaces and parenthesis (#4502)
|
||||
- Fixes
|
||||
- External editor does not work with arguments in $EDITOR (#4533)
|
||||
- fish shell: strings " cd (printf '%b' ... " in history (#4521)
|
||||
- Redundant back slashes for autocomplete (#4292)
|
||||
- subshell: call execl with argv[0] that is not an actual path to Bash (#4549)
|
||||
- mcedit: php.syntax: comment highlight from start of light only (#4519)
|
||||
- mcedit: wrong replacement using regular expressions with begin or end of line (#4525, #4526)
|
||||
- mcedit: losing column position when navigating up/down (MidnightCommander?/mc#194)
|
||||
- mcedit: macro deletes text (#4540)
|
||||
- mcedit: macros are applied to the pasted text (#4562)
|
||||
- extfs: iso9660: xorriso is slow to open an ISO image (#3570, #4567)
|
||||
- extfs: u7z: wrong add of nested directories to archive (#4559)
|
||||
- extfs: segfault on enter to deleted archive (#4560)
|
||||
- tar: segfault on copy files from archive (#4561)
|
||||
- man: typo (#4550)
|
||||
- Remove mc-extfs-iso9660-xorriso.patch patch which doesn't apply anymore.
|
||||
- Other patches reapplied.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 18 10:37:48 UTC 2024 - pgajdos@suse.com
|
||||
|
||||
|
25
mc.spec
25
mc.spec
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: mc
|
||||
Version: 4.8.31
|
||||
Version: 4.8.32
|
||||
Release: 0
|
||||
Summary: Midnight Commander
|
||||
License: GPL-3.0-or-later
|
||||
@ -38,9 +38,6 @@ Patch21: mc-extfs-helpers-deb.patch
|
||||
# add patch. bnc#856501
|
||||
# http://www.midnight-commander.org/ticket/3128
|
||||
Patch22: mc-vfs-fish-deleted_source_file.patch
|
||||
# changed mc-extfs-iso9660-xorriso.patch
|
||||
# to reflect upstream fix
|
||||
Patch23: mc-extfs-iso9660-xorriso.patch
|
||||
#Debian fixes
|
||||
Patch32: 20_wrong_path_to_wrappers.patch
|
||||
# PATCH-FIX-UPSTREAM mc-multi-press-f-keys.patch mc287 sbrabec@suse.cz - Fixed Esc + Numeral F-key emulation.
|
||||
@ -94,25 +91,7 @@ isoinfo (from mkisofs) or xorriso for the iso:// extension.
|
||||
|
||||
%prep
|
||||
echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOURCE0}" | sha256sum -c
|
||||
%setup -q
|
||||
%patch -P 0
|
||||
%patch -P 61
|
||||
%patch -P 62
|
||||
%patch -P 63
|
||||
%patch -P 64
|
||||
%patch -P 69
|
||||
%patch -P 71 -p1
|
||||
%patch -P 12 -p1
|
||||
%patch -P 16
|
||||
%patch -P 20
|
||||
%patch -P 21
|
||||
%patch -P 22 -p1
|
||||
%patch -P 23
|
||||
%patch -P 32
|
||||
%patch -P 41 -p1
|
||||
%patch -P 42 -p1
|
||||
%patch -P 52 -p1
|
||||
%patch -P 100 -p1
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%{?!make_build:%define make_build make -O %_smp_mflags V=1 VERBOSE=1}
|
||||
|
@ -2,10 +2,12 @@ Author: Adam Majer
|
||||
Upstream: http://midnight-commander.org/ticket/3912
|
||||
Bugzilla: 1087708
|
||||
|
||||
Index: mc-4.8.26/misc/ext.d/doc.sh.in
|
||||
===================================================================
|
||||
--- mc-4.8.26.orig/misc/ext.d/doc.sh.in
|
||||
+++ mc-4.8.26/misc/ext.d/doc.sh.in
|
||||
---
|
||||
misc/ext.d/doc.sh.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/misc/ext.d/doc.sh.in
|
||||
+++ b/misc/ext.d/doc.sh.in
|
||||
@@ -74,7 +74,7 @@ do_view_action() {
|
||||
elinks -dump "$tmp/page.html"
|
||||
rm -rf "$tmp"
|
||||
|
Loading…
x
Reference in New Issue
Block a user