[arch-commits] Commit in mc/repos/community-x86_64 (4 files)

Jakob Gruber schuay at archlinux.org
Thu Mar 9 17:51:52 UTC 2017


    Date: Thursday, March 9, 2017 @ 17:51:51
  Author: schuay
Revision: 215418

archrelease: copy trunk to community-x86_64

Added:
  mc/repos/community-x86_64/PKGBUILD
    (from rev 215417, mc/trunk/PKGBUILD)
Deleted:
  mc/repos/community-x86_64/0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch
  mc/repos/community-x86_64/0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch
  mc/repos/community-x86_64/PKGBUILD

-----------------------------------------------------------------+
 0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch |   26 --
 0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch       |   68 -----
 PKGBUILD                                                        |  120 +++++-----
 3 files changed, 60 insertions(+), 154 deletions(-)

Deleted: 0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch
===================================================================
--- 0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch	2017-03-09 17:51:44 UTC (rev 215417)
+++ 0001-Ticket-3639-fix-window-resizing-when-panels-are-hidd.patch	2017-03-09 17:51:51 UTC (rev 215418)
@@ -1,26 +0,0 @@
-From 52871230a295311c286bb92feddc469e3ece11d6 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin at vmail.ru>
-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	2017-03-09 17:51:44 UTC (rev 215417)
+++ 0002-Do-not-botch-SIGWINCH-delivery-to-the-subshell.patch	2017-03-09 17:51:51 UTC (rev 215418)
@@ -1,68 +0,0 @@
-From 968882335abb18e69be39dc4fd444f78f0a14a0f Mon Sep 17 00:00:00 2001
-From: Yuri Khan <yurivkhan at gmail.com>
-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 <aborodin at vmail.ru>
----
- 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
-

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-09 17:51:44 UTC (rev 215417)
+++ PKGBUILD	2017-03-09 17:51:51 UTC (rev 215418)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: schuay <jakob.gruber at gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=mc
-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/"
-license=('GPL')
-depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
-makedepends=('libxt' 'libx11' 'unzip')
-optdepends=('aspell: spelling corrections'
-            'cabextract: ucab extfs'
-            'cdparanoia: audio extfs'
-            'cdrkit: iso9660 extfs'
-            'cvs: CVS support'
-            'gawk: hp48+ extfs'
-            'mtools: a+ extfs'
-            'p7zip: support for 7zip archives'
-            'perl: needed by several extfs scripts'
-            'python2-boto: s3+ extfs'
-            'python2-pytz: s3+ extfs'
-            'samba: VFS support'
-            'unace: uace extfs'
-            'unarj: uarj extfs'
-            'unrar: urar extfs'
-            'zip: uzip extfs')
-backup=('etc/mc/edit.indent.rc'
-        'etc/mc/filehighlight.ini'
-        'etc/mc/mc.ext'
-        'etc/mc/mc.keymap'
-        'etc/mc/mc.menu'
-        'etc/mc/mcedit.menu'
-        'etc/mc/sfs.ini')
-options=('!emptydirs')
-source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece')
-
-build() {
-  export PYTHON=/usr/bin/python2
-
-  cd ${pkgname}-${pkgver}
-  ./configure \
-      --prefix=/usr \
-      --libexecdir=/usr/lib \
-      --sysconfdir=/etc \
-      --enable-vfs-smb \
-      --with-x
-  make
-}
-
-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
-}

Copied: mc/repos/community-x86_64/PKGBUILD (from rev 215417, mc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-03-09 17:51:51 UTC (rev 215418)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=mc
+pkgver=4.8.19
+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/"
+license=('GPL')
+depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
+makedepends=('libxt' 'libx11' 'unzip')
+optdepends=('aspell: spelling corrections'
+            'cabextract: ucab extfs'
+            'cdparanoia: audio extfs'
+            'cdrkit: iso9660 extfs'
+            'cvs: CVS support'
+            'gawk: hp48+ extfs'
+            'mtools: a+ extfs'
+            'p7zip: support for 7zip archives'
+            'perl: needed by several extfs scripts'
+            'python2-boto: s3+ extfs'
+            'python2-pytz: s3+ extfs'
+            'samba: VFS support'
+            'unace: uace extfs'
+            'unarj: uarj extfs'
+            'unrar: urar extfs'
+            'zip: uzip extfs')
+backup=('etc/mc/edit.indent.rc'
+        'etc/mc/filehighlight.ini'
+        'etc/mc/mc.ext'
+        'etc/mc/mc.keymap'
+        'etc/mc/mc.menu'
+        'etc/mc/mcedit.menu'
+        'etc/mc/sfs.ini')
+options=('!emptydirs')
+source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df')
+
+build() {
+  export PYTHON=/usr/bin/python2
+
+  cd ${pkgname}-${pkgver}
+  ./configure \
+      --prefix=/usr \
+      --libexecdir=/usr/lib \
+      --sysconfdir=/etc \
+      --enable-vfs-smb \
+      --with-x
+  make
+}
+
+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
+}


More information about the arch-commits mailing list