mc: update to 4.8.20

This commit is contained in:
cvh 2018-05-11 23:22:42 +02:00 committed by CvH
parent e50207ace5
commit a8d09617f8
2 changed files with 31 additions and 84 deletions

View File

@ -18,35 +18,42 @@
################################################################################
PKG_NAME="mc"
PKG_VERSION="4.8.19"
PKG_SHA256="eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df"
PKG_VERSION="4.8.20"
PKG_SHA256="017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.midnight-commander.org"
PKG_URL="http://ftp.midnight-commander.org/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain libtool:host gettext:host glib pcre ncurses"
PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain gettext:host glib libssh2 libtool:host ncurses pcre"
PKG_SECTION="tools"
PKG_SHORTDESC="mc: visual file manager"
PKG_LONGDESC="mc is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included"
PKG_LONGDESC="Midnight Commander is a text based filemanager that emulates Norton Commander"
PKG_CONFIGURE_OPTS_TARGET="--sysconfdir=/storage/.kodi/addons/virtual.system-tools/etc \
--datadir=/storage/.kodi/addons/virtual.system-tools/data \
--libdir=/storage/.kodi/addons/virtual.system-tools/mclib \
--disable-mclib \
--disable-aspell \
--disable-vfs \
--disable-doxygen-doc \
--disable-doxygen-dot \
--disable-doxygen-html \
--with-sysroot=$SYSROOT_PREFIX \
--with-screen=ncurses \
--without-x \
--with-gnu-ld \
--without-libiconv-prefix \
--without-libintl-prefix \
--with-internal-edit \
--without-diff-viewer \
--with-subshell"
PKG_CONFIGURE_OPTS_TARGET=" \
--datadir=/storage/.kodi/addons/virtual.system-tools/data \
--libdir=/storage/.kodi/addons/virtual.system-tools/mclib \
--sysconfdir=/storage/.kodi/addons/virtual.system-tools/etc \
--with-screen=ncurses \
--with-sysroot=$SYSROOT_PREFIX \
--disable-aspell \
--without-diff-viewer \
--disable-doxygen-doc \
--disable-doxygen-dot \
--disable-doxygen-html \
--with-gnu-ld \
--without-libiconv-prefix \
--without-libintl-prefix \
--with-internal-edit \
--disable-mclib \
--with-subshell \
--enable-vfs-extfs \
--enable-vfs-ftp \
--enable-vfs-sftp \
--enable-vfs-tar \
--without-x"
pre_configure_target() {
LDFLAGS="$LDFLAGS -lcrypto -lssl"
}
post_makeinstall_target() {
rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/locale

View File

@ -1,60 +0,0 @@
could be dropped at next bump >4.8.19
https://github.com/MidnightCommander/mc/commit/4d46a108629beb66a293672db7b44f863b6598ba
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 ();