[arch-commits] Commit in mc/trunk (PKGBUILD)

2020-10-17 Thread Frederik Schwan via arch-commits 
Date: Saturday, October 17, 2020 @ 23:14:00
  Author: freswa
Revision: 725741

move python dep to optdepends

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-17 23:13:25 UTC (rev 725740)
+++ PKGBUILD2020-10-17 23:14:00 UTC (rev 725741)
@@ -4,7 +4,7 @@
 
 pkgname=mc
 pkgver=4.8.25
-pkgrel=2
+pkgrel=3
 pkgdesc="A file manager that emulates Norton Commander"
 arch=('x86_64')
 url="https://midnight-commander.org/;

[arch-commits] Commit in mc/trunk (PKGBUILD)

2020-10-17 Thread Frederik Schwan via arch-commits 
Date: Saturday, October 17, 2020 @ 23:11:08
  Author: freswa
Revision: 725736

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-17 23:10:08 UTC (rev 725735)
+++ PKGBUILD2020-10-17 23:11:08 UTC (rev 725736)
@@ -4,12 +4,12 @@
 
 pkgname=mc
 pkgver=4.8.25
-pkgrel=1
+pkgrel=2
 pkgdesc="A file manager that emulates Norton Commander"
 arch=('x86_64')
 url="https://midnight-commander.org/;
 license=('GPL')
-depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang' 'which' 'python')
+depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang' 'which')
 makedepends=('libxt' 'libx11' 'unzip')
 optdepends=('aspell: spelling corrections'
 'cabextract: ucab extfs'
@@ -20,6 +20,7 @@
 'mtools: a+ extfs'
 'p7zip: support for 7zip archives'
 'perl: needed by several extfs scripts'
+'python: to access uc1541 or s3 storage'
 'python-boto: s3+ extfs'
 'python-pytz: s3+ extfs'
 'samba: VFS support'

[arch-commits] Commit in mc/trunk (PKGBUILD)

2020-10-17 Thread Frederik Schwan via arch-commits 
Date: Saturday, October 17, 2020 @ 23:02:25
  Author: freswa
Revision: 725721

update to 4.8.25

add which to depends (FS#67946)
add unzip to optdepends for zip archive access (FS#64327)

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-17 23:02:14 UTC (rev 725720)
+++ PKGBUILD2020-10-17 23:02:25 UTC (rev 725721)
@@ -3,13 +3,13 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=mc
-pkgver=4.8.24
-pkgrel=2
+pkgver=4.8.25
+pkgrel=1
 pkgdesc="A file manager that emulates Norton Commander"
 arch=('x86_64')
 url="https://midnight-commander.org/;
 license=('GPL')
-depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
+depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang' 'which' 'python')
 makedepends=('libxt' 'libx11' 'unzip')
 optdepends=('aspell: spelling corrections'
 'cabextract: ucab extfs'
@@ -26,6 +26,7 @@
 'unace: uace extfs'
 'unarj: uarj extfs'
 'unrar: urar extfs'
+'unzip: open zip archives'
 'zip: uzip extfs')
 backup=('etc/mc/edit.indent.rc'
 'etc/mc/filehighlight.ini'
@@ -38,7 +39,7 @@
 source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;
 "mc-mksh-subshell-v2.patch"
 "mc-python3.patch")
-sha256sums=('859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46'
+sha256sums=('ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a'
 '5147afa3f9dfc00d8b7b36bbb144bcdb78d86301a0f8196686262a9eee41fb96'
 '10ab8b8c03770f8fe51f0bdbf0d66a44313bf2eed687cf769397909c07d8e8d5')

[arch-commits] Commit in mc/trunk (PKGBUILD mc-python3.patch)

2020-03-16 Thread Balló György via arch-commits 
Date: Monday, March 16, 2020 @ 21:32:28
  Author: bgyorgy
Revision: 599874

upgpkg: mc 4.8.24-2: Port s3 support to python3 (patch taken from Fedora)

Added:
  mc/trunk/mc-python3.patch
Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |   15 ++-
 mc-python3.patch |   70 +
 2 files changed, 78 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-16 21:17:07 UTC (rev 599873)
+++ PKGBUILD2020-03-16 21:32:28 UTC (rev 599874)
@@ -4,7 +4,7 @@
 
 pkgname=mc
 pkgver=4.8.24
-pkgrel=1
+pkgrel=2
 pkgdesc="A file manager that emulates Norton Commander"
 arch=('x86_64')
 url="https://midnight-commander.org/;
@@ -20,8 +20,8 @@
 'mtools: a+ extfs'
 'p7zip: support for 7zip archives'
 'perl: needed by several extfs scripts'
-'python2-boto: s3+ extfs'
-'python2-pytz: s3+ extfs'
+'python-boto: s3+ extfs'
+'python-pytz: s3+ extfs'
 'samba: VFS support'
 'unace: uace extfs'
 'unarj: uarj extfs'
@@ -36,18 +36,19 @@
 'etc/mc/sfs.ini')
 options=('!emptydirs')
 source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;
-"mc-mksh-subshell-v2.patch")
+"mc-mksh-subshell-v2.patch"
+"mc-python3.patch")
 sha256sums=('859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46'
-'5147afa3f9dfc00d8b7b36bbb144bcdb78d86301a0f8196686262a9eee41fb96')
+'5147afa3f9dfc00d8b7b36bbb144bcdb78d86301a0f8196686262a9eee41fb96'
+'10ab8b8c03770f8fe51f0bdbf0d66a44313bf2eed687cf769397909c07d8e8d5')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 < "$srcdir"/mc-mksh-subshell-v2.patch
+  patch -p1 < "$srcdir"/mc-python3.patch
 }
 
 build() {
-  export PYTHON=/usr/bin/python2
-
   cd ${pkgname}-${pkgver}
   ./configure \
   --prefix=/usr \

Added: mc-python3.patch
===
--- mc-python3.patch(rev 0)
+++ mc-python3.patch2020-03-16 21:32:28 UTC (rev 599874)
@@ -0,0 +1,70 @@
+diff -up mc-4.8.24/src/vfs/extfs/helpers/uc1541.python3 
mc-4.8.24/src/vfs/extfs/helpers/uc1541
+--- mc-4.8.24/src/vfs/extfs/helpers/uc1541.python3 2020-01-20 
14:40:30.637996501 +0100
 mc-4.8.24/src/vfs/extfs/helpers/uc1541 2020-01-20 14:37:55.253442507 
+0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ """
+ UC1541 Virtual filesystem
+ 
+--- a/src/vfs/extfs/helpers/s3+.in (original)
 b/src/vfs/extfs/helpers/s3+.in (refactored)
+@@ -153,16 +153,16 @@
+   Propagates exception safely.
+   """
+   from threading import Thread
+-  import Queue
++  import queue
+ 
+   items = list(iterable)
+   nitems = len(items)
+   if nitems < 2:
+-  return map(fun, items)
++  return list(map(fun, items))
+ 
+   # Create and fill input queue
+-  input = Queue.Queue()
+-  output = Queue.Queue()
++  input = queue.Queue()
++  output = queue.Queue()
+ 
+   for i,item in enumerate(items):
+   input.put( (i,item) )
+@@ -181,7 +181,7 @@
+   output.put( (i,result) )
+   except:
+   output.put( 
(None,sys.exc_info()) )
+-  except Queue.Empty:
++  except queue.Empty:
+   return
+ 
+   # Start threads
+@@ -196,8 +196,8 @@
+   try:
+   i,res = output.get()
+   if i == None:
+-  raise res[0],res[1],res[2]
+-  except Queue.Empty:
++  raise res[0](res[1]).with_traceback(res[2])
++  except queue.Empty:
+   break
+   ret.append(res)
+ 
+@@ -241,7 +241,7 @@
+   b = s3.get_bucket(name, validate=False)
+   b.get_location() # just to raise an exception on error
+   return b
+-  except boto.exception.S3ResponseError, e:
++  except boto.exception.S3ResponseError as e:
+   # Seems this is the only proper way to switch to the bucket's 
region.
+   # Requesting of the default region for "?location" does not 
work unfortunately.
+   m = re.search(r'(.*?)', e.body)
+@@ -340,7 +340,7 @@
+   expr = 
re.compile(r'^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.\d{3}Z$')
+   def convDate(awsdatetime):
+   m = expr.match(awsdatetime)
+-  ye,mo,da,ho,mi,se = map(int,m.groups())
++  ye,mo,da,ho,mi,se = list(map(int,m.groups()))
+ 
+   dt = datetime.datetime(ye,mo,da,ho,mi,se, tzinfo=pytz.utc)
+   return

[arch-commits] Commit in mc/trunk (PKGBUILD)

2020-01-27 Thread Jakob Gruber via arch-commits 
Date: Monday, January 27, 2020 @ 18:20:16
  Author: schuay
Revision: 556263

upgpkg: mc 4.8.24-1: 4.8.24-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-27 18:19:19 UTC (rev 556262)
+++ PKGBUILD2020-01-27 18:20:16 UTC (rev 556263)
@@ -3,7 +3,7 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=mc
-pkgver=4.8.23
+pkgver=4.8.24
 pkgrel=1
 pkgdesc="A file manager that emulates Norton Commander"
 arch=('x86_64')
@@ -37,7 +37,7 @@
 options=('!emptydirs')
 source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;
 "mc-mksh-subshell-v2.patch")
