diff options
| author | Roberto Oliveira <robertoguimaraes8@gmail.com> | 2017-11-07 12:25:00 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-07 13:55:51 +0000 |
| commit | 7308b1a09eda61bbb9f00f03018530bba9f7f7d1 (patch) | |
| tree | b4281f6cbeaa02a345c7fe8da7815536f2f4b576 /main/mc | |
| parent | b6abc6d02e35fd54b9db18d863d34f32977db1b7 (diff) | |
| download | aports-7308b1a09eda61bbb9f00f03018530bba9f7f7d1.tar.bz2 aports-7308b1a09eda61bbb9f00f03018530bba9f7f7d1.tar.xz | |
main/mc: fix build
Patch backported from upstream and it fixes error when calling ncurses API:
tty-ncurses.c:199:13: error: dereferencing pointer to incomplete type 'TERMINAL {aka struct term}'
cur_term->Nttyb.c_cc[VINTR] = CTRL ('g'); /* ^g */
Also add check() function
Diffstat (limited to 'main/mc')
| -rw-r--r-- | main/mc/APKBUILD | 14 | ||||
| -rw-r--r-- | main/mc/tty_init-unify-curses-initialization.patch | 61 |
2 files changed, 72 insertions, 3 deletions
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD index 02304438b6..bdaf5f75e6 100644 --- a/main/mc/APKBUILD +++ b/main/mc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mc pkgver=4.8.19 -pkgrel=0 +pkgrel=1 pkgdesc="A filemanager/shell that emulates Norton Commander" url="http://www.midnight-commander.org" arch="all" @@ -11,7 +11,9 @@ depends="" subpackages="$pkgname-doc $pkgname-lang" makedepends="e2fsprogs-dev glib-dev pcre-dev ncurses-dev libssh2-dev" source="http://www.midnight-commander.org/downloads/$pkgname-$pkgver.tar.bz2 - alpine_syntax.patch" + alpine_syntax.patch + tty_init-unify-curses-initialization.patch" + builddir="$srcdir/$pkgname-$pkgver" build() { @@ -38,6 +40,11 @@ build() { make } +check() { + cd "$builddir" + make check +} + package() { make -C "$builddir" DESTDIR="$pkgdir" install || return 1 rm -fr "$pkgdir"/usr/share/man/?? @@ -63,4 +70,5 @@ lang() { } sha512sums="eecf39b3f043cad1f47aabcd25a0e672e7bbf406944f457521e0ff5db344f01cdc8572bb45b2507a54469ff1130c457a90f62eb7d5e6191f9c7d4f35a4b46a2e mc-4.8.19.tar.bz2 -aee89eaacaafcdfe2ceb2eb7b7dcf08d669dbaffcb76f4c1613498017096c33068b7bf9d06e6f7d0685c9928cebaa932ab78b3a68f3b2de59b512022b3944e8d alpine_syntax.patch" +aee89eaacaafcdfe2ceb2eb7b7dcf08d669dbaffcb76f4c1613498017096c33068b7bf9d06e6f7d0685c9928cebaa932ab78b3a68f3b2de59b512022b3944e8d alpine_syntax.patch +ca89e39c4c501464b6980f7956ec606def6cc4d12865d3826c0bd59a4b59144a5105cd95131854e4b42a39cbee4f4ecfca673746005b077e32d0e688b0b8e9f8 tty_init-unify-curses-initialization.patch" diff --git a/main/mc/tty_init-unify-curses-initialization.patch b/main/mc/tty_init-unify-curses-initialization.patch new file mode 100644 index 0000000000..d4379023ef --- /dev/null +++ b/main/mc/tty_init-unify-curses-initialization.patch @@ -0,0 +1,61 @@ +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 (); + +-- +2.15.0 + |