Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump(main/mc): 4.8.33 #23052

Merged
merged 1 commit into from
Jan 29, 2025
Merged

bump(main/mc): 4.8.33 #23052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions packages/mc/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.midnight-commander.org/
TERMUX_PKG_DESCRIPTION="Midnight Commander - a powerful file manager"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="4.8.32"
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION="4.8.33"
TERMUX_PKG_SRCURL=http://ftp.midnight-commander.org/mc-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe
TERMUX_PKG_SHA256=cae149d42f844e5185d8c81d7db3913a8fa214c65f852200a9d896b468af164c
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="glib, libandroid-support, libssh2, ncurses, which"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
Expand Down
44 changes: 35 additions & 9 deletions packages/mc/lib-shell.c.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,62 @@
diff -u -r ../mc-4.8.17/lib/shell.c ./lib/shell.c
--- ../mc-4.8.17/lib/shell.c 2016-05-07 11:42:52.000000000 -0400
+++ ./lib/shell.c 2016-05-21 17:00:02.116441571 -0400
@@ -64,20 +64,14 @@
diff -u -r ../mc-4.8.33/lib/shell.c ./lib/shell.c
--- ../mc-4.8.33/lib/shell.c 2025-01-15 16:52:17.000000000 +0000
+++ ./lib/shell.c 2025-01-28 00:48:01.888138231 +0000
@@ -66,38 +66,38 @@
mc_shell = g_new0 (mc_shell_t, 1);

/* 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/zsh", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/zsh");
- else if (access ("/bin/oksh", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/oksh");
- else if (access ("/bin/ksh", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/ksh");
- else if (access ("/bin/ksh93", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/ksh93");
- else if (access ("/bin/ash", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/ash");
- else if (access ("/bin/dash", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/dash");
- else if (access ("/bin/busybox", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/busybox");
- else if (access ("/bin/zsh", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/zsh");
- else if (access ("/bin/tcsh", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/tcsh");
- else if (access ("/bin/csh", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/csh");
- else if (access ("/bin/mksh", X_OK) == 0)
- mc_shell->path = g_strdup ("/bin/mksh");
+ if (access ("@TERMUX_PREFIX@/bin/bash", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/bash");
+ else if (access ("@TERMUX_PREFIX@/bin/zsh", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/zsh");
+ else if (access ("@TERMUX_PREFIX@/bin/oksh", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/oksh");
+ else if (access ("@TERMUX_PREFIX@/bin/ksh", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/ksh");
+ else if (access ("@TERMUX_PREFIX@/bin/ksh93", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/ksh93");
+ else if (access ("@TERMUX_PREFIX@/bin/ash", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/ash");
+ else if (access ("@TERMUX_PREFIX@/bin/dash", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/dash");
+ else if (access ("@TERMUX_PREFIX@/bin/zsh", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/zsh");
+ else if (access ("@TERMUX_PREFIX@/bin/busybox", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/busybox");
+ else if (access ("@TERMUX_PREFIX@/bin/tcsh", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/tcsh");
+ else if (access ("@TERMUX_PREFIX@/bin/csh", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/csh");
+ else if (access ("@TERMUX_PREFIX@/bin/mksh", X_OK) == 0)
+ mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/mksh");
/* No fish as fallback because it is so much different from other shells and
* in a way exotic (even though user-friendly by name) that we should not
* present it as a subshell without the user's explicit intention. We rather
@@ -87,7 +81,7 @@
* will not use a subshell but just a command line.
- * else if (access("/bin/fish", X_OK) == 0)
- * mc_global.tty.shell = g_strdup ("/bin/fish");
+ * else if (access("@TERMUX_PREFIX@/bin/fish", X_OK) == 0)
+ * mc_global.tty.shell = g_strdup ("@TERMUX_PREFIX@/bin/fish");
*/
else
/* Fallback and last resort: system default shell */
Expand Down
Loading