Re: pkg/53731: Missing dependency and wrong PLIST for chat/gajim

[Leonardo Taccari <leot%NetBSD.org@localhost>]

The following reply was made to PR pkg/53731; it has been noted by GNATS.

From: Leonardo Taccari <leot%NetBSD.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/53731: Missing dependency and wrong PLIST for chat/gajim
Date: Sun, 18 Nov 2018 21:58:59 +0100

 Hello Jonathan!
 
 js-pkgsrc%heap.zone@localhost writes:
 > [...]
 > >Description:
 > chat/gajim needs security/py-certifi, but the dependency is not declared in the Makefile.
 > Additionally, the PLIST is incorrect (at least on macOS - I have not verified on anything else).
 > [...]
 
 Thank you for the PR and patch!  The `certifi' dependency seems not
 specified in setup.py (and probably other files) despite needed
 (and that's probably worth to also ping upstream about it).
 
 The PLIST change seems a bit weird!  I think that the real problem
 is actually `git' invoked in gajim/__init__.py that overrides
 `__version__' and that leads to a non-matching EGG_INFODIR.
 
 I've adjusted your proposed patch to address the PLIST problem directly
 via a patch to gajim/__init__.py but I have not tested them (I'll attach
 it at the end of the email but a version is available also in:
 
  <https://www.NetBSD.org/~leot/pkgsrc-patches/gajim-pr-53731.patch>
 
 Can you please try it and let us know if that fixes the PLIST problem?
 
 
 Thank you!
 
 
 -------------8<-----------------8<-----------------8<---------------
 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 myself).
 
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/chat/gajim/Makefile,v
 retrieving revision 1.44
 diff -u -p -r1.44 Makefile
 --- Makefile	16 Nov 2018 00:00:02 -0000	1.44
 +++ Makefile	18 Nov 2018 20:45:23 -0000
 @@ -1,6 +1,7 @@
  # $NetBSD: Makefile,v 1.44 2018/11/16 00:00:02 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: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/chat/gajim/distinfo,v
 retrieving revision 1.7
 diff -u -p -r1.7 distinfo
 --- distinfo	16 Nov 2018 00:00:02 -0000	1.7
 +++ distinfo	18 Nov 2018 20:45:23 -0000
 @@ -4,4 +4,5 @@ SHA1 (gajim-1.1.0.tar.gz) = 222df24c209c
  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
 Index: patches/patch-gajim_____init____.py
 ===================================================================
 RCS file: patches/patch-gajim_____init____.py
 diff -N patches/patch-gajim_____init____.py
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ patches/patch-gajim_____init____.py	18 Nov 2018 20:45:23 -0000
 @@ -0,0 +1,20 @@
 +$NetBSD$
 +
 +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