summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/mc
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2017-12-05 13:51:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 18:03:56 +0000
commit8ed766a7b396b925482d4b68047bbecda4da28f7 (patch)
tree694be4f6d2cb5c6e12ea53ed225c9b57f240c9f2 /meta/recipes-extended/mc
parenta19e8359555e8c098a6d92183394ce2e1ca6ece8 (diff)
downloadpoky-8ed766a7b396b925482d4b68047bbecda4da28f7.tar.gz
mc: upgrade to 4.8.20
Remove backported patch: 0002-Ticket-3697-tty_init-unify-curses-initialization.patch (From OE-Core rev: dc67acc061530b4b993a6f0ddd9bb9e34479eae9) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mc')
-rw-r--r--meta/recipes-extended/mc/files/0002-Ticket-3697-tty_init-unify-curses-initialization.patch66
-rw-r--r--meta/recipes-extended/mc/mc_4.8.20.bb (renamed from meta/recipes-extended/mc/mc_4.8.19.bb)5
2 files changed, 2 insertions, 69 deletions
diff --git a/meta/recipes-extended/mc/files/0002-Ticket-3697-tty_init-unify-curses-initialization.patch b/meta/recipes-extended/mc/files/0002-Ticket-3697-tty_init-unify-curses-initialization.patch
deleted file mode 100644
index c54d4d0eae..0000000000
--- a/meta/recipes-extended/mc/files/0002-Ticket-3697-tty_init-unify-curses-initialization.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1From 4d46a108629beb66a293672db7b44f863b6598ba Mon Sep 17 00:00:00 2001
2From: Thomas Dickey <dickey@his.com>
3Date: Fri, 14 Apr 2017 14:06:13 +0300
4Subject: [PATCH] Ticket #3697: (tty_init): unify curses initialization
5
6...for various curses implementations.
7
8Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
9
10Upstream-Status: Backport [https://github.com/MidnightCommander/mc.git]
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13
14---
15 lib/tty/tty-ncurses.c | 26 +++++++++-----------------
16 1 file changed, 9 insertions(+), 17 deletions(-)
17
18diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
19index a7a11f3..8e69b39 100644
20--- a/lib/tty/tty-ncurses.c
21+++ b/lib/tty/tty-ncurses.c
22@@ -179,6 +179,8 @@ mc_tty_normalize_lines_char (const char *ch)
23 void
24 tty_init (gboolean mouse_enable, gboolean is_xterm)
25 {
26+ struct termios mode;
27+
28 initscr ();
29
30 #ifdef HAVE_ESCDELAY
31@@ -194,25 +196,15 @@ tty_init (gboolean mouse_enable, gboolean is_xterm)
32 ESCDELAY = 200;
33 #endif /* HAVE_ESCDELAY */
34
35-#ifdef NCURSES_VERSION
36+ tcgetattr (STDIN_FILENO, &mode);
37 /* use Ctrl-g to generate SIGINT */
38- cur_term->Nttyb.c_cc[VINTR] = CTRL ('g'); /* ^g */
39+ mode.c_cc[VINTR] = CTRL ('g'); /* ^g */
40 /* disable SIGQUIT to allow use Ctrl-\ key */
41- cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE;
42- tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb);
43-#else
44- /* other curses implementation (bsd curses, ...) */
45- {
46- struct termios mode;
47-
48- tcgetattr (STDIN_FILENO, &mode);
49- /* use Ctrl-g to generate SIGINT */
50- mode.c_cc[VINTR] = CTRL ('g'); /* ^g */
51- /* disable SIGQUIT to allow use Ctrl-\ key */
52- mode.c_cc[VQUIT] = NULL_VALUE;
53- tcsetattr (STDIN_FILENO, TCSANOW, &mode);
54- }
55-#endif /* NCURSES_VERSION */
56+ mode.c_cc[VQUIT] = NULL_VALUE;
57+ tcsetattr (STDIN_FILENO, TCSANOW, &mode);
58+
59+ /* curses remembers the "in-program" modes after this call */
60+ def_prog_mode ();
61
62 tty_start_interrupt_key ();
63
64--
652.7.4
66
diff --git a/meta/recipes-extended/mc/mc_4.8.19.bb b/meta/recipes-extended/mc/mc_4.8.20.bb
index b3a156caee..70d1b5e0a9 100644
--- a/meta/recipes-extended/mc/mc_4.8.19.bb
+++ b/meta/recipes-extended/mc/mc_4.8.20.bb
@@ -8,10 +8,9 @@ RDEPENDS_${PN} = "ncurses-terminfo"
8 8
9SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ 9SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
10 file://0001-mc-replace-perl-w-with-use-warnings.patch \ 10 file://0001-mc-replace-perl-w-with-use-warnings.patch \
11 file://0002-Ticket-3697-tty_init-unify-curses-initialization.patch \
12 " 11 "
13SRC_URI[md5sum] = "ef423f5b6f80a1a5a5fc53b8324cab70" 12SRC_URI[md5sum] = "dcfc7aa613c62291a0f71f6b698d8267"
14SRC_URI[sha256sum] = "d0dddfae7149fac903f74ef55cfcb2a198e0f7004346c7bded43669d61ba436f" 13SRC_URI[sha256sum] = "2d85daaa6ab26e524946df4823ac2f69802bc16bc967781b5e28d5b86fc3b979"
15 14
16inherit autotools gettext pkgconfig 15inherit autotools gettext pkgconfig
17 16