ncurses: Update to latest released patch version
This commit is contained in:
parent
0474383361
commit
8bfa780ac2
58
packages/mc/lib-tty-tty-ncurses.c.patch
Normal file
58
packages/mc/lib-tty-tty-ncurses.c.patch
Normal file
@ -0,0 +1,58 @@
|
||||
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 ();
|
||||
|
@ -1,10 +1,10 @@
|
||||
TERMUX_PKG_HOMEPAGE=http://invisible-island.net/ncurses/
|
||||
TERMUX_PKG_DESCRIPTION="Library for text-based user interfaces in a terminal-independent manner"
|
||||
_MAJOR_VERSION=6.0
|
||||
_MINOR_VERSION=20170225
|
||||
_MINOR_VERSION=20170603
|
||||
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION}
|
||||
TERMUX_PKG_SRCURL=ftp://invisible-island.net/ncurses/current/ncurses-${_MAJOR_VERSION}-${_MINOR_VERSION}.tgz
|
||||
TERMUX_PKG_SHA256=40f3f3dce25579a34c1da449f61acf7fea913a8b3adcac61ddf78a58d6120965
|
||||
TERMUX_PKG_SHA256=e44dd3f1a82315feb4440c3ea1b0d6d74c8ff8d75f2da4527ac2d014652cd3db
|
||||
# --without-normal disables static libraries:
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-overwrite --enable-const --without-cxx-binding --without-normal --without-static --with-shared --without-debug --enable-widec --enable-ext-colors --enable-ext-mouse --enable-pc-files --with-pkg-config-libdir=$PKG_CONFIG_LIBDIR --without-ada --without-tests --mandir=$TERMUX_PREFIX/share/man ac_cv_header_locale_h=no"
|
||||
TERMUX_PKG_RM_AFTER_INSTALL="bin/ncursesw6-config share/man/man1/ncursesw6-config.1 bin/infotocap share/man/man1/infotocap.1m bin/captoinfo share/man/man1/captoinfo.1m"
|
||||
|
@ -1,11 +0,0 @@
|
||||
TERMUX_PKG_HOMEPAGE=http://invisible-island.net/ncurses/tack.html
|
||||
TERMUX_PKG_DESCRIPTION="Program that can be used to verify or refine a terminfo (terminal information) description of a terminal"
|
||||
TERMUX_PKG_VERSION=1.07
|
||||
# Note: tack does not use a version number in the tar filename, so it's not possible
|
||||
# to link to other than the latest release.
|
||||
TERMUX_PKG_DEPENDS="ncurses"
|
||||
TERMUX_PKG_SRCURL=http://invisible-island.net/datafiles/release/tack.tar.gz
|
||||
TERMUX_PKG_SHA256=e7ce787d1f7c63e51781eca9ebf4c349fcf4cbecb78cf37d60754f4c122c87fe
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ncursesw --mandir=$TERMUX_PREFIX/share/man"
|
||||
TERMUX_PKG_BUILD_IN_SRC="yes"
|
||||
TERMUX_PKG_FOLDERNAME=tack-${TERMUX_PKG_VERSION}
|
Loading…
x
Reference in New Issue
Block a user