mc: update patches

This commit is contained in:
Leonid Pliushch 2021-08-18 00:24:51 +03:00
parent 5d6c393692
commit 34e10cf98b
No known key found for this signature in database
GPG Key ID: 45F2964132545795
3 changed files with 10 additions and 38 deletions

View File

@ -1,16 +0,0 @@
diff --git a/lib/tty/tty-ncurses.h b/lib/tty/tty-ncurses.h
index 9962c7c41..db8e99101 100644
--- a/lib/tty/tty-ncurses.h
+++ b/lib/tty/tty-ncurses.h
@@ -2,6 +2,11 @@
#ifndef MC__TTY_NCURSES_H
#define MC__TTY_NCURSES_H
+/* for cchar_t, getcchar(), setcchar() */
+#ifndef _XOPEN_SOURCE_EXTENDED
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+
#ifdef USE_NCURSES
#ifdef HAVE_NCURSES_CURSES_H
#include <ncurses/curses.h>

View File

@ -1,6 +1,6 @@
diff -u -r ../mc-4.8.21/src/usermenu.c ./src/usermenu.c
--- ../mc-4.8.21/src/usermenu.c 2018-05-27 19:56:21.000000000 +0000
+++ ./src/usermenu.c 2018-06-03 22:55:09.086449615 +0000
diff -uNr mc-4.8.27/src/usermenu.c mc-4.8.27.mod/src/usermenu.c
--- mc-4.8.27/src/usermenu.c 2021-08-01 19:45:58.000000000 +0300
+++ mc-4.8.27.mod/src/usermenu.c 2021-08-18 00:18:39.918253182 +0300
@@ -450,7 +450,7 @@
}
@ -10,12 +10,12 @@ diff -u -r ../mc-4.8.21/src/usermenu.c ./src/usermenu.c
commands++;
for (col = 0; *commands != '\0'; commands++)
@@ -555,7 +555,7 @@
* on no-exec filesystems. */
char *cmd;
@@ -546,7 +546,7 @@
mc_chmod (file_name_vpath, S_IRWXU);
- cmd = g_strconcat ("/bin/sh ", vfs_path_as_str (file_name_vpath), (char *) NULL);
+ cmd = g_strconcat ("@TERMUX_PREFIX@/bin/sh ", vfs_path_as_str (file_name_vpath), (char *) NULL);
/* Execute the command indirectly to allow execution even on no-exec filesystems. */
- cmd = g_strconcat ("/bin/sh ", vfs_path_as_str (file_name_vpath), (char *) NULL);
+ cmd = g_strconcat ("@TERMUX_PREFIX@/bin/sh ", vfs_path_as_str (file_name_vpath), (char *) NULL);
if (show_prompt)
shell_execute (cmd, EXECUTE_HIDE);
if (run_view)
{

View File

@ -1,12 +0,0 @@
diff -u -r ../mc-4.8.16/src/vfs/sfs/sfs.c ./src/vfs/sfs/sfs.c
--- ../mc-4.8.16/src/vfs/sfs/sfs.c 2016-03-12 10:45:48.000000000 -0500
+++ ./src/vfs/sfs/sfs.c 2016-03-14 20:36:48.293235351 -0400
@@ -206,7 +206,7 @@
g_free (pqname);
open_error_pipe ();
- if (my_system (EXECUTE_AS_SHELL, "/bin/sh", pad))
+ if (my_system (EXECUTE_AS_SHELL, "@TERMUX_PREFIX@/bin/sh", pad))
{
close_error_pipe (D_ERROR, NULL);
return -1;