CVS commit: pkgsrc/print/py-Pdf

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Jul 29 20:39:39 UTC 2019

Modified Files:
        pkgsrc/print/py-Pdf: Makefile distinfo
        pkgsrc/print/py-Pdf/patches: patch-pyPdf_pdf.py

Log Message:
py-Pdf-1.13nb3: Preserve annotations while merging pages.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/py-Pdf/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/py-Pdf/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/py-Pdf/patches/patch-pyPdf_pdf.py

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

Modified files:

Index: pkgsrc/print/py-Pdf/Makefile
diff -u pkgsrc/print/py-Pdf/Makefile:1.7 pkgsrc/print/py-Pdf/Makefile:1.8
--- pkgsrc/print/py-Pdf/Makefile:1.7    Mon Jan  9 12:02:23 2017
+++ pkgsrc/print/py-Pdf/Makefile        Mon Jul 29 20:39:39 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2017/01/09 12:02:23 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2019/07/29 20:39:39 joerg Exp $
 
 DISTNAME=      pyPdf-1.13
 PKGNAME=       ${PYPKGPREFIX}-Pdf-1.13
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    print python
 MASTER_SITES=  http://pybrary.net/pyPdf/
 

Index: pkgsrc/print/py-Pdf/distinfo
diff -u pkgsrc/print/py-Pdf/distinfo:1.6 pkgsrc/print/py-Pdf/distinfo:1.7
--- pkgsrc/print/py-Pdf/distinfo:1.6    Mon Jan  9 12:02:23 2017
+++ pkgsrc/print/py-Pdf/distinfo        Mon Jul 29 20:39:39 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2017/01/09 12:02:23 joerg Exp $
+$NetBSD: distinfo,v 1.7 2019/07/29 20:39:39 joerg Exp $
 
 SHA1 (pyPdf-1.13.tar.gz) = ba7aed11cf21a2c218df2e3979be5eb90992dcbe
 RMD160 (pyPdf-1.13.tar.gz) = 0669d4a93c20fcd899d15ff42cb1b8b908f28e3b
 SHA512 (pyPdf-1.13.tar.gz) = 1c00a5a6658054671a396e7b334cbeb9e26dc1e3ad9668e212d05a9483f164931d8bd14fb9ab4d083d7ca3999fee7a2e9eea55b604a06c7d5d0632f0791b7598
 Size (pyPdf-1.13.tar.gz) = 35699 bytes
 SHA1 (patch-pyPdf_generic.py) = c661b2fd4cea8679ac551733ea25b7efa9fbb37d
-SHA1 (patch-pyPdf_pdf.py) = 560fbb475c976fc2c0e653d8a17e4a4277ac5a06
+SHA1 (patch-pyPdf_pdf.py) = 3359ec14fb25fedc86d27d23c052d1891c8c9e4d
 SHA1 (patch-pyPdf_utils.py) = 11b14d0c3bdbdac04312f1a4f8eb9f27c6d09009

Index: pkgsrc/print/py-Pdf/patches/patch-pyPdf_pdf.py
diff -u pkgsrc/print/py-Pdf/patches/patch-pyPdf_pdf.py:1.2 pkgsrc/print/py-Pdf/patches/patch-pyPdf_pdf.py:1.3
--- pkgsrc/print/py-Pdf/patches/patch-pyPdf_pdf.py:1.2  Mon Jan  9 12:02:23 2017
+++ pkgsrc/print/py-Pdf/patches/patch-pyPdf_pdf.py      Mon Jul 29 20:39:39 2019
@@ -1,7 +1,8 @@
-$NetBSD: patch-pyPdf_pdf.py,v 1.2 2017/01/09 12:02:23 joerg Exp $
+$NetBSD: patch-pyPdf_pdf.py,v 1.3 2019/07/29 20:39:39 joerg Exp $
 
 python-3.x compatibility.
 When renaming resources, make sure that the new name is actually new.
+Preserve annotations on page merge.
 
 --- pyPdf/pdf.py.orig  2010-12-04 22:49:56.000000000 +0000
 +++ pyPdf/pdf.py
@@ -67,3 +68,12 @@ When renaming resources, make sure that 
                  renameRes[key] = newname
                  newRes[newname] = page2Res[key]
              elif not newRes.has_key(key):
+@@ -1149,7 +1155,7 @@ class PageObject(DictionaryObject):
+         originalResources = self["/Resources"].getObject()
+         page2Resources = page2["/Resources"].getObject()
+ 
+-        for res in "/ExtGState", "/Font", "/XObject", "/ColorSpace", "/Pattern", "/Shading", "/Properties":
++        for res in "/ExtGState", "/Font", "/XObject", "/ColorSpace", "/Pattern", "/Shading", "/Properties", "/Annots":
+             new, newrename = PageObject._mergeResources(originalResources, page2Resources, res)
+             if new:
+                 newResources[NameObject(res)] = new