[pkgsrc/trunk]: pkgsrc/graphics/py-mcomix py-mcomix: Fix incompatibility with...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4dab1fbc30cc
branches:  trunk
changeset: 395955:4dab1fbc30cc
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat May 18 08:30:20 2019 +0000

description:
py-mcomix: Fix incompatibility with PIL 6.0.0.

Using upstream patch.

Bump PKGREVISION.

diffstat:

 graphics/py-mcomix/Makefile                    |   4 ++--
 graphics/py-mcomix/distinfo                    |   3 ++-
 graphics/py-mcomix/patches/patch-mcomix_run.py |  20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diffs (52 lines):

diff -r 301b2705d17b -r 4dab1fbc30cc graphics/py-mcomix/Makefile
--- a/graphics/py-mcomix/Makefile       Sat May 18 04:28:21 2019 +0000
+++ b/graphics/py-mcomix/Makefile       Sat May 18 08:30:20 2019 +0000
@@ -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
diff -r 301b2705d17b -r 4dab1fbc30cc graphics/py-mcomix/distinfo
--- a/graphics/py-mcomix/distinfo       Sat May 18 04:28:21 2019 +0000
+++ b/graphics/py-mcomix/distinfo       Sat May 18 08:30:20 2019 +0000
@@ -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_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
diff -r 301b2705d17b -r 4dab1fbc30cc graphics/py-mcomix/patches/patch-mcomix_run.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/py-mcomix/patches/patch-mcomix_run.py    Sat May 18 08:30:20 2019 +0000
@@ -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=' ')