[arch-commits] Commit in mc/trunk (PKGBUILD mc-mksh-subshell-v2.patch)
George Rawlinson
grawlinson at gemini.archlinux.org
Sun Mar 27 18:26:49 UTC 2022
Date: Sunday, March 27, 2022 @ 18:26:48
Author: grawlinson
Revision: 1177226
upgpkg: mc 4.8.28-1
* New upstream release.
* Remove unused patch (mksh-subshell-v2).
Modified:
mc/trunk/PKGBUILD
Deleted:
mc/trunk/mc-mksh-subshell-v2.patch
---------------------------+
PKGBUILD | 120 ++++++++++++++++++++++++++------------------
mc-mksh-subshell-v2.patch | 74 ---------------------------
2 files changed, 71 insertions(+), 123 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-27 16:53:52 UTC (rev 1177225)
+++ PKGBUILD 2022-03-27 18:26:48 UTC (rev 1177226)
@@ -1,71 +1,93 @@
-# Maintainer: Alad Wenter <alad at archlinux.org>
-# Maintainer: schuay <jakob.gruber at gmail.com>
+# Maintainer: George Rawlinson <grawlinson at archlinux.org>
+# Contributor: Alad Wenter <alad at archlinux.org>
+# Contributor: schuay <jakob.gruber at gmail.com>
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgname=mc
-pkgver=4.8.27
-pkgrel=2
+pkgver=4.8.28
+pkgrel=1
pkgdesc="A file manager that emulates Norton Commander"
arch=('x86_64')
url="https://midnight-commander.org/"
license=('GPL')
-depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang' 'which')
-makedepends=('libxt' 'libx11' 'unzip')
-optdepends=('aspell: spelling corrections'
- 'cabextract: ucab extfs'
- 'cdparanoia: audio extfs'
- 'cdrkit: iso9660 extfs'
- 'cvs: CVS support'
- 'gawk: hp48+ extfs'
- 'mtools: a+ extfs'
- 'p7zip: support for 7zip archives'
- 'perl: needed by several extfs scripts'
- 'python: to access uc1541 or s3 storage'
- 'python-boto: s3+ extfs'
- 'python-pytz: s3+ extfs'
- 'samba: VFS support'
- 'unace: uace extfs'
- 'unarj: uarj extfs'
- 'unrar: urar extfs'
- 'unzip: open zip archives'
- 'zip: uzip extfs')
-backup=('etc/mc/edit.indent.rc'
- 'etc/mc/filehighlight.ini'
- 'etc/mc/mc.ext'
- 'etc/mc/mc.keymap'
- 'etc/mc/mc.menu'
- 'etc/mc/mcedit.menu'
- 'etc/mc/sfs.ini')
+depends=(
+ 'e2fsprogs'
+ 'glib2'
+ 'gpm'
+ 'libssh2'
+ 'slang'
+ 'which'
+)
+makedepends=(
+ 'libxt'
+ 'libx11'
+ 'unzip'
+)
+optdepends=(
+ 'aspell: spelling corrections'
+ 'cabextract: ucab extfs'
+ 'cdparanoia: audio extfs'
+ 'cdrkit: iso9660 extfs'
+ 'cvs: CVS support'
+ 'gawk: hp48+ extfs'
+ 'mtools: a+ extfs'
+ 'p7zip: support for 7zip archives'
+ 'perl: needed by several extfs scripts'
+ 'python: to access uc1541 or s3 storage'
+ 'python-boto: s3+ extfs'
+ 'python-pytz: s3+ extfs'
+ 'samba: VFS support'
+ 'unace: uace extfs'
+ 'unarj: uarj extfs'
+ 'unrar: urar extfs'
+ 'unzip: open zip archives'
+ 'zip: uzip extfs'
+)
+backup=(
+ 'etc/mc/edit.indent.rc'
+ 'etc/mc/filehighlight.ini'
+ 'etc/mc/mc.ext'
+ 'etc/mc/mc.keymap'
+ 'etc/mc/mc.menu'
+ 'etc/mc/mcedit.menu'
+ 'etc/mc/sfs.ini'
+)
options=('!emptydirs')
-source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz"
- "mc-mksh-subshell-v2.patch"
- "mc-python3.patch")
-sha256sums=('31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4'
- '5147afa3f9dfc00d8b7b36bbb144bcdb78d86301a0f8196686262a9eee41fb96'
- '10ab8b8c03770f8fe51f0bdbf0d66a44313bf2eed687cf769397909c07d8e8d5')
+source=(
+ "http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz"
+ 'mc-python3.patch'
+)
+sha512sums=('ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd'
+ '2f30b55403127b569b3c809439c81d230857abf5e799cbb334de3c3e8cc88ad90f58059f046e00ca95f3573a4e734047b922bf268c2776de534a98e62868d8b8')
+b2sums=('f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436'
+ '185d66e3de256bb59a1e7e01e778b9ba76705d3f9980862e7c67e0a3b142cc357c679360347afc188985fa551c6d7476dd824d6ba0c09e3d1e68fa1cbcb96ab7')
prepare() {
- cd ${pkgname}-${pkgver}
- # patch -p1 < "$srcdir"/mc-mksh-subshell-v2.patch
+ cd "$pkgname-$pkgver"
+
patch -p1 < "$srcdir"/mc-python3.patch
}
build() {
- cd ${pkgname}-${pkgver}
+ cd "$pkgname-$pkgver"
+
./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --enable-vfs-smb \
- --with-screen=slang \
- --with-x
+ --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --enable-vfs-smb \
+ --with-screen=slang \
+ --with-x
+
make
}
package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
# Replace mc.keymap symlink with target file to fix backup mechanism (FS#50889).
- rm "${pkgdir}"/etc/mc/mc.keymap && cp "${pkgdir}"/etc/mc/mc{.default,}.keymap
+ rm "$pkgdir/etc/mc/mc.keymap"
+ cp "$pkgdir"/etc/mc/mc{.default,}.keymap
}
Deleted: mc-mksh-subshell-v2.patch
===================================================================
--- mc-mksh-subshell-v2.patch 2022-03-27 16:53:52 UTC (rev 1177225)
+++ mc-mksh-subshell-v2.patch 2022-03-27 18:26:48 UTC (rev 1177226)
@@ -1,74 +0,0 @@
-# Support mksh for mc subshell
-# https://midnight-commander.org/ticket/3748
-diff -Naur mc-4.8.18.orig/lib/shell.c mc-4.8.18/lib/shell.c
---- mc-4.8.18.orig/lib/shell.c 2016-09-22 18:24:12.000000000 +0000
-+++ mc-4.8.18/lib/shell.c 2017-02-16 13:47:34.933939000 +0000
-@@ -66,6 +66,8 @@
- /* 3rd choice: look for existing shells supported as MC subshells. */
- if (access ("/bin/bash", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/bash");
-+ else if (access ("/bin/mksh", X_OK) == 0)
-+ mc_shell->path = g_strdup ("/bin/mksh");
- else if (access ("/bin/ash", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/ash");
- else if (access ("/bin/dash", X_OK) == 0)
-@@ -149,6 +153,12 @@
- mc_shell->type = SHELL_ZSH;
- mc_shell->name = "zsh";
- }
-+ else if (strstr (mc_shell->path, "/mksh") != NULL
-+ || strstr (mc_shell->real_path, "/mksh") != NULL)
-+ {
-+ mc_shell->type = SHELL_MKSH;
-+ mc_shell->name = "mksh";
-+ }
- else if (strstr (mc_shell->path, "/tcsh") != NULL
- || strstr (mc_shell->real_path, "/tcsh") != NULL)
- {
-diff -Naur mc-4.8.18.orig/lib/shell.h mc-4.8.18/lib/shell.h
---- mc-4.8.18.orig/lib/shell.h 2016-03-12 15:45:47.000000000 +0000
-+++ mc-4.8.18/lib/shell.h 2017-02-15 21:57:39.000000000 +0000
-@@ -12,6 +12,7 @@
- typedef enum
- {
- SHELL_NONE,
-+ SHELL_MKSH,
- SHELL_SH,
- SHELL_BASH,
- SHELL_ASH_BUSYBOX, /* BusyBox default shell (ash) */
-diff -Naur mc-4.8.18.orig/src/subshell/common.c mc-4.8.18/src/subshell/common.c
---- mc-4.8.18.orig/src/subshell/common.c 2016-09-22 18:24:12.000000000 +0000
-+++ mc-4.8.18/src/subshell/common.c 2017-02-20 18:48:22.681514000 +0000
-@@ -320,6 +320,12 @@
-
- break;
-
-+ case SHELL_MKSH:
-+ init_file = g_strdup (".shrc");
-+ putenv_str = g_strconcat ("ENV=", init_file, (char *) NULL);
-+ putenv (putenv_str);
-+ break;
-+
- /* TODO: Find a way to pass initfile to TCSH, ZSH and FISH */
- case SHELL_TCSH:
- case SHELL_ZSH:
-@@ -367,6 +373,7 @@
-
- case SHELL_ASH_BUSYBOX:
- case SHELL_DASH:
-+ case SHELL_MKSH:
- case SHELL_TCSH:
- case SHELL_FISH:
- execl (mc_global.shell->path, mc_global.shell->path, (char *) NULL);
-@@ -801,6 +808,11 @@
- "PS1='\\u@\\h:\\w\\$ '\n", subshell_pipe[WRITE]);
- break;
-
-+ case SHELL_MKSH:
-+ g_snprintf (precmd, buff_size,
-+ "PS1='$(pwd>&%d; kill -STOP $$)'\"$((( USER_ID )) && print '$ ' || print '# ')\"\n", subshell_pipe[WRITE]);
-+ break;
-+
- case SHELL_ASH_BUSYBOX:
- /* BusyBox ash needs a somewhat complicated precmd emulation via PS1, and it is vital
- * that BB be built with active CONFIG_ASH_EXPAND_PRMT, but this is the default anyway.
More information about the arch-commits
mailing list