Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11613 from dibdot/mc

Browse source 
mc: update to 4.8.24
This commit is contained in:
Dirk Brenken 2020-03-23 07:48:10 +01:00 committed by GitHub
commit f491e56bb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
utils/mc/Makefile
View file

@ -6,15 +6,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mc PKG_NAME:=mc
PKG_VERSION:=4.8.23 PKG_VERSION:=4.8.24
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_CPE_ID:=cpe:/a:midnight_commander:midnight_commander PKG_CPE_ID:=cpe:/a:midnight_commander:midnight_commander
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://ftp.midnight-commander.org/ PKG_SOURCE_URL:=http://ftp.midnight-commander.org/
PKG_HASH:=dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c PKG_HASH:=859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf gettext-version PKG_FIXUP:=autoreconf gettext-version
PKG_BUILD_DEPENDS:=MC_VFS:libtirpc PKG_BUILD_DEPENDS:=MC_VFS:libtirpc

27
utils/mc/patches/010-subshell.patch
View file

@ -1,22 +1,11 @@
--- a/src/subshell/common.c --- a/src/subshell/common.c
+++ b/src/subshell/common.c +++ b/src/subshell/common.c
@@ -865,16 +865,9 @@ init_subshell_precmd (char *precmd, size @@ -877,7 +877,7 @@ init_subshell_precmd (char *precmd, size
* "PS1='$($PRECMD)$ '\n", "else "
*/ "[ \"${PWD##$HOME/}\" = \"$PWD\" ] && MC_PWD=\"$PWD\" || MC_PWD=\"~/${PWD##$HOME/}\"; "
g_snprintf (precmd, buff_size, "fi; "
- "precmd() { "
- "if [ ! \"${PWD##$HOME}\" ]; then "
- "MC_PWD=\"~\"; "
- "else "
- "[ \"${PWD##$HOME/}\" = \"$PWD\" ] && MC_PWD=\"$PWD\" || MC_PWD=\"~/${PWD##$HOME/}\"; "
- "fi; "
- "echo \"$USER@$(hostname -s):$MC_PWD\"; " - "echo \"$USER@$(hostname -s):$MC_PWD\"; "
- "pwd>&%d; " + "echo \"$USER@$HOSTNAME:$MC_PWD\"; "
- "kill -STOP $$; " "pwd>&%d; "
- "}; " "PRECMD=precmd; " "PS1='$($PRECMD)$ '\n", subshell_pipe[WRITE]); "kill -STOP $$; "
+ "precmd() { pwd>&%d; kill -STOP $$; }; " "}; " "PRECMD=precmd; " "PS1='$($PRECMD)$ '\n", subshell_pipe[WRITE]);
+ "PRECMD=precmd; "
+ "PS1='$(eval $PRECMD)\\u@\\h:\\w\\$ '\n", subshell_pipe[WRITE]);
break;
case SHELL_ZSH: