CVS commit: pkgsrc/graphics/py-mcomix

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat May 18 08:30:20 UTC 2019

Modified Files:
        pkgsrc/graphics/py-mcomix: Makefile distinfo
Added Files:
        pkgsrc/graphics/py-mcomix/patches: patch-mcomix_run.py

Log Message:
py-mcomix: Fix incompatibility with PIL 6.0.0.

Using upstream patch.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/py-mcomix/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/py-mcomix/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/py-mcomix/patches/patch-mcomix_run.py

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

Modified files:

Index: pkgsrc/graphics/py-mcomix/Makefile
diff -u pkgsrc/graphics/py-mcomix/Makefile:1.15 pkgsrc/graphics/py-mcomix/Makefile:1.16
--- pkgsrc/graphics/py-mcomix/Makefile:1.15     Fri Apr 26 13:14:01 2019
+++ pkgsrc/graphics/py-mcomix/Makefile  Sat May 18 08:30:20 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2019/04/26 13:14:01 maya Exp $
+# $NetBSD: Makefile,v 1.16 2019/05/18 08:30:20 wiz Exp $
 
 DISTNAME=      mcomix-1.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    graphics python
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mcomix/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/graphics/py-mcomix/distinfo
diff -u pkgsrc/graphics/py-mcomix/distinfo:1.5 pkgsrc/graphics/py-mcomix/distinfo:1.6
--- pkgsrc/graphics/py-mcomix/distinfo:1.5      Sat Dec  3 04:08:53 2016
+++ pkgsrc/graphics/py-mcomix/distinfo  Sat May 18 08:30:20 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2016/12/03 04:08:53 nonaka Exp $
+$NetBSD: distinfo,v 1.6 2019/05/18 08:30:20 wiz Exp $
 
 SHA1 (mcomix-1.2.1.tar.bz2) = c18b920269dea5c77f97af4c1d72d195c13a4c5f
 RMD160 (mcomix-1.2.1.tar.bz2) = db5d4c4ef695384581a504976d09a7e7a28d244e
@@ -8,3 +8,4 @@ SHA1 (patch-mcomix_archive_archive_base.
 SHA1 (patch-mcomix_archive_pdf_external.py) = 4b758daff2e1bd1312961870b209833277bb4cb6
 SHA1 (patch-mcomix_archive_rar_external.py) = 9a2d5f90ae4d618dd43acd29547e2d47ccb48b8b
 SHA1 (patch-mcomix_archive_sevenzip_external.py) = 2c6366e45a40f34349112e41944ae56a6255f95d
+SHA1 (patch-mcomix_run.py) = 20f29033839e2fa641e55084bb5eb4a1b7dfc9d8

Added files:

Index: pkgsrc/graphics/py-mcomix/patches/patch-mcomix_run.py
diff -u /dev/null pkgsrc/graphics/py-mcomix/patches/patch-mcomix_run.py:1.1
--- /dev/null   Sat May 18 08:30:20 2019
+++ pkgsrc/graphics/py-mcomix/patches/patch-mcomix_run.py       Sat May 18 08:30:20 2019
@@ -0,0 +1,20 @@
+$NetBSD: patch-mcomix_run.py,v 1.1 2019/05/18 08:30:20 wiz Exp $
+
+Fix incompatibility with PIL 6.0.0.
+https://sourceforge.net/p/mcomix/git/ci/486f02eef164df451a72598ce5989a1b37b49c60/
+
+--- mcomix/run.py.orig 2016-02-12 18:52:12.000000000 +0000
++++ mcomix/run.py
+@@ -203,7 +203,11 @@ def run():
+ 
+     try:
+         import PIL.Image
+-        assert PIL.Image.VERSION >= '1.1.5'
++        try:
++            assert PIL.Image.VERSION >= '1.1.5'
++        except AttributeError:
++            # Field VERSION deprecated in Pillow 5.2.0 and dropped in 6.0.0
++            assert PIL.__version__ >= '5.2.0'
+ 
+     except AssertionError:
+         log.error( _("You don't have the required version of the Python Imaging"), end=' ')