CVS commit: pkgsrc/chat/gajim

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Nov 19 14:50:24 UTC 2018

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

Log Message:
gajim: Add missing dependency to certifi and do not override __version__

- certifi module is needed despite not explicitly specified as a
  dependency in setup.py (probably a line about it should be added
  in setup.py too and shared with upstream).
- Do not override __version__ if git is found. This leads to possible PLIST
  problems due non-matching EGG_INFODIR.

Problem and patch by Jonathan Schleifer via PR pkg/53731 (PLIST problem a bit
reworked by leot).


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/chat/gajim/Makefile
cvs rdiff -u -r1.7 -r1.8 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/Makefile
diff -u pkgsrc/chat/gajim/Makefile:1.44 pkgsrc/chat/gajim/Makefile:1.45
--- pkgsrc/chat/gajim/Makefile:1.44     Fri Nov 16 00:00:02 2018
+++ pkgsrc/chat/gajim/Makefile  Mon Nov 19 14:50:24 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2018/11/16 00:00:02 nia Exp $
+# $NetBSD: Makefile,v 1.45 2018/11/19 14:50:24 nia Exp $
 
 DISTNAME=      gajim-1.1.0
+PKGREVISION=   1
 CATEGORIES=    chat python
 MASTER_SITES=  https://www.gajim.org/downloads/1.1/
 
@@ -19,6 +20,7 @@ _TOOLS_USE_PKGSRC.msgfmt=     yes
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+DEPENDS+=      ${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi
 DEPENDS+=      ${PYPKGPREFIX}-cssutils-[0-9]*:../../textproc/py-cssutils
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 DEPENDS+=      ${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring

Index: pkgsrc/chat/gajim/distinfo
diff -u pkgsrc/chat/gajim/distinfo:1.7 pkgsrc/chat/gajim/distinfo:1.8
--- pkgsrc/chat/gajim/distinfo:1.7      Fri Nov 16 00:00:02 2018
+++ pkgsrc/chat/gajim/distinfo  Mon Nov 19 14:50:24 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2018/11/16 00:00:02 nia Exp $
+$NetBSD: distinfo,v 1.8 2018/11/19 14:50:24 nia Exp $
 
 SHA1 (gajim-1.1.0.tar.gz) = 222df24c209cfa30346b29505fb88b1b20cfb5e1
 RMD160 (gajim-1.1.0.tar.gz) = 5e691a6f8e69b1ea6b6795bc841c0ac227a47182
 SHA512 (gajim-1.1.0.tar.gz) = 6a78de3e1aed055174b8f9d897a5a93fb1972d38cbd168e3c23d9af7a66ed63236bbc22054c24a31b0fda3c1d73e56240ccb18ccf805f654b0e331d8092ae626
 Size (gajim-1.1.0.tar.gz) = 9530150 bytes
+SHA1 (patch-gajim_____init____.py) = 555df1ee88159aa0c9d5232fba46924983d7a17b
 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   Mon Nov 19 14:50:25 2018
+++ pkgsrc/chat/gajim/patches/patch-gajim_____init____.py       Mon Nov 19 14:50:24 2018
@@ -0,0 +1,20 @@
+$NetBSD: patch-gajim_____init____.py,v 1.1 2018/11/19 14:50:24 nia Exp $
+
+Do not run `git' to override __version__ and possible inconsistencies in PLIST
+due a different ${EGG_INFODIR}.
+
+--- gajim/__init__.py.orig     2018-11-06 20:12:20.000000000 +0000
++++ gajim/__init__.py
+@@ -6,12 +6,3 @@ __version__ = "1.1.0"
+ IS_FLATPAK = False
+ if os.path.exists('/app/share/run-as-flatpak'):
+     IS_FLATPAK = 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