From b2028096ed58ab5d3f920d4e941d768d9c4da176 Mon Sep 17 00:00:00 2001 From: meator Date: Sun, 16 Apr 2023 19:03:50 +0200 Subject: [PATCH] mc: update to 4.8.29. The mc.ext config file has been replaced by mc.ext.ini. This commit fixes a patch that is affected by this. --- srcpkgs/mc/INSTALL.msg | 3 +++ srcpkgs/mc/patches/xbps.patch | 19 ++++++++++--------- srcpkgs/mc/template | 6 +++--- 3 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/mc/INSTALL.msg diff --git a/srcpkgs/mc/INSTALL.msg b/srcpkgs/mc/INSTALL.msg new file mode 100644 index 000000000000..3867baecabae --- /dev/null +++ b/srcpkgs/mc/INSTALL.msg @@ -0,0 +1,3 @@ +The configuration file /etc/mc/mc.ext has been moved to /etc/mc/mc.ext.ini. +If you have modified this file, you should edit mc.ext.ini file and then delete +mc.ext file. diff --git a/srcpkgs/mc/patches/xbps.patch b/srcpkgs/mc/patches/xbps.patch index 17481e693e00..e8268bd0eb24 100644 --- a/srcpkgs/mc/patches/xbps.patch +++ b/srcpkgs/mc/patches/xbps.patch @@ -1,13 +1,14 @@ ---- a/misc/mc.ext.in 2017-08-21 19:28:49.638411103 +0200 -+++ b/misc/mc.ext.in 2017-08-21 19:38:05.633602005 +0200 -@@ -145,8 +145,8 @@ - Open=%cd %p/utar:// - View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lz4 +--- a/misc/mc.ext.ini.in ++++ b/misc/mc.ext.ini.in +@@ -238,9 +238,9 @@ + Open=%cd %p/utar:// + View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lz4 -# .tar.xz, .txz --regex/\.t(ar\.xz|xz)$ +# .tar.xz, .txz, .xbps -+regex/\.(t(ar\.xz|xz)|xbps)$ - Open=%cd %p/utar:// - View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.xz + [tar.xz] +-Regex=\.t(ar\.xz|xz)$ ++Regex=\.(t(ar\.xz|xz)|xbps)$ + Open=%cd %p/utar:// + View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.xz diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template index 1c293a9c6a26..bcae7c672c3a 100644 --- a/srcpkgs/mc/template +++ b/srcpkgs/mc/template @@ -1,6 +1,6 @@ # Template file for 'mc' pkgname=mc -version=4.8.28 +version=4.8.29 revision=1 build_style=gnu-configure configure_args="--with-screen=slang --without-x" @@ -13,14 +13,14 @@ homepage="https://midnight-commander.org/" changelog="https://midnight-commander.org/wiki/NEWS-${version}" distfiles="https://www.midnight-commander.org/downloads/mc-${version}.tar.xz" #distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz" -checksum=e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803 +checksum=01d8a3b94f58180cca5bf17257b5078d1fd6fd27a9b5c0e970ec767549540ad4 python_version=2 conf_files=" /etc/mc/filehighlight.ini /etc/mc/mc.default.keymap /etc/mc/mc.emacs.keymap - /etc/mc/mc.ext + /etc/mc/mc.ext.ini /etc/mc/mc.keymap /etc/mc/mc.menu /etc/mc/mcedit.menu