mc: Update from 4.8.19 to 4.8.20

diff --git a/packages/mc/build.sh b/packages/mc/build.sh
index 9dd235e..418a487 100755 (executable)
--- a/packages/mc/build.sh
+++ b/packages/mc/build.sh
@@ -1,8 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.midnight-commander.org/
 TERMUX_PKG_DESCRIPTION="Midnight Commander - a powerful file manager"
-TERMUX_PKG_VERSION=4.8.19
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL="http://ftp.midnight-commander.org/mc-${TERMUX_PKG_VERSION}.tar.xz"
-TERMUX_PKG_SHA256=eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df
+TERMUX_PKG_VERSION=4.8.20
+TERMUX_PKG_SHA256=017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c
+TERMUX_PKG_SRCURL=http://ftp.midnight-commander.org/mc-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, glib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ncurses-libs=$TERMUX_PREFIX/lib --with-screen=ncurses"

diff --git a/packages/mc/mc.patch b/packages/mc/configure.patch
similarity index 70%
rename from packages/mc/mc.patch
rename to packages/mc/configure.patch
index c7f614c..87246d1 100644 (file)
--- a/packages/mc/mc.patch
+++ b/packages/mc/configure.patch
@@ -27,14 +27,3 @@ diff -u -r ../mc-4.8.11/configure ./configure
  if test $ac_list_mounted_fs = found; then :
  
  
-diff -u -r ../mc-4.8.11/lib/tty/tty.c ./lib/tty/tty.c
---- ../mc-4.8.11/lib/tty/tty.c 2013-11-29 19:27:07.000000000 +0100
-+++ ./lib/tty/tty.c    2014-01-08 12:02:35.217251791 +0100
-@@ -34,6 +34,7 @@
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>             /* memset() */
-+#include <termios.h>
- #include <unistd.h>             /* exit() */
- 
- #ifdef HAVE_SYS_IOCTL_H

diff --git a/packages/mc/lib-tty-tty-ncurses.c.patch b/packages/mc/lib-tty-tty-ncurses.c.patch
deleted file mode 100644 (file)
index dfec891..0000000
--- a/packages/mc/lib-tty-tty-ncurses.c.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4d46a108629beb66a293672db7b44f863b6598ba Mon Sep 17 00:00:00 2001
-From: Thomas Dickey <dickey@his.com>
-Date: Fri, 14 Apr 2017 14:06:13 +0300
-Subject: [PATCH] Ticket #3697: (tty_init): unify curses initialization
-
-...for various curses implementations.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- lib/tty/tty-ncurses.c | 26 +++++++++-----------------
- 1 file changed, 9 insertions(+), 17 deletions(-)
-
-diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
-index a7a11f368..8e69b39f6 100644
---- a/lib/tty/tty-ncurses.c
-+++ b/lib/tty/tty-ncurses.c
-@@ -179,6 +179,8 @@ mc_tty_normalize_lines_char (const char *ch)
- void
- tty_init (gboolean mouse_enable, gboolean is_xterm)
- {
-+    struct termios mode;
-+
-     initscr ();
- 
- #ifdef HAVE_ESCDELAY
-@@ -194,25 +196,15 @@ tty_init (gboolean mouse_enable, gboolean is_xterm)
-     ESCDELAY = 200;
- #endif /* HAVE_ESCDELAY */
- 
--#ifdef NCURSES_VERSION
-+    tcgetattr (STDIN_FILENO, &mode);
-     /* use Ctrl-g to generate SIGINT */
--    cur_term->Nttyb.c_cc[VINTR] = CTRL ('g');   /* ^g */
-+    mode.c_cc[VINTR] = CTRL ('g');  /* ^g */
-     /* disable SIGQUIT to allow use Ctrl-\ key */
--    cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE;
--    tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb);
--#else
--    /* other curses implementation (bsd curses, ...) */
--    {
--        struct termios mode;
--
--        tcgetattr (STDIN_FILENO, &mode);
--        /* use Ctrl-g to generate SIGINT */
--        mode.c_cc[VINTR] = CTRL ('g');  /* ^g */
--        /* disable SIGQUIT to allow use Ctrl-\ key */
--        mode.c_cc[VQUIT] = NULL_VALUE;
--        tcsetattr (STDIN_FILENO, TCSANOW, &mode);
--    }
--#endif /* NCURSES_VERSION */
-+    mode.c_cc[VQUIT] = NULL_VALUE;
-+    tcsetattr (STDIN_FILENO, TCSANOW, &mode);
-+
-+    /* curses remembers the "in-program" modes after this call */
-+    def_prog_mode ();
- 
-     tty_start_interrupt_key ();
- 

