[pkgsrc/trunk]: pkgsrc/print/py-Pdf py-Pdf-1.13nb3: Preserve annotations whil...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1708031d462d
branches:  trunk
changeset: 398759:1708031d462d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jul 29 20:39:39 2019 +0000

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

diffstat:

 print/py-Pdf/Makefile                   |   4 ++--
 print/py-Pdf/distinfo                   |   4 ++--
 print/py-Pdf/patches/patch-pyPdf_pdf.py |  12 +++++++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r 4b3ac7ca50f9 -r 1708031d462d print/py-Pdf/Makefile
--- a/print/py-Pdf/Makefile     Mon Jul 29 20:39:26 2019 +0000
+++ b/print/py-Pdf/Makefile     Mon Jul 29 20:39:39 2019 +0000
@@ -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/
 
diff -r 4b3ac7ca50f9 -r 1708031d462d print/py-Pdf/distinfo
--- a/print/py-Pdf/distinfo     Mon Jul 29 20:39:26 2019 +0000
+++ b/print/py-Pdf/distinfo     Mon Jul 29 20:39:39 2019 +0000
@@ -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
diff -r 4b3ac7ca50f9 -r 1708031d462d print/py-Pdf/patches/patch-pyPdf_pdf.py
--- a/print/py-Pdf/patches/patch-pyPdf_pdf.py   Mon Jul 29 20:39:26 2019 +0000
+++ b/print/py-Pdf/patches/patch-pyPdf_pdf.py   Mon Jul 29 20:39:39 2019 +0000
@@ -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 @@
                  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