From d97240586a6d1758dd561c978f9cc0546eda341c7f065127a4cfcfdf501395c7 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Mon, 20 Mar 2023 11:01:23 +0000 Subject: [PATCH 1/3] Accepting request 1072916 from home:dirkmueller:Factory - update to 4.8.29: * Add more options for panel filter (#1373): * "Files only" * "Case sensitive" * "Using shell patterns" * Continue copy after interrupt * Restore menu accelerator for "Sort order": back to "S"; change menu accelerator for "SFTP link" to "N" * Add support for cross-compilation with PERL path different between --build and --host * Bootstrap with autotools providing direct support for Apple M1 * Port mc.ext to INI format and rename to mc.ext.ini * Implement compound (AND) conditions (Type/Shell and Type/Regex pairs) to disambiguate overloaded extensions * There is no fallback to previous mc.ext format * Editor + Change location of all user's syntax related stuff to ~/.local/share/mc/syntax/ directory + syntax/Syntax: document location of syntax files + Improvements of syntax highlighting: + YAML: improve multiline blocks highliting + New syntax highlighting: + Privoxy (https://www.privoxy.org) actions files + TOML (Tom's Obvious Minimal Language) + sqlite3 view: use 'immutable=1' URI parameter to prevent leaving wal/shm files after viewing sqlite database + Support of contour terminal emulator (https://github.com/contour-terminal/contour) + mc.ext.ini: clarify regex for makefiles OBS-URL: https://build.opensuse.org/request/show/1072916 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=144 --- mc-4.8.28.sha256 | 2 -- mc-4.8.28.tar.xz | 3 --- mc-4.8.29.sha256 | 2 ++ mc-4.8.29.tar.xz | 3 +++ mc.changes | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ mc.spec | 4 ++-- 6 files changed, 69 insertions(+), 7 deletions(-) delete mode 100644 mc-4.8.28.sha256 delete mode 100644 mc-4.8.28.tar.xz create mode 100644 mc-4.8.29.sha256 create mode 100644 mc-4.8.29.tar.xz diff --git a/mc-4.8.28.sha256 b/mc-4.8.28.sha256 deleted file mode 100644 index 48c9810..0000000 --- a/mc-4.8.28.sha256 +++ /dev/null @@ -1,2 +0,0 @@ -6bb47533d7a55bb21e46292d2f94786c9037bd7a70bf02b6a3c48adb0c9ce20c mc-4.8.28.tar.bz2 -e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803 mc-4.8.28.tar.xz diff --git a/mc-4.8.28.tar.xz b/mc-4.8.28.tar.xz deleted file mode 100644 index 18bbfff..0000000 --- a/mc-4.8.28.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803 -size 2333072 diff --git a/mc-4.8.29.sha256 b/mc-4.8.29.sha256 new file mode 100644 index 0000000..7a2ff80 --- /dev/null +++ b/mc-4.8.29.sha256 @@ -0,0 +1,2 @@ +ba6b2d8752806ac23fe045c1b081eb66dcefa6159205c79f86c005dcaf9941c1 mc-4.8.29.tar.bz2 +01d8a3b94f58180cca5bf17257b5078d1fd6fd27a9b5c0e970ec767549540ad4 mc-4.8.29.tar.xz diff --git a/mc-4.8.29.tar.xz b/mc-4.8.29.tar.xz new file mode 100644 index 0000000..75a4b47 --- /dev/null +++ b/mc-4.8.29.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01d8a3b94f58180cca5bf17257b5078d1fd6fd27a9b5c0e970ec767549540ad4 +size 2368164 diff --git a/mc.changes b/mc.changes index c17575d..66a034e 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Sun Mar 19 09:44:44 UTC 2023 - Dirk Müller + +- update to 4.8.29: + * Add more options for panel filter (#1373): + * "Files only" + * "Case sensitive" + * "Using shell patterns" + * Continue copy after interrupt + * Restore menu accelerator for "Sort order": back to "S"; + change menu accelerator for "SFTP link" to "N" + * Add support for cross-compilation with PERL path different + between --build and --host + * Bootstrap with autotools providing direct support for Apple + M1 + * Port mc.ext to INI format and rename to mc.ext.ini + * Implement compound (AND) conditions (Type/Shell and + Type/Regex pairs) to disambiguate overloaded extensions + * There is no fallback to previous mc.ext format + * Editor + + Change location of all user's syntax related stuff to + ~/.local/share/mc/syntax/ directory + + syntax/Syntax: document location of syntax files + + Improvements of syntax highlighting: + + YAML: improve multiline blocks highliting + + New syntax highlighting: + + Privoxy (https://www.privoxy.org) actions files + + TOML (Tom's Obvious Minimal Language) + + sqlite3 view: use 'immutable=1' URI parameter to prevent + leaving wal/shm files after viewing sqlite database + + Support of contour terminal emulator + (https://github.com/contour-terminal/contour) + + mc.ext.ini: clarify regex for makefiles + + Remove empty hints translations by setting 5% threshold + + Fixes + + Fail to build with only SFTP network VFS is enabled + + Crash on quick view of archives + + Wrong description of --enable-configure-args option + + Wrong version sort + + No subshell if subshell is initializing more than 1 second + + Filter keyboard shortcut only affects left panel + + File type check does not work with special character in + filename + + Select files keeping the right mouse button pressed doesn't + select all files + + Cannot scroll panel listing upwards using mouse + + "Directory Compare" doesn't correct work with panelization + + Wrong decompressing of zip files in quick view panel + + mc.ext: 'include' keyword (for command class def) have no + effect if it was defined before 'Include' keyword (for + command def) + + mcedit: infinite loop when deleting a macro + + mcviewer: segfault when switching from raw to parsed mode and + back + + Broken handling of zip archives + + FISH subshell: commands don't work after window resize + + FTP VFS: doesn't reconnect to server after timeout + + FISH VFS: cannot remove non-empty directory + + EXTFS VFS: segfault if archive contains file(s) in the parent + directory + + Tests: variable redeclaration in filevercmp_test5 + ------------------------------------------------------------------- Mon Jun 27 19:36:16 UTC 2022 - Matej Cepl diff --git a/mc.spec b/mc.spec index c76cc6d..c7e0c7c 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,7 @@ # # spec file for package mc # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: mc -Version: 4.8.28 +Version: 4.8.29 Release: 0 Summary: Midnight Commander License: GPL-3.0-or-later From 4104642fbd58a8f0fa922799fe8ca7fae7fdf2c184d6137e781052a8f966432f Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 23 Mar 2023 11:24:35 +0000 Subject: [PATCH 2/3] - mc-ext-audio.patch: refresh patch OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=145 --- mc-ext-audio.patch | 91 ++++++++++++++++++++++++++-------------------- mc.changes | 5 +++ mc.spec | 2 +- 3 files changed, 57 insertions(+), 41 deletions(-) diff --git a/mc-ext-audio.patch b/mc-ext-audio.patch index 87d2fe0..f3ab36a 100644 --- a/mc-ext-audio.patch +++ b/mc-ext-audio.patch @@ -1,50 +1,61 @@ -Index: misc/mc.ext.in +Index: mc-4.8.29/misc/mc.ext.ini.in =================================================================== ---- misc/mc.ext.in.orig -+++ misc/mc.ext.in -@@ -573,17 +573,20 @@ shell/i/.svg - ### Sound files ### +--- mc-4.8.29.orig/misc/mc.ext.ini.in ++++ mc-4.8.29/misc/mc.ext.ini.in +@@ -557,23 +557,26 @@ Open=@EXTHELPERSDIR@/image.sh open svg + [sound] + Regex=\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv|spx|flac)$ + RegexIgnoreCase=true +-Open=@EXTHELPERSDIR@/sound.sh open common ++Include=audio + View=%view{ascii} @EXTHELPERSDIR@/sound.sh view common - regex/i/\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv)$ -- Open=@EXTHELPERSDIR@/sound.sh open common -+ Include=audio - View=%view{ascii} @EXTHELPERSDIR@/sound.sh view common + [mod] + Regex=\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$ + RegexIgnoreCase=true + Open=@EXTHELPERSDIR@/sound.sh open mod ++View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mod - regex/i/\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$ - Open=@EXTHELPERSDIR@/sound.sh open mod -+ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mod + [wav22] + Shell=.waw22 + ShellIgnoreCase=true + Open=@EXTHELPERSDIR@/sound.sh open wav22 ++View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mod - shell/i/.waw22 - Open=@EXTHELPERSDIR@/sound.sh open wav22 -+ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wav22 + [mp3] + Shell=.mp3 + ShellIgnoreCase=true + Open=@EXTHELPERSDIR@/sound.sh open mp3 ++Include=audio + View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3 - shell/i/.mp3 - Open=@EXTHELPERSDIR@/sound.sh open mp3 -+ Include=audio - View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3 + [ogg] +@@ -592,6 +595,7 @@ View=%view{ascii} @EXTHELPERSDIR@/sound. + Regex=\.(midi?|rmid?)$ + RegexIgnoreCase=true + Open=@EXTHELPERSDIR@/sound.sh open midi ++View=%view{ascii} @EXTHELPERSDIR@/sound.sh view midi - regex/i/\.og[gax]$ -@@ -595,15 +598,22 @@ shell/i/.opus - View=%view{ascii} @EXTHELPERSDIR@/sound.sh view opus + [wma] + Shell=.wma +@@ -599,6 +603,10 @@ ShellIgnoreCase=true + Open=@EXTHELPERSDIR@/sound.sh open wma + View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wma - regex/i/\.(spx|flac)$ -- Open=@EXTHELPERSDIR@/sound.sh open common -+ Include=audio - - regex/i/\.(midi?|rmid?)$ - Open=@EXTHELPERSDIR@/sound.sh open midi -+ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view midi - - shell/i/.wma - Open=@EXTHELPERSDIR@/sound.sh open wma - View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wma - -+shell/i/.mka -+ Include=audio ++[mka] ++Shell=.mka ++Include=audio + -+include/audio -+ Open=@EXTHELPERSDIR@/sound.sh open common -+ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view common + # Play list + [playlist] + Regex=\.(m3u|pls)$ +@@ -1115,6 +1123,9 @@ View=%view{ascii} @EXTHELPERSDIR@/image. + Open=@EXTHELPERSDIR@/video.sh open ALL_FORMATS + View=%view{ascii} @EXTHELPERSDIR@/video.sh view ALL_FORMATS - ### Play lists ### ++[Include/audio] ++Open=@EXTHELPERSDIR@/sound.sh open common ++View=%view{ascii} @EXTHELPERSDIR@/sound.sh view common + + ######### Default ######### diff --git a/mc.changes b/mc.changes index 66a034e..f24b238 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 23 11:23:59 UTC 2023 - Adam Majer + +- mc-ext-audio.patch: refresh patch + ------------------------------------------------------------------- Sun Mar 19 09:44:44 UTC 2023 - Dirk Müller diff --git a/mc.spec b/mc.spec index c7e0c7c..d365fa1 100644 --- a/mc.spec +++ b/mc.spec @@ -101,7 +101,7 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE6} | head -n1 | cut -c1-64` %{SOU %patch63 %patch64 %patch69 -%patch71 +%patch71 -p1 %patch12 -p1 %patch16 %patch20 From f6e941a3fbc6f09f870ebc581054d899fd26894ff03a83b8678519b036c80542 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 23 Mar 2023 11:47:37 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=146 --- mc.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mc.spec b/mc.spec index d365fa1..a31aadc 100644 --- a/mc.spec +++ b/mc.spec @@ -182,7 +182,7 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask %config %{_sysconfdir}/mc/filehighlight.ini %config %{_sysconfdir}/mc/sfs.ini %config %{_sysconfdir}/mc/mc.menu -%config %{_sysconfdir}/mc/mc.ext +%config %{_sysconfdir}/mc/mc.ext.ini %config %{_sysconfdir}/mc/mcedit.menu %config %{_sysconfdir}/mc/mc.keymap %config %{_sysconfdir}/mc/mc.default.keymap @@ -192,16 +192,16 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask %{_libexecdir}/mc/ext.d %{_libexecdir}/mc/extfs.d %verify(not mode) %{_libexecdir}/mc/cons.saver -%{_mandir}/man1/* %exclude %{_mandir}/*/man1/* +%{_mandir}/man1/* %{_datadir}/mc %{_datadir}/mc/syntax/Syntax %{_datadir}/mc/mc.charsets %{_datadir}/mc/mc.lib -%{_datadir}/mc/hints/mc.hint %exclude %{_datadir}/mc/hints/mc.hint.* -%{_datadir}/mc/help/mc.hlp +%{_datadir}/mc/hints/mc.hint %exclude %{_datadir}/mc/help/mc.hlp.* +%{_datadir}/mc/help/mc.hlp %exclude %{_datadir}/locale/*/LC_MESSAGES/mc.mo %dir %{_datadir}/fish @@ -244,6 +244,5 @@ rm -rf %{buildroot}%{_datadir}/locale/be@tarask %lang(ru) %doc %{_datadir}/mc/*/mc.*.ru %lang(sr) %doc %{_datadir}/mc/*/mc.*.sr %lang(uk) %doc %{_datadir}/mc/*/mc.*.uk -%lang(zh) %doc %{_datadir}/mc/*/mc.*.zh %changelog