-sha256sums=('dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c'
+sha256sums=('859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46'
 '5147afa3f9dfc00d8b7b36bbb144bcdb78d86301a0f8196686262a9eee41fb96')
 
 prepare() {

[arch-commits] Commit in mc/trunk (PKGBUILD)

2019-06-24 Thread Jakob Gruber via arch-commits 
Date: Monday, June 24, 2019 @ 15:53:26
  Author: schuay
Revision: 483572

upgpkg: mc 4.8.23-1

4.8.23-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-24 15:05:21 UTC (rev 483571)
+++ PKGBUILD2019-06-24 15:53:26 UTC (rev 483572)
@@ -3,8 +3,8 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=mc
-pkgver=4.8.22
-pkgrel=2
+pkgver=4.8.23
+pkgrel=1
 pkgdesc="A file manager that emulates Norton Commander"
 arch=('x86_64')
 url="https://midnight-commander.org/;
@@ -37,7 +37,7 @@
 options=('!emptydirs')
 source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;
 "mc-mksh-subshell-v2.patch")
-sha256sums=('ee7868d7ba0498cf2cccefe107d7efee7f2571098806bba2aed5a159db801318'
+sha256sums=('dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c'
 '5147afa3f9dfc00d8b7b36bbb144bcdb78d86301a0f8196686262a9eee41fb96')
 
 prepare() {

[arch-commits] Commit in mc/trunk (PKGBUILD mc-mksh-subshell-v2.patch)

2019-03-02 Thread Alad Wenter via arch-commits 
Date: Saturday, March 2, 2019 @ 16:36:45
  Author: alad
Revision: 437399

upgpkg: mc 4.8.22-2

mc: support mksh for subshell

Added:
  mc/trunk/mc-mksh-subshell-v2.patch
Modified:
  mc/trunk/PKGBUILD

---+
 PKGBUILD  |   18 +++---
 mc-mksh-subshell-v2.patch |   74 
 2 files changed, 87 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-02 16:21:52 UTC (rev 437398)
+++ PKGBUILD2019-03-02 16:36:45 UTC (rev 437399)
@@ -1,12 +1,13 @@
+# Maintainer: Alad Wenter 
 # Maintainer: schuay 
 # Contributor: Daniel J Griffiths 
 
 pkgname=mc
 pkgver=4.8.22
-pkgrel=1
-pkgdesc="Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander"
+pkgrel=2
+pkgdesc="A file manager that emulates Norton Commander"
 arch=('x86_64')
-url="https://www.ibiblio.org/mc/;
+url="https://midnight-commander.org/;
 license=('GPL')
 depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
 makedepends=('libxt' 'libx11' 'unzip')
@@ -34,9 +35,16 @@
 'etc/mc/mcedit.menu'
 'etc/mc/sfs.ini')
 options=('!emptydirs')
-source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('ee7868d7ba0498cf2cccefe107d7efee7f2571098806bba2aed5a159db801318')
+source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;
+"mc-mksh-subshell-v2.patch")
+sha256sums=('ee7868d7ba0498cf2cccefe107d7efee7f2571098806bba2aed5a159db801318'
+'5147afa3f9dfc00d8b7b36bbb144bcdb78d86301a0f8196686262a9eee41fb96')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 < "$srcdir"/mc-mksh-subshell-v2.patch
+}
+
 build() {
   export PYTHON=/usr/bin/python2
 

Added: mc-mksh-subshell-v2.patch
===
--- mc-mksh-subshell-v2.patch   (rev 0)
+++ mc-mksh-subshell-v2.patch   2019-03-02 16:36:45 UTC (rev 437399)
@@ -0,0 +1,74 @@
+# Support mksh for mc subshell
+# https://midnight-commander.org/ticket/3748
+diff -Naur mc-4.8.18.orig/lib/shell.c mc-4.8.18/lib/shell.c
+--- mc-4.8.18.orig/lib/shell.c 2016-09-22 18:24:12.0 +
 mc-4.8.18/lib/shell.c  2017-02-16 13:47:34.933939000 +
+@@ -66,6 +66,8 @@
+ /* 3rd choice: look for existing shells supported as MC subshells.  */
+ if (access ("/bin/bash", X_OK) == 0)
+ mc_shell->path = g_strdup ("/bin/bash");
++else if (access ("/bin/mksh", X_OK) == 0)
++mc_shell->path = g_strdup ("/bin/mksh");
+ else if (access ("/bin/ash", X_OK) == 0)
+ mc_shell->path = g_strdup ("/bin/ash");
+ else if (access ("/bin/dash", X_OK) == 0)
+@@ -149,6 +153,12 @@
+ mc_shell->type = SHELL_ZSH;
+ mc_shell->name = "zsh";
+ }
++else if (strstr (mc_shell->path, "/mksh") != NULL
++ || strstr (mc_shell->real_path, "/mksh") != NULL)
++{
++mc_shell->type = SHELL_MKSH;
++mc_shell->name = "mksh";
++}
+ else if (strstr (mc_shell->path, "/tcsh") != NULL
+  || strstr (mc_shell->real_path, "/tcsh") != NULL)
+ {
+diff -Naur mc-4.8.18.orig/lib/shell.h mc-4.8.18/lib/shell.h
+--- mc-4.8.18.orig/lib/shell.h 2016-03-12 15:45:47.0 +
 mc-4.8.18/lib/shell.h  2017-02-15 21:57:39.0 +
+@@ -12,6 +12,7 @@
+ typedef enum
+ {
+ SHELL_NONE,
++SHELL_MKSH,
+ SHELL_SH,
+ SHELL_BASH,
+ SHELL_ASH_BUSYBOX,  /* BusyBox default shell (ash) */
+diff -Naur mc-4.8.18.orig/src/subshell/common.c mc-4.8.18/src/subshell/common.c
+--- mc-4.8.18.orig/src/subshell/common.c   2016-09-22 18:24:12.0 
+
 mc-4.8.18/src/subshell/common.c2017-02-20 18:48:22.681514000 +
+@@ -320,6 +320,12 @@
+ 
+ break;
+ 
++case SHELL_MKSH:
++init_file = g_strdup (".shrc");
++putenv_str = g_strconcat ("ENV=", init_file, (char *) NULL);
++putenv (putenv_str);
++break;
++
+ /* TODO: Find a way to pass initfile to TCSH, ZSH and FISH */
+ case SHELL_TCSH:
+ case SHELL_ZSH:
+@@ -367,6 +373,7 @@
+ 
+ case SHELL_ASH_BUSYBOX:
+ case SHELL_DASH:
++case SHELL_MKSH:
+ case SHELL_TCSH:
+ case SHELL_FISH:
+ execl (mc_global.shell->path, mc_global.shell->path, (char *) NULL);
+@@ -801,6 +808,11 @@
+ "PS1='\\u@\\h:\\w\\$ '\n", subshell_pipe[WRITE]);
+ break;
+ 
++case SHELL_MKSH:
++g_snprintf (precmd, buff_size,
++"PS1='$(pwd>&%d; kill -STOP $$)'\"$((( USER_ID )) && 
print '$ ' || print '# ')\"\n", subshell_pipe[WRITE]);
++break;
++
+ case SHELL_ASH_BUSYBOX:
+ /* BusyBox ash needs a somewhat complicated precmd emulation via PS1, 
and it is vital
+  * that BB be built with active CONFIG_ASH_EXPAND_PRMT, but this is 
the default anyway.

[arch-commits] Commit in mc/trunk (PKGBUILD)

2019-03-02 Thread Alad Wenter via arch-commits 
Date: Saturday, March 2, 2019 @ 15:57:36
  Author: alad
Revision: 437378

mc: use https in the url field

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-02 15:55:38 UTC (rev 437377)
+++ PKGBUILD2019-03-02 15:57:36 UTC (rev 437378)
@@ -6,7 +6,7 @@
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander"
 arch=('x86_64')
-url="http://www.ibiblio.org/mc/;
+url="https://www.ibiblio.org/mc/;
 license=('GPL')
 depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
 makedepends=('libxt' 'libx11' 'unzip')

[arch-commits] Commit in mc/trunk (PKGBUILD)

2019-01-15 Thread Alad Wenter via arch-commits 
Date: Wednesday, January 16, 2019 @ 03:19:03
  Author: alad
Revision: 423466

Update to 4.8.22

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-16 01:49:42 UTC (rev 423465)
+++ PKGBUILD2019-01-16 03:19:03 UTC (rev 423466)
@@ -2,7 +2,7 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=mc
-pkgver=4.8.21
+pkgver=4.8.22
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander"
 arch=('x86_64')
@@ -35,7 +35,7 @@
 'etc/mc/sfs.ini')
 options=('!emptydirs')
 source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('8f37e546ac7c31c9c203a03b1c1d6cb2d2f623a300b86badfd367e5559fe148c')
+sha256sums=('ee7868d7ba0498cf2cccefe107d7efee7f2571098806bba2aed5a159db801318')
 
 build() {
   export PYTHON=/usr/bin/python2

[arch-commits] Commit in mc/trunk (PKGBUILD)

2018-06-03 Thread Jakob Gruber via arch-commits 
Date: Sunday, June 3, 2018 @ 18:17:44
  Author: schuay
Revision: 339501

upgpkg: mc 4.8.21-1

4.8.21-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-03 18:17:31 UTC (rev 339500)
+++ PKGBUILD2018-06-03 18:17:44 UTC (rev 339501)
@@ -3,8 +3,8 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=mc
-pkgver=4.8.20
-pkgrel=3
+pkgver=4.8.21
+pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander"
 arch=('x86_64')
 url="http://www.ibiblio.org/mc/;
@@ -36,7 +36,7 @@
 'etc/mc/sfs.ini')
 options=('!emptydirs')
 source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c')
+sha256sums=('8f37e546ac7c31c9c203a03b1c1d6cb2d2f623a300b86badfd367e5559fe148c')
 
 build() {
   export PYTHON=/usr/bin/python2

[arch-commits] Commit in mc/trunk (PKGBUILD)

2018-02-17 Thread Bartłomiej Piotrowski via arch-commits 
Date: Saturday, February 17, 2018 @ 21:27:54
  Author: bpiotrowski
Revision: 296176

4.8.20-3: recompile with slang again (FS#57534)

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-17 20:43:30 UTC (rev 296175)
+++ PKGBUILD2018-02-17 21:27:54 UTC (rev 296176)
@@ -4,12 +4,12 @@
 
 pkgname=mc
 pkgver=4.8.20
-pkgrel=2
+pkgrel=3
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander"
 arch=('x86_64')
 url="http://www.ibiblio.org/mc/;
 license=('GPL')
-depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'ncurses')
+depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
 makedepends=('libxt' 'libx11' 'unzip')
 optdepends=('aspell: spelling corrections'
 'cabextract: ucab extfs'
@@ -47,7 +47,7 @@
   --libexecdir=/usr/lib \
   --sysconfdir=/etc \
   --enable-vfs-smb \
-  --with-screen=ncurses \
+  --with-screen=slang \
   --with-x
   make
 }

[arch-commits] Commit in mc/trunk (PKGBUILD)

2018-02-04 Thread Bartłomiej Piotrowski via arch-commits 
Date: Monday, February 5, 2018 @ 07:20:09
  Author: bpiotrowski
Revision: 289130

4.8.20-2: replace slang with ncurses

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-05 07:14:21 UTC (rev 289129)
+++ PKGBUILD2018-02-05 07:20:09 UTC (rev 289130)
@@ -4,12 +4,12 @@
 
 pkgname=mc
 pkgver=4.8.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander"
 arch=('x86_64')
 url="http://www.ibiblio.org/mc/;
 license=('GPL')
-depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
+depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'ncurses')
 makedepends=('libxt' 'libx11' 'unzip')
 optdepends=('aspell: spelling corrections'
 'cabextract: ucab extfs'
@@ -47,6 +47,7 @@
   --libexecdir=/usr/lib \
   --sysconfdir=/etc \
   --enable-vfs-smb \
+  --with-screen=ncurses \
   --with-x
   make
 }

[arch-commits] Commit in mc/trunk (PKGBUILD)

2017-11-28 Thread Jakob Gruber via arch-commits 
Date: Tuesday, November 28, 2017 @ 19:50:49
  Author: schuay
Revision: 270512

mc-4.8.20-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-28 19:44:21 UTC (rev 270511)
+++ PKGBUILD2017-11-28 19:50:49 UTC (rev 270512)
@@ -3,7 +3,7 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=mc
-pkgver=4.8.19
+pkgver=4.8.20
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander"
 arch=('x86_64')
@@ -36,7 +36,7 @@
 'etc/mc/sfs.ini')
 options=('!emptydirs')
 source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df')
+sha256sums=('017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c')
 
 build() {
   export PYTHON=/usr/bin/python2

[arch-commits] Commit in mc/trunk (PKGBUILD)

2017-03-09 Thread Jakob Gruber 
Date: Thursday, March 9, 2017 @ 17:51:32
  Author: schuay
Revision: 215416

mc-4.8.19-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-09 17:44:04 UTC (rev 215415)
+++ PKGBUILD2017-03-09 17:51:32 UTC (rev 215416)
@@ -3,7 +3,7 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=mc
-pkgver=4.8.18
+pkgver=4.8.19
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander"
 arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@
 'etc/mc/sfs.ini')
 options=('!emptydirs')
 source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece')
+sha256sums=('eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df')
 
 build() {
   export PYTHON=/usr/bin/python2

[arch-commits] Commit in mc/trunk (PKGBUILD)

2016-05-09 Thread Jakob Gruber 
Date: Monday, May 9, 2016 @ 19:51:10
  Author: schuay
Revision: 174449

mc-4.8.17-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-09 16:22:35 UTC (rev 174448)
+++ PKGBUILD2016-05-09 17:51:10 UTC (rev 174449)
@@ -3,8 +3,8 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=mc
-pkgver=4.8.16
-pkgrel=2
+pkgver=4.8.17
+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/;
@@ -36,7 +36,7 @@
 'etc/mc/sfs.ini')
 options=('!emptydirs')
 source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020')
+sha256sums=('0447bdddc0baa81866e66f50f9a545d29d6eebb68b0ab46c98d8fddd2bf4e44d')
 
 build() {
   export PYTHON=/usr/bin/python2

[arch-commits] Commit in mc/trunk (PKGBUILD)

2016-03-20 Thread Jakob Gruber 
Date: Thursday, March 17, 2016 @ 16:09:36
  Author: schuay
Revision: 167029

mc: FS#48612

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-17 11:25:38 UTC (rev 167028)
+++ PKGBUILD2016-03-17 15:09:36 UTC (rev 167029)
@@ -4,13 +4,13 @@
 
 pkgname=mc
 pkgver=4.8.16
-pkgrel=1
+pkgrel=2
 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')
+makedepends=('libxt' 'libx11' 'unzip')
 optdepends=('aspell: spelling corrections'
 'cabextract: ucab extfs'
 'cdparanoia: audio extfs'

[arch-commits] Commit in mc/trunk (PKGBUILD)

2016-03-12 Thread Jakob Gruber 
Date: Saturday, March 12, 2016 @ 23:15:15
  Author: schuay
Revision: 166430

mc-4.8.16-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-12 19:11:57 UTC (rev 166429)
+++ PKGBUILD2016-03-12 22:15:15 UTC (rev 166430)
@@ -3,7 +3,7 @@
 # Contributor: Daniel J Griffiths 
 
 pkgname=mc
-pkgver=4.8.15
+pkgver=4.8.16
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander"
 arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@
 'etc/mc/sfs.ini')
 options=('!emptydirs')
 source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16')
+sha256sums=('bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020')
 
 build() {
   export PYTHON=/usr/bin/python2

[arch-commits] Commit in mc/trunk (PKGBUILD)

2016-03-01 Thread Jakob Gruber 
Date: Tuesday, March 1, 2016 @ 11:16:06
  Author: schuay
Revision: 163871

update PKGBUILD from FS#48365

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |   77 ++---
 1 file changed, 33 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-01 10:09:34 UTC (rev 163870)
+++ PKGBUILD2016-03-01 10:16:06 UTC (rev 163871)
@@ -1,6 +1,6 @@
 # $Id$
+# Maintainer: schuay 
 # Contributor: Daniel J Griffiths 
-# Maintainer: schuay 
 
 pkgname=mc
 pkgver=4.8.15
@@ -9,60 +9,49 @@
 arch=('i686' 'x86_64')
 url="http://www.ibiblio.org/mc/;
 license=('GPL')
-depends=(
-'e2fsprogs'
-'glib2'
-'gpm'
-'libssh2'
-'slang')
+depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
 makedepends=('libxt' 'libx11')
-optdepends=(
-'cabextract: ucab extfs'
-'cdparanoia: audio extfs'
-'cdrkit: iso9660 extfs'
-'gawk: hp48+ extfs'
-'aspell: spelling corrections'
-'cvs: CVS support'
-'mtools: a+ extfs'
-'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'
-'p7zip: support for 7zip archives')
-options=('!emptydirs' '!makeflags')
+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/mcedit.menu'
 'etc/mc/mc.ext'
 'etc/mc/mc.keymap'
 'etc/mc/mc.menu'
+'etc/mc/mcedit.menu'
 'etc/mc/sfs.ini')
-source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2;)
+options=('!emptydirs')
+source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz;)
+sha256sums=('cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16')
 
 build() {
-cd "${srcdir}/${pkgname}-${pkgver}"
+  export PYTHON=/usr/bin/python2
 
-./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \
---with-x --libexecdir=/usr/lib
-
-make
+  cd ${pkgname}-${pkgver}
+  ./configure \
+  --prefix=/usr \
+  --libexecdir=/usr/lib \
+  --sysconfdir=/etc \
+  --enable-vfs-smb \
+  --with-x
+  make
 }
 
 package() {
-cd "${srcdir}/${pkgname}-${pkgver}"
-
-make DESTDIR="${pkgdir}" install
-
-# Fix FS#15177
-sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
--i "${pkgdir}/usr/lib/mc/extfs.d/uzip"
-
-sed 's#/usr/bin/env python#/usr/bin/python2#' \
--i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
-
-md5sums=('db48ce26ba425a61edc51930e94227fd')

[arch-commits] Commit in mc/trunk (PKGBUILD)

2015-11-09 Thread Jakob Gruber 
Date: Monday, November 9, 2015 @ 09:21:15
  Author: schuay
Revision: 146417

mc-4.8.15-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-09 02:10:12 UTC (rev 146416)
+++ PKGBUILD2015-11-09 08:21:15 UTC (rev 146417)
@@ -3,7 +3,7 @@
 # Maintainer: schuay 
 
 pkgname=mc
-pkgver=4.8.14
+pkgver=4.8.15
 pkgrel=1
 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander"
 arch=('i686' 'x86_64')
@@ -65,4 +65,4 @@
 -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
 }
 
-md5sums=('fe1cb75643c2bd4df64bbcf2dab76905')
+md5sums=('db48ce26ba425a61edc51930e94227fd')

[arch-commits] Commit in mc/trunk (PKGBUILD)

2015-09-27 Thread Jakob Gruber 
Date: Sunday, September 27, 2015 @ 21:03:45
  Author: schuay
Revision: 141719

FS#46454

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-27 18:49:14 UTC (rev 141718)
+++ PKGBUILD2015-09-27 19:03:45 UTC (rev 141719)
@@ -27,7 +27,7 @@
 'perl: needed by several extfs scripts'
 'python2-boto: s3+ extfs'
 'python2-pytz: s3+ extfs'
-'smb: VFS support'
+'samba: VFS support'
 'unace: uace extfs'
 'unarj: uarj extfs'
 'unrar: urar extfs'

[arch-commits] Commit in mc/trunk (PKGBUILD)

2015-03-25 Thread Anatol Pomozov 
Date: Wednesday, March 25, 2015 @ 22:16:55
  Author: anatolik
Revision: 129921

upgpkg: mc 4.8.14-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-25 21:13:32 UTC (rev 129920)
+++ PKGBUILD2015-03-25 21:16:55 UTC (rev 129921)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=mc
-pkgver=4.8.13
+pkgver=4.8.14
 pkgrel=1
 pkgdesc=Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander
 arch=('i686' 'x86_64')
@@ -65,4 +65,4 @@
 -i ${pkgdir}/usr/lib/mc/extfs.d/s3+
 }
 
-md5sums=('12a521a50da6a86852177591b9623d5e')
+md5sums=('fe1cb75643c2bd4df64bbcf2dab76905')

[arch-commits] Commit in mc/trunk (PKGBUILD)

2014-10-08 Thread Anatol Pomozov 
Date: Wednesday, October 8, 2014 @ 17:28:25
  Author: anatolik
Revision: 120399

upgpkg: mc 4.8.13-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-08 15:02:13 UTC (rev 120398)
+++ PKGBUILD2014-10-08 15:28:25 UTC (rev 120399)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=mc
-pkgver=4.8.12
+pkgver=4.8.13
 pkgrel=1
 pkgdesc=Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander
 arch=('i686' 'x86_64')
@@ -65,4 +65,4 @@
 -i ${pkgdir}/usr/lib/mc/extfs.d/s3+
 }
 
-md5sums=('a64c426364bfaee56b628f6c0738aade')
+md5sums=('12a521a50da6a86852177591b9623d5e')

[arch-commits] Commit in mc/trunk (PKGBUILD)

2014-04-01 Thread Jakob Gruber 
Date: Tuesday, April 1, 2014 @ 14:31:56
  Author: schuay
Revision: 108693

mc-4.8.12-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-01 11:51:44 UTC (rev 108692)
+++ PKGBUILD2014-04-01 12:31:56 UTC (rev 108693)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=mc
-pkgver=4.8.11
+pkgver=4.8.12
 pkgrel=1
 pkgdesc=Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander
 arch=('i686' 'x86_64')
@@ -65,4 +65,4 @@
 -i ${pkgdir}/usr/lib/mc/extfs.d/s3+
 }
 
-md5sums=('7262788c0e799393cd37318b43a14adc')
+md5sums=('a64c426364bfaee56b628f6c0738aade')

[arch-commits] Commit in mc/trunk (PKGBUILD fs36962.diff)

2013-12-02 Thread Jakob Gruber 
Date: Monday, December 2, 2013 @ 22:12:10
  Author: schuay
Revision: 101948

mc 4.8.11-1

Modified:
  mc/trunk/PKGBUILD
Deleted:
  mc/trunk/fs36962.diff

--+
 PKGBUILD |   12 ++--
 fs36962.diff |   77 -
 2 files changed, 4 insertions(+), 85 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-02 20:36:39 UTC (rev 101947)
+++ PKGBUILD2013-12-02 21:12:10 UTC (rev 101948)
@@ -3,8 +3,8 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=mc
-pkgver=4.8.10
-pkgrel=2
+pkgver=4.8.11
+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/;
@@ -41,14 +41,11 @@
 'etc/mc/mc.keymap'
 'etc/mc/mc.menu'
 'etc/mc/sfs.ini')
-source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2;
-fs36962.diff)
+source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2;)
 
 build() {
 cd ${srcdir}/${pkgname}-${pkgver}
 
-patch -Np1  ${srcdir}/fs36962.diff
-
 ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \
 --with-x --libexecdir=/usr/lib
 
@@ -68,5 +65,4 @@
 -i ${pkgdir}/usr/lib/mc/extfs.d/s3+
 }
 
-md5sums=('eb4bdc23abd4fdfa14911d53d65c8186'
- '7f7cf5388a5390c2ed49965492f490aa')
+md5sums=('7262788c0e799393cd37318b43a14adc')

Deleted: fs36962.diff
===
--- fs36962.diff2013-12-02 20:36:39 UTC (rev 101947)
+++ fs36962.diff2013-12-02 21:12:10 UTC (rev 101948)
@@ -1,77 +0,0 @@
-diff -ur mc-4.8.10-orig/src/filemanager/file.c mc-4.8.10/src/filemanager/file.c
 mc-4.8.10-orig/src/filemanager/file.c  2013-08-02 22:02:40.0 
+0400
-+++ mc-4.8.10/src/filemanager/file.c   2013-09-17 09:59:30.699635407 +0400
-@@ -1272,8 +1272,8 @@
- 
- /** Initialize variables for progress bars */
- static FileProgressStatus
--panel_operate_init_totals (FileOperation operation, const WPanel * panel, 
const char *source,
--   FileOpContext * ctx, filegui_dialog_type_t 
dialog_type)
-+panel_operate_init_totals (const WPanel * panel, const char *source, 
FileOpContext * ctx,
-+   filegui_dialog_type_t dialog_type)
- {
- FileProgressStatus status;
- 
-@@ -1282,7 +1282,7 @@
- return FILE_CONT;
- #endif
- 
--if (operation != OP_MOVE  verbose  file_op_compute_totals)
-+if (verbose  file_op_compute_totals)
- {
- ComputeDirSizeUI *ui;
- 
-@@ -2378,13 +2378,6 @@
- mc_refresh ();
- if (ctx-erase_at_end)
- {
--/* remove files after move */
--if (erase_list != NULL)
--{
--file_op_context_destroy_ui (ctx);
--file_op_context_create_ui (ctx, FALSE, 
FILEGUI_DIALOG_DELETE_ITEM);
--}
--
- while (erase_list != NULL  return_status != FILE_ABORT)
- {
- struct link *lp = (struct link *) erase_list-data;
-@@ -2792,14 +2785,12 @@
- {
- if (operation == OP_DELETE)
- dialog_type = FILEGUI_DIALOG_DELETE_ITEM;
-+else if (single_entry  S_ISDIR (selection (panel)-st.st_mode))
-+dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
-+else if (single_entry || force_single)
-+dialog_type = FILEGUI_DIALOG_ONE_ITEM;
- else
--{
--dialog_type = ((operation != OP_COPY) || single_entry || 
force_single)
--? FILEGUI_DIALOG_ONE_ITEM : FILEGUI_DIALOG_MULTI_ITEM;
--
--if (single_entry  (operation == OP_COPY)  S_ISDIR (selection 
(panel)-st.st_mode))
--dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
--}
-+dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
- }
- 
- /* Initialize things */
-@@ -2844,8 +2835,8 @@
- else
- source_with_vpath = vfs_path_append_new (panel-cwd_vpath, 
source, (char *) NULL);
- #endif /* WITH_FULL_PATHS */
--if (panel_operate_init_totals
--(operation, panel, vfs_path_as_str (source_with_vpath), ctx, 
dialog_type) == FILE_CONT)
-+if (panel_operate_init_totals (panel, vfs_path_as_str 
(source_with_vpath), ctx, dialog_type)
-+== FILE_CONT)
- {
- if (operation == OP_DELETE)
- {
-@@ -2936,7 +2927,7 @@
- goto clean_up;
- }
- 
--if (panel_operate_init_totals (operation, panel, NULL, ctx, 
dialog_type) == FILE_CONT)
-+if (panel_operate_init_totals (panel, NULL, ctx, dialog_type) == 
FILE_CONT)
- {
- /* Loop for every file, perform the actual copy operation */
- for (i = 0; i  panel-count; i++)

[arch-commits] Commit in mc/trunk (PKGBUILD fs36962.diff)

2013-09-18 Thread Jakob Gruber 
Date: Wednesday, September 18, 2013 @ 09:33:03
  Author: schuay
Revision: 97329

mc-4.8.10-2

Added:
  mc/trunk/fs36962.diff
Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |   11 +---
 fs36962.diff |   77 +
 2 files changed, 84 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-18 04:16:36 UTC (rev 97328)
+++ PKGBUILD2013-09-18 07:33:03 UTC (rev 97329)
@@ -4,7 +4,7 @@
 
 pkgname=mc
 pkgver=4.8.10
-pkgrel=1
+pkgrel=2
 pkgdesc=Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander
 arch=('i686' 'x86_64')
 url=http://www.ibiblio.org/mc/;
@@ -14,7 +14,6 @@
 'glib2'
 'gpm'
 'libssh2'
-'pcre'
 'slang')
 makedepends=('libxt' 'libx11')
 optdepends=(
@@ -42,11 +41,14 @@
 'etc/mc/mc.keymap'
 'etc/mc/mc.menu'
 'etc/mc/sfs.ini')
-source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2;)
+source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2;
+fs36962.diff)
 
 build() {
 cd ${srcdir}/${pkgname}-${pkgver}
 
+patch -Np1  ${srcdir}/fs36962.diff
+
 ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \
 --with-x --libexecdir=/usr/lib
 
@@ -66,4 +68,5 @@
 -i ${pkgdir}/usr/lib/mc/extfs.d/s3+
 }
 
-md5sums=('eb4bdc23abd4fdfa14911d53d65c8186')
+md5sums=('eb4bdc23abd4fdfa14911d53d65c8186'
+ '7f7cf5388a5390c2ed49965492f490aa')

Added: fs36962.diff
===
--- fs36962.diff(rev 0)
+++ fs36962.diff2013-09-18 07:33:03 UTC (rev 97329)
@@ -0,0 +1,77 @@
+diff -ur mc-4.8.10-orig/src/filemanager/file.c mc-4.8.10/src/filemanager/file.c
+--- mc-4.8.10-orig/src/filemanager/file.c  2013-08-02 22:02:40.0 
+0400
 mc-4.8.10/src/filemanager/file.c   2013-09-17 09:59:30.699635407 +0400
+@@ -1272,8 +1272,8 @@
+ 
+ /** Initialize variables for progress bars */
+ static FileProgressStatus
+-panel_operate_init_totals (FileOperation operation, const WPanel * panel, 
const char *source,
+-   FileOpContext * ctx, filegui_dialog_type_t 
dialog_type)
++panel_operate_init_totals (const WPanel * panel, const char *source, 
FileOpContext * ctx,
++   filegui_dialog_type_t dialog_type)
+ {
+ FileProgressStatus status;
+ 
+@@ -1282,7 +1282,7 @@
+ return FILE_CONT;
+ #endif
+ 
+-if (operation != OP_MOVE  verbose  file_op_compute_totals)
++if (verbose  file_op_compute_totals)
+ {
+ ComputeDirSizeUI *ui;
+ 
+@@ -2378,13 +2378,6 @@
+ mc_refresh ();
+ if (ctx-erase_at_end)
+ {
+-/* remove files after move */
+-if (erase_list != NULL)
+-{
+-file_op_context_destroy_ui (ctx);
+-file_op_context_create_ui (ctx, FALSE, 
FILEGUI_DIALOG_DELETE_ITEM);
+-}
+-
+ while (erase_list != NULL  return_status != FILE_ABORT)
+ {
+ struct link *lp = (struct link *) erase_list-data;
+@@ -2792,14 +2785,12 @@
+ {
+ if (operation == OP_DELETE)
+ dialog_type = FILEGUI_DIALOG_DELETE_ITEM;
++else if (single_entry  S_ISDIR (selection (panel)-st.st_mode))
++dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
++else if (single_entry || force_single)
++dialog_type = FILEGUI_DIALOG_ONE_ITEM;
+ else
+-{
+-dialog_type = ((operation != OP_COPY) || single_entry || 
force_single)
+-? FILEGUI_DIALOG_ONE_ITEM : FILEGUI_DIALOG_MULTI_ITEM;
+-
+-if (single_entry  (operation == OP_COPY)  S_ISDIR (selection 
(panel)-st.st_mode))
+-dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
+-}
++dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
+ }
+ 
+ /* Initialize things */
+@@ -2844,8 +2835,8 @@
+ else
+ source_with_vpath = vfs_path_append_new (panel-cwd_vpath, 
source, (char *) NULL);
+ #endif /* WITH_FULL_PATHS */
+-if (panel_operate_init_totals
+-(operation, panel, vfs_path_as_str (source_with_vpath), ctx, 
dialog_type) == FILE_CONT)
++if (panel_operate_init_totals (panel, vfs_path_as_str 
(source_with_vpath), ctx, dialog_type)
++== FILE_CONT)
+ {
+ if (operation == OP_DELETE)
+ {
+@@ -2936,7 +2927,7 @@
+ goto clean_up;
+ }
+ 
+-if (panel_operate_init_totals (operation, panel, NULL, ctx, 
dialog_type) == FILE_CONT)
++if (panel_operate_init_totals (panel, NULL, ctx, dialog_type) == 
FILE_CONT)
+ {
+ /* Loop for every file, perform the actual copy operation */
+ for (i = 0; i  panel-count; i++)

[arch-commits] Commit in mc/trunk (PKGBUILD)

2013-08-03 Thread Jakob Gruber 
Date: Saturday, August 3, 2013 @ 11:40:52
  Author: schuay
Revision: 95010

mc-4.8.10-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-03 09:04:04 UTC (rev 95009)
+++ PKGBUILD2013-08-03 09:40:52 UTC (rev 95010)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=mc
-pkgver=4.8.9
+pkgver=4.8.10
 pkgrel=1
 pkgdesc=Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander
 arch=('i686' 'x86_64')
@@ -66,4 +66,4 @@
 -i ${pkgdir}/usr/lib/mc/extfs.d/s3+
 }
 
-md5sums=('e701cc5ced4beed38e1977eba26dad50')
+md5sums=('eb4bdc23abd4fdfa14911d53d65c8186')

[arch-commits] Commit in mc/trunk (PKGBUILD)

2013-07-11 Thread Jakob Gruber 
Date: Thursday, July 11, 2013 @ 15:35:59
  Author: schuay
Revision: 93857

mc-4.8.9-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-11 12:38:57 UTC (rev 93856)
+++ PKGBUILD2013-07-11 13:35:59 UTC (rev 93857)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=mc
-pkgver=4.8.8
+pkgver=4.8.9
 pkgrel=1
 pkgdesc=Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander
 arch=('i686' 'x86_64')
@@ -66,4 +66,4 @@
 -i ${pkgdir}/usr/lib/mc/extfs.d/s3+
 }
 
-md5sums=('324ff5a192d30d3a3b234c130550eb0a')
+md5sums=('e701cc5ced4beed38e1977eba26dad50')

[arch-commits] Commit in mc/trunk (PKGBUILD)

2013-04-05 Thread Jakob Gruber 
Date: Friday, April 5, 2013 @ 11:08:28
  Author: schuay
Revision: 87679

mc-4.8.8-1

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-05 09:07:46 UTC (rev 87678)
+++ PKGBUILD2013-04-05 09:08:28 UTC (rev 87679)
@@ -3,7 +3,7 @@
 # Maintainer: schuay jakob.gru...@gmail.com
 
 pkgname=mc
-pkgver=4.8.7
+pkgver=4.8.8
 pkgrel=1
 pkgdesc=Midnight Commander is a text based filemanager/shell that emulates 
Norton Commander
 arch=('i686' 'x86_64')
@@ -66,4 +66,4 @@
 -i ${pkgdir}/usr/lib/mc/extfs.d/s3+
 }
 
-md5sums=('b113e50682293a953141134969dba785')
+md5sums=('324ff5a192d30d3a3b234c130550eb0a')

[arch-commits] Commit in mc/trunk (PKGBUILD)

2011-04-11 Thread Eric Bélanger 
Date: Monday, April 11, 2011 @ 23:04:01
  Author: eric
Revision: 119545

upgpkg: mc 4.7.5.2-1
Upstream update

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-12 02:28:11 UTC (rev 119544)
+++ PKGBUILD2011-04-12 03:04:01 UTC (rev 119545)
@@ -2,8 +2,8 @@
 # Maintainer: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=mc
-pkgver=4.7.5.1
-pkgrel=2
+pkgver=4.7.5.2
+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/;
@@ -16,8 +16,8 @@
 replaces=('mc-utf8')
 options=('!emptydirs' '!makeflags')
 
source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('2ffe4771e94569d497010eea298b13cd')
-sha1sums=('ae047110fe6da5d8e621eae2ae1c1859fb9a8f5d')
+md5sums=('bdae966244496cd4f6d282d80c9cf3c6')
+sha1sums=('08ffcc9fd19c7d8906a454c27b7074ca35bce14a')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}

[arch-commits] Commit in mc/trunk (PKGBUILD)

2011-04-05 Thread Eric Bélanger 
Date: Tuesday, April 5, 2011 @ 21:47:14
  Author: eric
Revision: 118219

Improved description (close FS#23596)

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-05 22:43:32 UTC (rev 118218)
+++ PKGBUILD2011-04-06 01:47:14 UTC (rev 118219)
@@ -4,7 +4,7 @@
 pkgname=mc
 pkgver=4.7.5.1
 pkgrel=2
-pkgdesc=A filemanager/shell that emulates Norton Commander
+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')

[arch-commits] Commit in mc/trunk (PKGBUILD)

2011-03-12 Thread Eric Bélanger 
Date: Saturday, March 12, 2011 @ 22:10:13
  Author: eric
Revision: 114388

upgpkg: mc 4.7.5.1-2
Added smb protocol support (close FS#23136)

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-12 22:41:23 UTC (rev 114387)
+++ PKGBUILD2011-03-13 03:10:13 UTC (rev 114388)
@@ -1,17 +1,14 @@
 # $Id$
-# Contributer: dorphell dorph...@archlinux.org
-# Committer: Judd Vinet jvi...@zeroflux.org
-# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
 # Maintainer: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=mc
 pkgver=4.7.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A filemanager/shell that emulates Norton Commander
 arch=('i686' 'x86_64')
 url=http://www.ibiblio.org/mc/;
 license=('GPL')
-depends=('e2fsprogs' 'glib2' 'pcre' 'gpm=1.20.4' 'slang')
+depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang')
 makedepends=('libxt' 'libx11')
 optdepends=('p7zip: support for 7zip archives')
 provides=('mcedit-pkgbuild-syntax')
@@ -28,7 +25,7 @@
./configure \
--prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
--enable-background --enable-charset --enable-largefile \
-   --with-edit --with-gpm-mouse --with-mmap --with-samba \
+   --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \
--with-screen=slang --with-subshell --with-vfs --with-x \
--without-debug --without-gnome --without-included-gettext \
--libexecdir=/usr/lib

[arch-commits] Commit in mc/trunk (PKGBUILD)

2011-02-11 Thread Eric Bélanger 
Date: Friday, February 11, 2011 @ 09:36:28
  Author: eric
Revision: 109626

upgpkg: mc 4.7.5.1-1
Upstream update

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-11 10:30:58 UTC (rev 109625)
+++ PKGBUILD2011-02-11 14:36:28 UTC (rev 109626)
@@ -5,7 +5,7 @@
 # Maintainer: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=mc
-pkgver=4.7.4
+pkgver=4.7.5.1
 pkgrel=1
 pkgdesc=A filemanager/shell that emulates Norton Commander
 arch=('i686' 'x86_64')
@@ -19,10 +19,11 @@
 replaces=('mc-utf8')
 options=('!emptydirs' '!makeflags')
 
source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('ae07f873b91e8a2e4a3b081f1adedd2e')
+md5sums=('2ffe4771e94569d497010eea298b13cd')
+sha1sums=('ae047110fe6da5d8e621eae2ae1c1859fb9a8f5d')
 
 build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
+   cd ${srcdir}/${pkgname}-${pkgver}
 
./configure \
--prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
@@ -36,17 +37,17 @@
 }
 
 package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
+   cd ${srcdir}/${pkgname}-${pkgver}
 
-   make DESTDIR=${pkgdir} install
+   make DESTDIR=${pkgdir} install
 
# Fix FS#15177
sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
-   -i ${pkgdir}/usr/lib/mc/extfs.d/uzip
+   -i ${pkgdir}/usr/lib/mc/extfs.d/uzip
 
# Fix FS#18312
-   rm ${pkgdir}/usr/lib/mc/extfs.d/u7z
+   rm ${pkgdir}/usr/lib/mc/extfs.d/u7z
 
sed 's#/usr/bin/env python#/usr/bin/python2#' \
-   -i ${pkgdir}/usr/lib/mc/extfs.d/s3+
+   -i ${pkgdir}/usr/lib/mc/extfs.d/s3+
 }

[arch-commits] Commit in mc/trunk (PKGBUILD mc-4.7.0.2_hotlist_syntax.patch)

2010-09-11 Thread Pierre Schmitz 
Date: Saturday, September 11, 2010 @ 12:25:31
  Author: pierre
Revision: 90427

upgpkg: mc 4.7.4-1
python2 rebuild

Modified:
  mc/trunk/PKGBUILD
Deleted:
  mc/trunk/mc-4.7.0.2_hotlist_syntax.patch

-+
 PKGBUILD|   15 -
 mc-4.7.0.2_hotlist_syntax.patch |   42 --
 2 files changed, 9 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-11 16:23:53 UTC (rev 90426)
+++ PKGBUILD2010-09-11 16:25:31 UTC (rev 90427)
@@ -5,7 +5,7 @@
 # Maintainer: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=mc
-pkgver=4.7.2
+pkgver=4.7.4
 pkgrel=1
 pkgdesc=A filemanager/shell that emulates Norton Commander
 arch=('i686' 'x86_64')
@@ -18,8 +18,8 @@
 conflicts=('mc-utf8')
 replaces=('mc-utf8')
 options=('!emptydirs' '!makeflags')
-source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('82d0f923f686e462eeb739760f8c45bd')
+source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('ae07f873b91e8a2e4a3b081f1adedd2e')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -32,7 +32,7 @@
--without-debug --without-gnome --without-included-gettext \
--libexecdir=/usr/lib
 
-   make || return 1
+   make
 }
 
 package() {
@@ -41,9 +41,12 @@
make DESTDIR=${pkgdir} install
 
# Fix FS#15177
-   sed -i 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
-   ${pkgdir}/usr/lib/mc/extfs.d/uzip
+   sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
+   -i ${pkgdir}/usr/lib/mc/extfs.d/uzip
 
# Fix FS#18312
rm ${pkgdir}/usr/lib/mc/extfs.d/u7z
+
+   sed 's#/usr/bin/env python#/usr/bin/python2#' \
+   -i ${pkgdir}/usr/lib/mc/extfs.d/s3+
 }

Deleted: mc-4.7.0.2_hotlist_syntax.patch
===
--- mc-4.7.0.2_hotlist_syntax.patch 2010-09-11 16:23:53 UTC (rev 90426)
+++ mc-4.7.0.2_hotlist_syntax.patch 2010-09-11 16:25:31 UTC (rev 90427)
@@ -1,42 +0,0 @@
 /lib/tty/tty-internal.h
-+++ /lib/tty/tty-internal.h
-@@ -8,4 +8,15 @@
- 
- #include lib/global.h   /* include glib.h */
-+
-+/* Taken from S-Lang's slutty.c */
-+#ifdef ultrix   /* Ultrix gets _POSIX_VDISABLE wrong! */
-+# define NULL_VALUE -1
-+#else
-+# ifdef _POSIX_VDISABLE
-+#  define NULL_VALUE _POSIX_VDISABLE
-+# else
-+#  define NULL_VALUE 255
-+# endif
-+#endif
- 
- /* If true lines are shown by spaces */
 /lib/tty/tty-ncurses.c
-+++ /lib/tty/tty-ncurses.c
-@@ -63,4 +63,5 @@
- 
- /*** file scope macro definitions **/
-+
- #if defined(_AIX)  !defined(CTRL)
- #   define CTRL(x) ((x)  0x1f)
-@@ -159,4 +160,6 @@
- /* use Ctrl-g to generate SIGINT */
- cur_term-Nttyb.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);
-
 /misc/syntax/Syntax
-+++ /misc/syntax/Syntax
-@@ -140,5 +140,5 @@
- include spec.syntax
- 
--file ..\*\\.repo$ YUM\sRepo File
-+file ..\*\\.repo$ YUM\sRepo\sFile
- include yum-repo.syntax
-

[arch-commits] Commit in mc/trunk (PKGBUILD)

2010-05-07 Thread Daniel Griffiths 
Date: Friday, May 7, 2010 @ 18:48:52
  Author: dgriffiths
Revision: 79804

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-07 22:00:41 UTC (rev 79803)
+++ PKGBUILD2010-05-07 22:48:52 UTC (rev 79804)
@@ -5,7 +5,7 @@
 # Maintainer: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=mc
-pkgver=4.7.1
+pkgver=4.7.2
 pkgrel=1
 pkgdesc=A filemanager/shell that emulates Norton Commander
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 replaces=('mc-utf8')
 options=('!emptydirs' '!makeflags')
 
source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5bd69a47b4a0bd6904623a50863b1eeb')
+md5sums=('82d0f923f686e462eeb739760f8c45bd')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}

[arch-commits] Commit in mc/trunk (PKGBUILD)

2010-03-05 Thread Daniel Griffiths 
Date: Friday, March 5, 2010 @ 16:25:44
  Author: dgriffiths
Revision: 71283

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-05 19:57:32 UTC (rev 71282)
+++ PKGBUILD2010-03-05 21:25:44 UTC (rev 71283)
@@ -5,7 +5,7 @@
 # Maintainer: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=mc
-pkgver=4.7.0.3
+pkgver=4.7.1
 pkgrel=1
 pkgdesc=A filemanager/shell that emulates Norton Commander
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 replaces=('mc-utf8')
 options=('!emptydirs' '!makeflags')
 
source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4ad6ed6667ab2364992285712e3207ea')
+md5sums=('5bd69a47b4a0bd6904623a50863b1eeb')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -42,8 +42,8 @@
 
# Fix FS#15177
sed -i 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
-   ${pkgdir}/usr/share/mc/extfs/uzip
+   ${pkgdir}/usr/lib/mc/extfs.d/uzip
 
# Fix FS#18312
-   rm ${pkgdir}/usr/share/mc/extfs/u7z
+   rm ${pkgdir}/usr/lib/mc/extfs.d/u7z
 }

[arch-commits] Commit in mc/trunk (PKGBUILD)

2010-02-26 Thread Daniel Griffiths 
Date: Friday, February 26, 2010 @ 14:56:20
  Author: dgriffiths
Revision: 70423

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-26 19:24:17 UTC (rev 70422)
+++ PKGBUILD2010-02-26 19:56:20 UTC (rev 70423)
@@ -5,8 +5,8 @@
 # Maintainer: Daniel J Griffiths ghost1...@archlinux.us
 
 pkgname=mc
-pkgver=4.7.0.2
-pkgrel=3
+pkgver=4.7.0.3
+pkgrel=1
 pkgdesc=A filemanager/shell that emulates Norton Commander
 arch=('i686' 'x86_64')
 url=http://www.ibiblio.org/mc/;
@@ -18,13 +18,11 @@
 conflicts=('mc-utf8')
 replaces=('mc-utf8')
 options=('!emptydirs' '!makeflags')
-source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2
 \
-mc-4.7.0.2_hotlist_syntax.patch)
-md5sums=('4618626cacd3481e39719a4571c1b5be' 'e43b3c780de82c1a70a98fc31ec5fbf9')
+source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('4ad6ed6667ab2364992285712e3207ea')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
-   patch -p1  ${srcdir}/mc-4.7.0.2_hotlist_syntax.patch || return 1
 
