Date: Wednesday, December 21, 2022 @ 01:35:09
Author: grawlinson
Revision: 1364805
upgpkg: mc 4.8.28-2; FS#76361
* Simplify python 3 patch (remove unnecessary change & add upstream reference).
* Add makedepends: aspell.
Modified:
mc/trunk/PKGBUILD
mc/trunk/mc-python3.patch
------------------+
PKGBUILD | 18 +++++++++++-------
mc-python3.patch | 13 ++-----------
2 files changed, 13 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-21 01:28:38 UTC (rev 1364804)
+++ PKGBUILD 2022-12-21 01:35:09 UTC (rev 1364805)
@@ -5,10 +5,10 @@
pkgname=mc
pkgver=4.8.28
-pkgrel=1
-pkgdesc="A file manager that emulates Norton Commander"
+pkgrel=2
+pkgdesc='A file manager that emulates Norton Commander'
arch=('x86_64')
-url="https://midnight-commander.org/";
+url='https://midnight-commander.org/'
license=('GPL')
depends=(
'e2fsprogs'
@@ -19,6 +19,7 @@
'which'
)
makedepends=(
+ 'aspell'
'libxt'
'libx11'
'unzip'
@@ -58,14 +59,16 @@
'mc-python3.patch'
)
sha512sums=('ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd'
-
'2f30b55403127b569b3c809439c81d230857abf5e799cbb334de3c3e8cc88ad90f58059f046e00ca95f3573a4e734047b922bf268c2776de534a98e62868d8b8')
+
'516c25cdc482afba6b0fa78737e4e10815acdc4d528a908e118025e44f44be0bb86b90b5044d4675e835d8ff64be551b5d48943c2c2ddd9716c34b39b1e627bc')
b2sums=('f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436'
-
'185d66e3de256bb59a1e7e01e778b9ba76705d3f9980862e7c67e0a3b142cc357c679360347afc188985fa551c6d7476dd824d6ba0c09e3d1e68fa1cbcb96ab7')
+
'b0e20d89c7c1ba25f76f564481ed7e2b9f8614b460dc170bb3d1998411c3d7945dee5200e9a2db81f706a8bdbffffb72665a0c43353b520c02fcf5fee4d251db')
prepare() {
cd "$pkgname-$pkgver"
- patch -p1 < "$srcdir"/mc-python3.patch
+ # port to Python 3
+ # ref: https://github.com/MidnightCommander/mc/pull/149
+ patch -p1 -i "$srcdir/mc-python3.patch"
}
build() {
@@ -76,6 +79,7 @@
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--enable-vfs-smb \
+ --enable-aspell \
--with-screen=slang \
--with-x
@@ -87,7 +91,7 @@
make DESTDIR="$pkgdir" install
- # Replace mc.keymap symlink with target file to fix backup mechanism
(FS#50889).
+ # 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
}
Modified: mc-python3.patch
===================================================================
--- mc-python3.patch 2022-12-21 01:28:38 UTC (rev 1364804)
+++ mc-python3.patch 2022-12-21 01:35:09 UTC (rev 1364805)
@@ -1,14 +1,5 @@
-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)
+--- a/src/vfs/extfs/helpers/s3+.in
++++ b/src/vfs/extfs/helpers/s3+.in
@@ -153,16 +153,16 @@
Propagates exception safely.
"""
