pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/py-reportlab py-reportlab: updated to 3.4.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/05960bb611bb
branches: trunk
changeset: 372795:05960bb611bb
user: adam <adam%pkgsrc.org@localhost>
date: Sun Dec 17 16:47:54 2017 +0000
description:
py-reportlab: updated to 3.4.0
RELEASE 3.4:
* More pagesizes from https://en.wikipedia.org/wiki/Paper_size (contributed by https://bitbucket.org/alainchiasson/)
* add in fillMode (fill-rule) variable to the graphics state for drawings
* add support for automatic bullet rotation in ListFlowables.
* fix acroform annotation bug in radios (reported by Olivia Zhang)
* fix split paragraph rendering bug (reported by Olivia Zhang & Echo Bell)
* Allow Image to have a drawing as argument
* support for Path autoclose & fillMode; version --> 3.3.29
* add support for different fill policies in renderXX drawPath; version-->3.3.28
* allow for UTF_16_LE BOM, fix for bug contributed by Michael Poindexter mpoindexter%housecanary.com@localhost
* improved support for images in renderPM/renderSVG bug report from Claude Paroz
* add AcroForm support to canvas; version --> 3.3.22
* avoid cr lf line endings
* attempt to ensure zipImported has some files or returns None
* added additonal test to barcode/test.py
* add an invisible font test thanks https://bitbucket.org/kb/ Konstantin Baierer
* add mailto href test
* improve UPCA barcode contribution by Kyle McFarlane https://bitbucket.org/kylemacfarlane/
* attempt to fix __loader__ issues in pyinstaller suggested by dbrnz @ bitbucket
* fix NormalDate comprisons in python3.x
* fix ypad use in ParagraphAndImage contrib annamarianfr@bitbucket, version-->3.3.16
* try to prevent multiple saving contrib by Tim Meneely
* fix problems with svg drawToString contrib by Eric Gillet & Johann Du Toit
* fix issue reported by Yitzchak Scott-Thoennes <sthoenna%gmail.com@localhost>
* fix fake KeepTogether setup in handle_keepWithNext
* add NullActionFlowable, fix empty KeepTogether
* really merge para-measure-fix
* merge para-measure-fix changes
* fixes to TypedPropertyCollection
* changes to Render class; allow drawings to specify initialFontName/Size
* fix python>=3.2 default axis labelling to match python2.x
* fix AttributeError
* add experimental time value axis
* fix bug in python shapes rendering
* add negative span style to test_platypus_tables splitting example
* fix segfault in _rl_accel.c
* attempt to remove quadratic performance hit when longTableOptimize is set
* allow DATA: scheme in open for read
* import Table _rowpositions calculation
* support small ttfs which do not allow subsets
* add rl_settings allowTTFSubsetting
* address issue 76 (deprecated immports)
* add table cell support for simple background shadings, contributed by Jeffrey Creem jcreem@bitbucket
* fix bug in tables.py reported by Vytis Banaitis @ bitbucket; version-->3.3.2
* minor change to allow barWidth setting in ecc200datamatrix.py (suggested by Kyle MacFarlane @ bitbucket)
* make paraparser syntax errors real and fix <sup/sub> tags to have relative values; version-->3.3.1
* ReportLab now runs all tests under Python 2.7, 3.3, 3.4, 3.5 & 3.6.
diffstat:
print/py-reportlab/Makefile | 53 +----
print/py-reportlab/PLIST | 5 +-
print/py-reportlab/distinfo | 21 +-
print/py-reportlab/patches/patch-src_reportlab_platypus_tables.py | 107 ----------
print/py-reportlab/patches/patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c | 13 +-
5 files changed, 29 insertions(+), 170 deletions(-)
diffs (260 lines):
diff -r 551a4a969daa -r 05960bb611bb print/py-reportlab/Makefile
--- a/print/py-reportlab/Makefile Sun Dec 17 16:32:57 2017 +0000
+++ b/print/py-reportlab/Makefile Sun Dec 17 16:47:54 2017 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2017/11/09 08:10:55 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2017/12/17 16:47:54 adam Exp $
-DISTNAME= reportlab-3.3.0
+DISTNAME= reportlab-3.4.0
DISTFILES= ${DEFAULT_DISTFILES} pfbfer.zip
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 2
CATEGORIES= print python
MASTER_SITES= ${MASTER_SITE_PYPI:=r/reportlab/}
SITES.pfbfer.zip= http://www.reportlab.com/ftp/fonts/
@@ -14,57 +13,19 @@
LICENSE= modified-bsd
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-DEPENDS+= ${PYPKGPREFIX}-{Pillow-[0-9]*,imaging-[0-9]*}:../../graphics/py-Pillow
+DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.4.0:../../graphics/py-Pillow
EXTRACT_DIR.pfbfer.zip= ${WRKSRC}/src/reportlab/fonts
EXTRACT_OPTS_ZIP+= -L
-REPLACE_PYTHON+= demos/tests/testdemos.py
-REPLACE_PYTHON+= docs/genAll.py
-REPLACE_PYTHON+= docs/reference/genreference.py
-REPLACE_PYTHON+= docs/userguide/genuserguide.py
-REPLACE_PYTHON+= src/reportlab/graphics/barcode/test.py
-REPLACE_PYTHON+= src/reportlab/graphics/testdrawings.py
-REPLACE_PYTHON+= src/reportlab/graphics/testshapes.py
-REPLACE_PYTHON+= src/reportlab/graphics/widgets/table.py
-REPLACE_PYTHON+= src/reportlab/lib/__init__.py
-REPLACE_PYTHON+= src/reportlab/lib/corp.py
-REPLACE_PYTHON+= src/reportlab/lib/fonts.py
-REPLACE_PYTHON+= src/reportlab/lib/formatters.py
-REPLACE_PYTHON+= src/reportlab/lib/logger.py
-REPLACE_PYTHON+= src/reportlab/lib/normalDate.py
-REPLACE_PYTHON+= src/reportlab/lib/pagesizes.py
-REPLACE_PYTHON+= src/reportlab/lib/randomtext.py
-REPLACE_PYTHON+= src/reportlab/lib/units.py
-REPLACE_PYTHON+= tests/runAll.py
-REPLACE_PYTHON+= tests/test_docstrings.py
-REPLACE_PYTHON+= tests/test_geomutils.py
-REPLACE_PYTHON+= tests/test_hello.py
-REPLACE_PYTHON+= tests/test_images.py
-REPLACE_PYTHON+= tests/test_invariant.py
-REPLACE_PYTHON+= tests/test_lib_pdfencrypt.py
-REPLACE_PYTHON+= tests/test_pdfbase_postscript.py
-REPLACE_PYTHON+= tests/test_pdfgen_callback.py
-REPLACE_PYTHON+= tests/test_pdfgen_general.py
-REPLACE_PYTHON+= tests/test_platypus_paraparser.py
-REPLACE_PYTHON+= tests/test_platypus_tables.py
-REPLACE_PYTHON+= tests/test_renderSVG.py
-REPLACE_PYTHON+= tests/test_source_chars.py
-REPLACE_PYTHON+= tests/test_utils.py
-REPLACE_PYTHON+= tools/docco/docpy.py
-REPLACE_PYTHON+= tools/docco/graphdocpy.py
-REPLACE_PYTHON+= tools/docco/rl_doc_utils.py
-REPLACE_PYTHON+= tools/pythonpoint/pythonpoint.py
+# fixup group/world writeable fonts from pfbfer.zip
+post-install:
+ ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${PYSITELIB}/reportlab/fonts/*.pfb
-#fixup group/world writeable fonts from pfbfer.zip
-post-install:
- ${CHMOD} ${SHAREMODE} \
- ${DESTDIR}${PREFIX}/${PYSITELIB}/reportlab/fonts/*.pfb
do-test:
- ${RUN}cd ${WRKSRC};${PYTHONBIN} setup.py tests
+ cd ${WRKSRC} && ${PYTHONBIN} setup.py tests
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/libart/buildlink3.mk"
-.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 551a4a969daa -r 05960bb611bb print/py-reportlab/PLIST
--- a/print/py-reportlab/PLIST Sun Dec 17 16:32:57 2017 +0000
+++ b/print/py-reportlab/PLIST Sun Dec 17 16:47:54 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2016/09/11 16:41:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2017/12/17 16:47:54 adam Exp $
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -405,6 +405,9 @@
${PYSITELIB}/reportlab/pdfbase/_fontdata_widths_zapfdingbats.py
${PYSITELIB}/reportlab/pdfbase/_fontdata_widths_zapfdingbats.pyc
${PYSITELIB}/reportlab/pdfbase/_fontdata_widths_zapfdingbats.pyo
+${PYSITELIB}/reportlab/pdfbase/acroform.py
+${PYSITELIB}/reportlab/pdfbase/acroform.pyc
+${PYSITELIB}/reportlab/pdfbase/acroform.pyo
${PYSITELIB}/reportlab/pdfbase/cidfonts.py
${PYSITELIB}/reportlab/pdfbase/cidfonts.pyc
${PYSITELIB}/reportlab/pdfbase/cidfonts.pyo
diff -r 551a4a969daa -r 05960bb611bb print/py-reportlab/distinfo
--- a/print/py-reportlab/distinfo Sun Dec 17 16:32:57 2017 +0000
+++ b/print/py-reportlab/distinfo Sun Dec 17 16:47:54 2017 +0000
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.20 2017/11/09 08:10:55 wiz Exp $
+$NetBSD: distinfo,v 1.21 2017/12/17 16:47:54 adam Exp $
-SHA1 (pfbfer.zip) = 38753493035ee5b96746051df63ce4884763622d
-RMD160 (pfbfer.zip) = 70097e97f2fccc7f4df6b276b21a0fa765a57f55
-SHA512 (pfbfer.zip) = f07bea3c1f77816a5ce24b6383d7de11a78deeb9e12c5d8d281de640c88e4dd8afc2f6b89a5cfaedd2814bea67ba10d3c1cc8b6c59ce997655162749a59b53ae
-Size (pfbfer.zip) = 676909 bytes
-SHA1 (reportlab-3.3.0.tar.gz) = 04c20507ec324918d05e852ddc3c8d7b6ec51c19
-RMD160 (reportlab-3.3.0.tar.gz) = 5fa65b8abf15042671d7e850bb214acff6eeeb03
-SHA512 (reportlab-3.3.0.tar.gz) = a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
-Size (reportlab-3.3.0.tar.gz) = 1959255 bytes
-SHA1 (patch-src_reportlab_platypus_tables.py) = 64f9a9ff7e6c60566baa37bc3294c163cab7cadc
-SHA1 (patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c) = 315c130ce8ae734970cec3ecb4586b1b89b27754
+SHA1 (pfbfer.zip) = 238af8f6eab6308f3d24903bbce7d071bae63841
+RMD160 (pfbfer.zip) = 15eced15df3d46d3baa1929dc9467b3ea5a9b8ee
+SHA512 (pfbfer.zip) = 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
+Size (pfbfer.zip) = 677333 bytes
+SHA1 (reportlab-3.4.0.tar.gz) = bd7be4e532b00bc2535d08eef84d5de39814d23c
+RMD160 (reportlab-3.4.0.tar.gz) = 280bcf0a3a88eab6930d75e21b6ae3d75be77b59
+SHA512 (reportlab-3.4.0.tar.gz) = 7f00074b93be49e1aa7650e61381e285598599911b12a6b63c0f12d6eb64bc59afb6907b683350740b0a81c99a3164373b27e18cfccc0f9da12405c3dacd1ff7
+Size (reportlab-3.4.0.tar.gz) = 1995779 bytes
+SHA1 (patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c) = 4d7d456eaf027ee747b0e77c4a18f8181a7e1acc
diff -r 551a4a969daa -r 05960bb611bb print/py-reportlab/patches/patch-src_reportlab_platypus_tables.py
--- a/print/py-reportlab/patches/patch-src_reportlab_platypus_tables.py Sun Dec 17 16:32:57 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-$NetBSD: patch-src_reportlab_platypus_tables.py,v 1.1 2017/11/02 20:03:13 joerg Exp $
-
-b6902985cf64efab2c1259a42b06e0eddbe93805:
-attempt to remove quadratic performance hit when longTableOptimize is set
-
---- src/reportlab/platypus/tables.py.orig 2016-02-17 12:30:12.000000000 +0000
-+++ src/reportlab/platypus/tables.py
-@@ -204,7 +204,7 @@ class Table(Flowable):
- def __init__(self, data, colWidths=None, rowHeights=None, style=None,
- repeatRows=0, repeatCols=0, splitByRow=1, emptyTableAction=None, ident=None,
- hAlign=None,vAlign=None, normalizedData=0, cellStyles=None, rowSplitRange=None,
-- spaceBefore=None,spaceAfter=None):
-+ spaceBefore=None,spaceAfter=None, longTableOptimize=None):
- self.ident = ident
- self.hAlign = hAlign or 'CENTER'
- self.vAlign = vAlign or 'MIDDLE'
-@@ -218,7 +218,8 @@ class Table(Flowable):
- elif colWidths and _seqCW: ncols = len(colWidths)
- else: ncols = 0
- if not emptyTableAction: emptyTableAction = rl_config.emptyTableAction
-- self._longTableOptimize = getattr(self,'_longTableOptimize',rl_config.longTableOptimize)
-+ self._longTableOptimize = (getattr(self,'_longTableOptimize',rl_config.longTableOptimize)
-+ if longTableOptimize is None else longTableOptimize)
- if not (nrows and ncols):
- if emptyTableAction=='error':
- raise ValueError("%s must have at least a row and column" % self.identity())
-@@ -583,19 +584,19 @@ class Table(Flowable):
- H[i] = h
- # we can stop if we have filled up all available room
- if longTable:
-- hmax = i
-- height = sum(H[:i])
-+ hmax = i+1 #we computed H[i] so known len == i+1
-+ height = sum(H[:hmax])
- if height > availHeight:
-- #we can terminate if all spans are complete in H[:i]
-+ #we can terminate if all spans are complete in H[:hmax]
- if spanCons:
-- msr = max([x[1] for x in spanCons.keys()]) #RS=[endrowspan,.....]
-- if hmax>=msr:
-+ msr = max(x[1] for x in spanCons.keys()) #RS=[endrowspan,.....]
-+ if hmax>msr:
- break
- if None not in H: hmax = lim
-
- if spanCons:
- try:
-- spanFixDim(H0,H,spanCons,lim=hmax)
-+ spanFixDim(H0,H,spanCons)
- except:
- annotateException('\nspanning problem in %s hmax=%s lim=%s avail=%s x %s\nH0=%r H=%r\nspanCons=%r' % (self.identity(),hmax,lim,availWidth,availHeight,H0,H,spanCons))
-
-@@ -1260,11 +1261,17 @@ class Table(Flowable):
- #we're going to split into two superRows
- ident = self.ident
- if ident: ident = IdentStr(ident)
-- R0 = self.__class__( data[:n], colWidths=self._colWidths, rowHeights=self._argH[:n],
-+ lto = self._longTableOptimize
-+ if lto:
-+ splitH = self._rowHeights
-+ else:
-+ splitH = self._argH
-+ R0 = self.__class__( data[:n], colWidths=self._colWidths, rowHeights=splitH[:n],
- repeatRows=repeatRows, repeatCols=repeatCols,
- splitByRow=splitByRow, normalizedData=1, cellStyles=self._cellStyles[:n],
- ident=ident,
-- spaceBefore=getattr(self,'spaceBefore',None))
-+ spaceBefore=getattr(self,'spaceBefore',None),
-+ longTableOptimize=lto)
-
- nrows = self._nrows
- ncols = self._ncols
-@@ -1324,22 +1331,23 @@ class Table(Flowable):
- if isinstance(repeatRows,int):
- iRows = data[:repeatRows]
- nRepeatRows = repeatRows
-- iRowH = self._argH[:repeatRows]
-+ iRowH = splitH[:repeatRows]
- iCS = self._cellStyles[:repeatRows]
- else:
- #we have a list of repeated rows eg (1,3)
- repeatRows = list(sorted(repeatRows))
- iRows = [data[i] for i in repeatRows]
- nRepeatRows = len(repeatRows)
-- iRowH = [self._argH[i] for i in repeatRows]
-+ iRowH = [splitH[i] for i in repeatRows]
- iCS = [self._cellStyles[i] for i in repeatRows]
- R1 = self.__class__(iRows+data[n:],colWidths=self._colWidths,
-- rowHeights=iRowH+self._argH[n:],
-+ rowHeights=iRowH+splitH[n:],
- repeatRows=nRepeatRows, repeatCols=repeatCols,
- splitByRow=splitByRow, normalizedData=1,
- cellStyles=iCS+self._cellStyles[n:],
- ident=ident,
- spaceAfter=getattr(self,'spaceAfter',None),
-+ longTableOptimize=lto,
- )
- R1._cr_1_1(n,nRepeatRows,A)
- R1._cr_1_1(n,nRepeatRows,self._bkgrndcmds)
-@@ -1352,6 +1360,7 @@ class Table(Flowable):
- splitByRow=splitByRow, normalizedData=1, cellStyles=self._cellStyles[n:],
- ident=ident,
- spaceAfter=getattr(self,'spaceAfter',None),
-+ longTableOptimize=lto,
- )
- R1._cr_1_0(n,A)
- R1._cr_1_0(n,self._bkgrndcmds)
diff -r 551a4a969daa -r 05960bb611bb print/py-reportlab/patches/patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c
--- a/print/py-reportlab/patches/patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c Sun Dec 17 16:32:57 2017 +0000
+++ b/print/py-reportlab/patches/patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c Sun Dec 17 16:47:54 2017 +0000
@@ -1,14 +1,17 @@
-$NetBSD: patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c,v 1.1 2016/09/11 15:53:51 richard Exp $
+$NetBSD: patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c,v 1.2 2017/12/17 16:47:54 adam Exp $
+
memcpy() and co are found in <string.h> on POSIX systems.
--- src/rl_addons/renderPM/gt1/gt1-namecontext.c.orig 2013-03-14 11:30:09.000000000 +0000
+++ src/rl_addons/renderPM/gt1/gt1-namecontext.c
-@@ -3,7 +3,7 @@
+@@ -3,9 +3,7 @@
#include "gt1-misc.h"
#include "gt1-namecontext.h"
-#if defined(_WIN32) || defined(macintosh)
-+#if 1
- # include <string.h>
- #endif
+-# include <string.h>
+-#endif
++#include <string.h>
+ /* btw, I do not know who wrote the following comment. I modified this
+ file somewhat from gimp's app/procedural_db.c hash function. */
Home |
Main Index |
Thread Index |
Old Index