./configure \
--prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \

[arch-commits] Commit in mc/trunk (PKGBUILD)

2010-02-13 Thread Daniel Griffiths 
Date: Saturday, February 13, 2010 @ 04:20:04
  Author: dgriffiths
Revision: 68541

Fixed conflict with p7zip

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-13 04:46:00 UTC (rev 68540)
+++ PKGBUILD2010-02-13 09:20:04 UTC (rev 68541)
@@ -6,13 +6,15 @@
 
 pkgname=mc
 pkgver=4.7.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc=A filemanager/shell that emulates Norton Commander
 arch=('i686' 'x86_64')
 url=http://www.ibiblio.org/mc/;
 license=('GPL')
 depends=('e2fsprogs' 'glib2' 'pcre' 'gpm=1.20.4' 'slang')
 makedepends=('libxt' 'libx11')
+optdepends=('p7zip: support for 7zip archives')
+provides=('mcedit-pkgbuild-syntax')
 conflicts=('mc-utf8')
 replaces=('mc-utf8')
 options=('!emptydirs' '!makeflags')
@@ -43,4 +45,7 @@
# Fix FS#15177
sed -i 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
${pkgdir}/usr/share/mc/extfs/uzip
+
+   # Fix FS#18312
+   rm ${pkgdir}/usr/share/mc/extfs/u7z
 }

[arch-commits] Commit in mc/trunk (PKGBUILD)

2010-02-12 Thread Daniel Griffiths 
Date: Friday, February 12, 2010 @ 19:55:25
  Author: dgriffiths
Revision: 68491

FS#16165

Modified:
  mc/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-13 00:52:16 UTC (rev 68490)
+++ PKGBUILD2010-02-13 00:55:25 UTC (rev 68491)
@@ -6,7 +6,7 @@
 
 pkgname=mc
 pkgver=4.7.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc=A filemanager/shell that emulates Norton Commander
 arch=('i686' 'x86_64')
 url=http://www.ibiblio.org/mc/;
@@ -39,4 +39,8 @@
cd ${srcdir}/${pkgname}-${pkgver}
 
make DESTDIR=${pkgdir} install
+
+   # Fix FS#15177
+   sed -i 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
+   ${pkgdir}/usr/share/mc/extfs/uzip
 }