CVS commit: pkgsrc/chat/gajim

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sat Aug  1 12:40:11 UTC 2020

Modified Files:
        pkgsrc/chat/gajim: distinfo
Added Files:
        pkgsrc/chat/gajim/patches: patch-gajim___init__.py

Log Message:
Make devel/gajim not pick up the pkgsrc revision when pkgsrc is checked out via
Git.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/chat/gajim/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/gajim/patches/patch-gajim___init__.py

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

Modified files:

Index: pkgsrc/chat/gajim/distinfo
diff -u pkgsrc/chat/gajim/distinfo:1.12 pkgsrc/chat/gajim/distinfo:1.13
--- pkgsrc/chat/gajim/distinfo:1.12     Wed Jul  8 11:57:12 2020
+++ pkgsrc/chat/gajim/distinfo  Sat Aug  1 12:40:10 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.12 2020/07/08 11:57:12 adam Exp $
+$NetBSD: distinfo,v 1.13 2020/08/01 12:40:10 js Exp $
 
 SHA1 (gajim-1.2.0.tar.gz) = 68bf6d24c45394c288a8229b8d8aa50e74db45ec
 RMD160 (gajim-1.2.0.tar.gz) = d1484f11ca8707378c7a0dc1f4e02e21e9fde272
 SHA512 (gajim-1.2.0.tar.gz) = e73802dd1172c1fa38be10e6fb5d605109dacf0491516b15111ccd05389309af217e8af68440a1333b8a636c9ff425dec6d4461296ba47f1bb6dbb3000b02fd0
 Size (gajim-1.2.0.tar.gz) = 9605006 bytes
+SHA1 (patch-gajim___init__.py) = cc51df849cf55cb3023464f67958151a89e95a0c
 SHA1 (patch-setup.py) = f8fd2bb45d0ced7c86972218e1a0194ad35127b8

Added files:

Index: pkgsrc/chat/gajim/patches/patch-gajim___init__.py
diff -u /dev/null pkgsrc/chat/gajim/patches/patch-gajim___init__.py:1.1
--- /dev/null   Sat Aug  1 12:40:11 2020
+++ pkgsrc/chat/gajim/patches/patch-gajim___init__.py   Sat Aug  1 12:40:10 2020
@@ -0,0 +1,19 @@
+$NetBSD: patch-gajim___init__.py,v 1.1 2020/08/01 12:40:10 js Exp $
+
+Make Gajim not pick up the pkgsrc revision when pkgsrc is checked out via Git.
+
+--- gajim/__init__.py.orig     2020-08-01 12:32:50.000000000 +0000
++++ gajim/__init__.py
+@@ -11,12 +11,3 @@ IS_PORTABLE = False
+ portable_path = os.path.join(os.getcwd(), 'is_portable')
+ if os.path.exists(portable_path):
+     IS_PORTABLE = True
+-
+-try:
+-    p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True,
+-                         stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+-    node = p.communicate()[0]
+-    if node:
+-        __version__ += '+' + node.decode('utf-8').strip()
+-except Exception:
+-    pass