diff options
| author | joerg <joerg@pkgsrc.org> | 2016-11-11 12:47:52 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-11-11 12:47:52 +0000 |
| commit | 30cd0ccc4c145060c32218c1f8dfe73f37eb0901 (patch) | |
| tree | 25a1d1a04e37c8b118ed67c7de90d849e8453a2a | |
| parent | 763e459e63e5f459119d36a5682f58b1168caf09 (diff) | |
| download | pkgsrc-30cd0ccc4c145060c32218c1f8dfe73f37eb0901.tar.gz | |
Fix reportlab version check for 3.x and later.
| -rw-r--r-- | print/py-pisa/Makefile | 3 | ||||
| -rw-r--r-- | print/py-pisa/distinfo | 3 | ||||
| -rw-r--r-- | print/py-pisa/patches/patch-sx_pisa3_pisa__util.py | 17 |
3 files changed, 21 insertions, 2 deletions
diff --git a/print/py-pisa/Makefile b/print/py-pisa/Makefile index 155fd811991..5c27c7779ce 100644 --- a/print/py-pisa/Makefile +++ b/print/py-pisa/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2016/11/08 11:42:01 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2016/11/11 12:47:52 joerg Exp $ DISTNAME= pisa-3.0.33 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= textproc print www python MASTER_SITES= ${MASTER_SITE_PYPI:=p/pisa/} diff --git a/print/py-pisa/distinfo b/print/py-pisa/distinfo index 02c7fa607cf..dfd6c6631b1 100644 --- a/print/py-pisa/distinfo +++ b/print/py-pisa/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.7 2016/11/08 11:42:01 wiz Exp $ +$NetBSD: distinfo,v 1.8 2016/11/11 12:47:52 joerg Exp $ SHA1 (pisa-3.0.33.tar.gz) = 3d7e644b96b7c8f98bfd5823a163c3badd662209 RMD160 (pisa-3.0.33.tar.gz) = 1479865d1f0b14f4a37c74fc8aae7e72e9d0efac SHA512 (pisa-3.0.33.tar.gz) = 5d11d717734ca30876697ce25c77f381a560f4b266b2dbd9f2445ac9b39e2750cc3ff31603d9a1cba6ed51a047fca38ac95a2a4dddf88b238aa5c0d6f810a975 Size (pisa-3.0.33.tar.gz) = 4500555 bytes SHA1 (patch-aa) = 39354cac1592787d43622c04ef776f13b39450ca +SHA1 (patch-sx_pisa3_pisa__util.py) = 130f9ac339239b71fc6a4920c0cadcccdbc1a913 diff --git a/print/py-pisa/patches/patch-sx_pisa3_pisa__util.py b/print/py-pisa/patches/patch-sx_pisa3_pisa__util.py new file mode 100644 index 00000000000..1ce09c75119 --- /dev/null +++ b/print/py-pisa/patches/patch-sx_pisa3_pisa__util.py @@ -0,0 +1,17 @@ +$NetBSD: patch-sx_pisa3_pisa__util.py,v 1.1 2016/11/11 12:47:52 joerg Exp $ + +--- sx/pisa3/pisa_util.py.orig 2010-06-16 13:43:35.000000000 +0000 ++++ sx/pisa3/pisa_util.py +@@ -51,10 +51,10 @@ import shutil + + rgb_re = re.compile("^.*?rgb[(]([0-9]+).*?([0-9]+).*?([0-9]+)[)].*?[ ]*$") + +-if not(reportlab.Version[0] == "2" and reportlab.Version[2] >= "1"): ++if int(reportlab.Version[0]) < 2 or (reportlab.Version[0] == "2" and reportlab.Version[2] == "0"): + raise ImportError("Reportlab Version 2.1+ is needed!") + +-REPORTLAB22 = (reportlab.Version[0] == "2" and reportlab.Version[2] >= "2") ++REPORTLAB22 = not(reportlab.Version[0] == "2" and reportlab.Version[2] == "1") + # print "***", reportlab.Version, REPORTLAB22, reportlab.__file__ + + import logging |