Date: Friday, October 7, 2016 @ 15:41:12 Author: schuay Revision: 191561
mc-4.8.18-1 Modified: mc/trunk/PKGBUILD Deleted: mc/trunk/0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch mc/trunk/0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch -----------------------------------------------------------------+ 0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch | 26 --- 0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch | 68 ---------- PKGBUILD | 21 +-- 3 files changed, 7 insertions(+), 108 deletions(-) Deleted: 0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch =================================================================== --- 0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch 2016-10-07 15:39:10 UTC (rev 191560) +++ 0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch 2016-10-07 15:41:12 UTC (rev 191561) @@ -1,26 +0,0 @@ -From 52871230a295311c286bb92feddc469e3ece11d6 Mon Sep 17 00:00:00 2001 -From: Andrew Borodin <[email protected]> -Date: Mon, 13 Jun 2016 09:21:15 +0300 -Subject: [PATCH 1/2] Ticket #3639: fix window resizing when panels are hidden. - -This reverts commit f278eaec99320874b112b37d9925d78d964f5d37. ---- - src/subshell/common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/subshell/common.c b/src/subshell/common.c -index 6667b6e..98968fa 100644 ---- a/src/subshell/common.c -+++ b/src/subshell/common.c -@@ -531,7 +531,7 @@ feed_subshell (int how, gboolean fail_on_error) - /* Despite using SA_RESTART, we still have to check for this */ - if (errno == EINTR) - { -- if (how == QUIETLY && mc_global.tty.winch_flag != 0) -+ if (mc_global.tty.winch_flag != 0) - tty_change_screen_size (); - - continue; /* try all over again */ --- -2.10.0 - Deleted: 0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch =================================================================== --- 0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch 2016-10-07 15:39:10 UTC (rev 191560) +++ 0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch 2016-10-07 15:41:12 UTC (rev 191561) @@ -1,68 +0,0 @@ -From 968882335abb18e69be39dc4fd444f78f0a14a0f Mon Sep 17 00:00:00 2001 -From: Yuri Khan <[email protected]> -Date: Mon, 9 May 2016 18:04:21 +0600 -Subject: [PATCH 2/2] Do not botch SIGWINCH delivery to the subshell. - -Signed-off-by: Andrew Borodin <[email protected]> ---- - lib/tty/tty-slang.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/lib/tty/tty-slang.c b/lib/tty/tty-slang.c -index 143a6d3..87e4a70 100644 ---- a/lib/tty/tty-slang.c -+++ b/lib/tty/tty-slang.c -@@ -83,6 +83,8 @@ static struct termios new_mode; - /* Controls whether we should wait for input in tty_lowlevel_getch */ - static gboolean no_slang_delay; - -+static gboolean slsmg_active = FALSE; -+ - /* This table describes which capabilities we want and which values we - * assign to them. - */ -@@ -329,6 +331,7 @@ tty_init (gboolean mouse_enable, gboolean is_xterm) - tty_display_8bit (FALSE); - - SLsmg_init_smg (); -+ slsmg_active = TRUE; - if (!mouse_enable) - use_mouse_p = MOUSE_DISABLED; - tty_init_xterm_support (is_xterm); /* do it before tty_enter_ca_mode() call */ -@@ -354,6 +357,7 @@ tty_shutdown (void) - tty_reset_screen (); - tty_exit_ca_mode (); - SLang_reset_tty (); -+ slsmg_active = FALSE; - - /* Load the op capability to reset the colors to those that were - * active when the program was started up -@@ -388,7 +392,8 @@ void - tty_change_screen_size (void) - { - SLtt_get_screen_size (); -- SLsmg_reinit_smg (); -+ if (slsmg_active) -+ SLsmg_reinit_smg (); - - #ifdef ENABLE_SUBSHELL - if (mc_global.tty.use_subshell) -@@ -404,6 +409,7 @@ tty_reset_prog_mode (void) - { - tcsetattr (SLang_TT_Read_FD, TCSANOW, &new_mode); - SLsmg_init_smg (); -+ slsmg_active = TRUE; - SLsmg_touch_lines (0, LINES); - } - -@@ -504,6 +510,7 @@ int - tty_reset_screen (void) - { - SLsmg_reset_smg (); -+ slsmg_active = FALSE; - return 0; /* OK */ - } - --- -2.10.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-10-07 15:39:10 UTC (rev 191560) +++ PKGBUILD 2016-10-07 15:41:12 UTC (rev 191561) @@ -3,8 +3,8 @@ # Contributor: Daniel J Griffiths <[email protected]> pkgname=mc -pkgver=4.8.17 -pkgrel=2 +pkgver=4.8.18 +pkgrel=1 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" arch=('i686' 'x86_64') url="http://www.ibiblio.org/mc/"; @@ -35,19 +35,9 @@ 'etc/mc/mcedit.menu' 'etc/mc/sfs.ini') options=('!emptydirs') -source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz"; - "0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch" - "0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch") -sha256sums=('0447bdddc0baa81866e66f50f9a545d29d6eebb68b0ab46c98d8fddd2bf4e44d' - '9a3639ff068dfddee0342d631b56d8df6c0240105802fb00edb0fa3a265e95d6' - '2a5ab735226ce41b0ebbb4bcedb0e04e82ea3cb14e2776acede1e58816f3d787') +source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz";) +sha256sums=('f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece') -prepare() { - cd ${pkgname}-${pkgver} - patch -Np1 < ${srcdir}/0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch - patch -Np1 < ${srcdir}/0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch -} - build() { export PYTHON=/usr/bin/python2 @@ -64,4 +54,7 @@ package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install + + # Replace mc.keymap symlink with target file to fix backup mechanism (FS#50889). + rm "${pkgdir}"/etc/mc/mc.keymap && cp "${pkgdir}"/etc/mc/mc{.default,}.keymap }