diff --git a/packages/mc/lib-tty-tty.c.patch b/packages/mc/lib-tty-tty.c.patch
new file mode 100644 (file)
index 0000000..19a8d80
--- /dev/null
+++ b/packages/mc/lib-tty-tty.c.patch
@@ -0,0 +1,11 @@
+diff -u -r ../mc-4.8.11/lib/tty/tty.c ./lib/tty/tty.c
+--- ../mc-4.8.11/lib/tty/tty.c 2013-11-29 19:27:07.000000000 +0100
++++ ./lib/tty/tty.c    2014-01-08 12:02:35.217251791 +0100
+@@ -34,6 +34,7 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>             /* memset() */
++#include <termios.h>
+ #include <unistd.h>             /* exit() */
+ 
+ #ifdef HAVE_SYS_IOCTL_H

diff --git a/packages/mc/lib-utilunix.c.patch b/packages/mc/lib-utilunix.c.patch
new file mode 100644 (file)
index 0000000..e22c14f
--- /dev/null
+++ b/packages/mc/lib-utilunix.c.patch
@@ -0,0 +1,12 @@
+diff -u -r ../mc-4.8.20/lib/utilunix.c ./lib/utilunix.c
+--- ../mc-4.8.20/lib/utilunix.c        2017-03-04 18:51:38.000000000 +0100
++++ ./lib/utilunix.c   2017-11-26 23:09:50.934799848 +0100
+@@ -511,7 +511,7 @@
+ mc_popen (const char *command, GError ** error)
+ {
+     mc_pipe_t *p;
+-    const char *const argv[] = { "/bin/sh", "sh", "-c", command, NULL };
++    const char *const argv[] = { "@TERMUX_PREFIX@/bin/sh", "sh", "-c", command, NULL };
+ 
+     p = g_try_new (mc_pipe_t, 1);
+     if (p == NULL)

diff --git a/packages/mc/filemanager_usermenu.c.patch b/packages/mc/src-usermenu.c.patch
similarity index 67%
rename from packages/mc/filemanager_usermenu.c.patch
rename to packages/mc/src-usermenu.c.patch
index c7705af..4906912 100644 (file)
--- a/packages/mc/filemanager_usermenu.c.patch
+++ b/packages/mc/src-usermenu.c.patch
@@ -1,7 +1,7 @@
-diff -u -r ../mc-4.8.16/src/filemanager/usermenu.c ./src/filemanager/usermenu.c
---- ../mc-4.8.16/src/filemanager/usermenu.c    2016-03-12 10:45:48.000000000 -0500
-+++ ./src/filemanager/usermenu.c       2016-03-14 20:34:12.523712672 -0400
-@@ -448,7 +448,7 @@
+diff -u -r ../mc-4.8.20/src/usermenu.c ./src/usermenu.c
+--- ../mc-4.8.20/src/usermenu.c        2017-11-18 18:45:59.000000000 +0100
++++ ./src/usermenu.c   2017-11-26 23:06:56.100910498 +0100
+@@ -449,7 +449,7 @@
          return;
      }
      cmd_file = fdopen (cmd_file_fd, "w");
@@ -10,7 +10,7 @@ diff -u -r ../mc-4.8.16/src/filemanager/usermenu.c ./src/filemanager/usermenu.c
      commands++;
  
      for (col = 0; *commands != '\0'; commands++)
-@@ -554,7 +554,7 @@
+@@ -555,7 +555,7 @@
           * on no-exec filesystems. */
          char *cmd;