Date: Monday, January 23, 2023 @ 21:06:03
Author: blakkheim
Revision: 1387993
archrelease: copy trunk to community-x86_64
Added:
mc/repos/community-x86_64/PKGBUILD
(from rev 1387992, mc/trunk/PKGBUILD)
mc/repos/community-x86_64/keys/
mc/repos/community-x86_64/mc-python3.patch
(from rev 1387992, mc/trunk/mc-python3.patch)
Deleted:
mc/repos/community-x86_64/PKGBUILD
mc/repos/community-x86_64/mc-python3.patch
------------------+
PKGBUILD | 194 +++++++++++++++++++++++++++--------------------------
mc-python3.patch | 122 ++++++++++++++++-----------------
2 files changed, 160 insertions(+), 156 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-23 21:05:29 UTC (rev 1387992)
+++ PKGBUILD 2023-01-23 21:06:03 UTC (rev 1387993)
@@ -1,95 +0,0 @@
-# Maintainer: George Rawlinson <[email protected]>
-# Contributor: Alad Wenter <[email protected]>
-# Contributor: schuay <[email protected]>
-# Contributor: Daniel J Griffiths <[email protected]>
-
-pkgname=mc
-pkgver=4.8.29
-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'
- 'which'
-)
-makedepends=(
- 'aspell'
- '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'
- 'python: to access uc1541 or s3 storage'
- 'python-boto: s3+ extfs'
- 'python-pytz: s3+ extfs'
- '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'
- '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";
- 'mc-python3.patch'
-)
-sha512sums=('0f55300769c28b2d6e24af1459eadb5505ba64cc7330b190562f260b74cf0e8acc277b680c5d8d10b6bcf2e429f54195bb4150f787269419f09ba61cba719e27'
-
'516c25cdc482afba6b0fa78737e4e10815acdc4d528a908e118025e44f44be0bb86b90b5044d4675e835d8ff64be551b5d48943c2c2ddd9716c34b39b1e627bc')
-b2sums=('52dcb069033615518e11fbf693817138a2ff0813fb097488ece292b625dbbcbed940ad7504e485f3e526444a7fb471748377d6d03d2a6c8c44f687f8a8fc4611'
-
'b0e20d89c7c1ba25f76f564481ed7e2b9f8614b460dc170bb3d1998411c3d7945dee5200e9a2db81f706a8bdbffffb72665a0c43353b520c02fcf5fee4d251db')
-
-prepare() {
- cd "$pkgname-$pkgver"
-
- # port to Python 3
- # ref: https://github.com/MidnightCommander/mc/pull/149
- patch -p1 -i "$srcdir/mc-python3.patch"
-}
-
-build() {
- cd "$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --enable-aspell \
- --with-screen=slang \
- --with-x
-
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- # FS#50889: Replace mc.keymap symlink with target file to fix backup
mechanism.
- rm "$pkgdir/etc/mc/mc.keymap"
- cp "$pkgdir"/etc/mc/mc{.default,}.keymap
-}
Copied: mc/repos/community-x86_64/PKGBUILD (from rev 1387992, mc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-01-23 21:06:03 UTC (rev 1387993)
@@ -0,0 +1,99 @@
+# Maintainer: George Rawlinson <[email protected]>
+# Contributor: Alad Wenter <[email protected]>
+# Contributor: schuay <[email protected]>
+# Contributor: Daniel J Griffiths <[email protected]>
+
+pkgname=mc
+pkgver=4.8.29
+_commit=e99f44c5e7ec2060195239b0448afa27e477a0ff # git rev-parse ${pkgver}
+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'
+)
+makedepends=(
+ 'aspell'
+ 'git'
+ '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'
+ 'python: to access uc1541 or s3 storage'
+ 'python-boto: s3+ extfs'
+ 'python-pytz: s3+ extfs'
+ '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'
+ 'etc/mc/mc.ext'
+ 'etc/mc/mc.keymap'
+ 'etc/mc/mc.menu'
+ 'etc/mc/mcedit.menu'
+ 'etc/mc/sfs.ini'
+)
+options=('!emptydirs')
+source=(
+ #"https://ftp.osuosl.org/pub/midnightcommander/${pkgname}-${pkgver}.tar.xz";
+ "git+https://github.com/MidnightCommander/mc.git?signed#tag=${_commit}";
+ 'mc-python3.patch'
+)
+sha256sums=('SKIP'
+ '78df8592c86445fa6249433e8587889e3923c0bb8b604cae32d5e739d2cc025c')
+validpgpkeys=(CC37C2244E2FF0ED548D5DD5F722EE79BCBBE0EF) # Yury V. Zaytsev
<[email protected]>
+
+prepare() {
+ cd mc
+
+ # port to Python 3
+ # ref: https://github.com/MidnightCommander/mc/pull/149
+ patch -p1 -i "$srcdir/mc-python3.patch"
+
+ ./autogen.sh
+}
+
+build() {
+ cd mc
+
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --enable-aspell \
+ --with-screen=slang \
+ --with-x
+
+ make
+}
+
+package() {
+ cd mc
+
+ make DESTDIR="$pkgdir" install
+
+ # FS#50889: Replace mc.keymap symlink with target file to fix backup
mechanism.
+ rm "$pkgdir/etc/mc/mc.keymap"
+ cp "$pkgdir"/etc/mc/mc{.default,}.keymap
+}
Deleted: mc-python3.patch
===================================================================
--- mc-python3.patch 2023-01-23 21:05:29 UTC (rev 1387992)
+++ mc-python3.patch 2023-01-23 21:06:03 UTC (rev 1387993)
@@ -1,61 +0,0 @@
---- a/src/vfs/extfs/helpers/s3+.in
-+++ b/src/vfs/extfs/helpers/s3+.in
-@@ -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'<Region>(.*?)</Region>', 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 dt.astimezone(tz).strftime('%m-%d-%Y %H:%M')
Copied: mc/repos/community-x86_64/mc-python3.patch (from rev 1387992,
mc/trunk/mc-python3.patch)
===================================================================
--- mc-python3.patch (rev 0)
+++ mc-python3.patch 2023-01-23 21:06:03 UTC (rev 1387993)
@@ -0,0 +1,61 @@
+--- a/src/vfs/extfs/helpers/s3+.in
++++ b/src/vfs/extfs/helpers/s3+.in
+@@ -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'<Region>(.*?)</Region>', 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 dt.astimezone(tz).strftime('%m-%d-%Y %H:%M')
