pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/py-terminator py-terminator: Drop old patch, requi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b974d2472f4
branches:  trunk
changeset: 396899:1b974d2472f4
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Tue Jun 11 23:50:13 2019 +0000

description:
py-terminator: Drop old patch, require py-psutil

Drop old patch that workaround problem fixed (memory fault when prompting
for CWD) in py-psutil 5.6.3.

Register py-psutil as a dependency. It's not needed for every OS,
but most of them can make use of the call to determine the current
working directory.

Bump PKGREVISION.

diffstat:

 x11/py-terminator/Makefile                           |   6 ++++--
 x11/py-terminator/distinfo                           |   3 +--
 x11/py-terminator/patches/patch-terminatorlib_cwd.py |  15 ---------------
 3 files changed, 5 insertions(+), 19 deletions(-)

diffs (55 lines):

diff -r d819cefb6597 -r 1b974d2472f4 x11/py-terminator/Makefile
--- a/x11/py-terminator/Makefile        Tue Jun 11 22:55:16 2019 +0000
+++ b/x11/py-terminator/Makefile        Tue Jun 11 23:50:13 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2019/06/01 01:17:12 kamil Exp $
+# $NetBSD: Makefile,v 1.20 2019/06/11 23:50:13 kamil Exp $
 
 DISTNAME=      terminator-0.98
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    x11
 MASTER_SITES=  https://launchpad.net/terminator/trunk/${PKGVERSION_NOREV}/+download/
 
@@ -28,6 +28,8 @@
 SUBST_FILES.manpath=   setup.py
 SUBST_VARS.manpath=    PKGMANDIR
 
+DEPENDS+=      ${PYPKGPREFIX}-psutil>=5.6.3:../../sysutils/py-psutil
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff -r d819cefb6597 -r 1b974d2472f4 x11/py-terminator/distinfo
--- a/x11/py-terminator/distinfo        Tue Jun 11 22:55:16 2019 +0000
+++ b/x11/py-terminator/distinfo        Tue Jun 11 23:50:13 2019 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2019/06/01 01:17:12 kamil Exp $
+$NetBSD: distinfo,v 1.6 2019/06/11 23:50:13 kamil Exp $
 
 SHA1 (terminator-0.98.tar.gz) = a35561ef4fec3d2f34e909bb7284f0b770a4e607
 RMD160 (terminator-0.98.tar.gz) = cddb24240b74fba3eb6694d9d4aaff11329a14b6
 SHA512 (terminator-0.98.tar.gz) = c40ac1929bb446239f769d33f37a6d49ee79ea10755dda4bbbd228763f13661f0ef7efd950a592462150237e516077311318e2a19c9f08adac76a418cf633573
 Size (terminator-0.98.tar.gz) = 6007243 bytes
 SHA1 (patch-setup.py) = a94be7d3c4fa03ec36250c408646229b768fc81d
-SHA1 (patch-terminatorlib_cwd.py) = 7e5bae5af67af2790c0bc4c27b6d61f8e54a5658
diff -r d819cefb6597 -r 1b974d2472f4 x11/py-terminator/patches/patch-terminatorlib_cwd.py
--- a/x11/py-terminator/patches/patch-terminatorlib_cwd.py      Tue Jun 11 22:55:16 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-terminatorlib_cwd.py,v 1.1 2019/06/01 01:17:12 kamil Exp $
-
-Use syntax of .cwd() that works, as_dict()['cwd'] faults.
-Fixes terminator on NetBSD.
-
---- terminatorlib/cwd.py.orig  2019-06-01 01:01:46.535724473 +0000
-+++ terminatorlib/cwd.py
-@@ -82,6 +82,6 @@ def sunos_get_pid_cwd(pid):
- 
- def psutil_cwd(pid):
-     """Determine the cwd using psutil which also supports Darwin"""
--    return psutil.Process(pid).as_dict()['cwd']
-+    return psutil.Process(pid).cwd()
- 
- # vim: set expandtab ts=4 sw=4:



Home | Main Index | Thread Index | Old Index