CVS commit: pkgsrc/x11/py-terminator

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sat Jun  1 01:17:12 UTC 2019

Modified Files:
        pkgsrc/x11/py-terminator: Makefile distinfo
Added Files:
        pkgsrc/x11/py-terminator/patches: patch-terminatorlib_cwd.py

Log Message:
py-terminator: Fix faults of terminator on NetBSD

Change the definition of psutil_cwd() to one that works.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/py-terminator/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/py-terminator/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/py-terminator/patches/patch-terminatorlib_cwd.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/py-terminator/Makefile
diff -u pkgsrc/x11/py-terminator/Makefile:1.18 pkgsrc/x11/py-terminator/Makefile:1.19
--- pkgsrc/x11/py-terminator/Makefile:1.18      Fri Apr 26 14:12:50 2019
+++ pkgsrc/x11/py-terminator/Makefile   Sat Jun  1 01:17:12 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2019/04/26 14:12:50 maya Exp $
+# $NetBSD: Makefile,v 1.19 2019/06/01 01:17:12 kamil Exp $
 
 DISTNAME=      terminator-0.98
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    x11
 MASTER_SITES=  https://launchpad.net/terminator/trunk/${PKGVERSION_NOREV}/+download/
 

Index: pkgsrc/x11/py-terminator/distinfo
diff -u pkgsrc/x11/py-terminator/distinfo:1.4 pkgsrc/x11/py-terminator/distinfo:1.5
--- pkgsrc/x11/py-terminator/distinfo:1.4       Thu Apr 21 11:17:26 2016
+++ pkgsrc/x11/py-terminator/distinfo   Sat Jun  1 01:17:12 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2016/04/21 11:17:26 jperkin Exp $
+$NetBSD: distinfo,v 1.5 2019/06/01 01:17:12 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

Added files:

Index: pkgsrc/x11/py-terminator/patches/patch-terminatorlib_cwd.py
diff -u /dev/null pkgsrc/x11/py-terminator/patches/patch-terminatorlib_cwd.py:1.1
--- /dev/null   Sat Jun  1 01:17:12 2019
+++ pkgsrc/x11/py-terminator/patches/patch-terminatorlib_cwd.py Sat Jun  1 01:17:12 2019
@@ -0,0 +1,15 @@
+$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: