CVS commit: pkgsrc/print/py-PDF2

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

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

Modified Files:
        pkgsrc/print/py-PDF2: Makefile distinfo
Added Files:
        pkgsrc/print/py-PDF2/patches: patch-PyPDF2_pdf.py

Log Message:
py-PDF2-1.26.0nb1: Preserve annoations while merging pages


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/py-PDF2/Makefile \
    pkgsrc/print/py-PDF2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/print/py-PDF2/patches/patch-PyPDF2_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-PDF2/Makefile
diff -u pkgsrc/print/py-PDF2/Makefile:1.5 pkgsrc/print/py-PDF2/Makefile:1.6
--- pkgsrc/print/py-PDF2/Makefile:1.5   Fri Sep  2 14:29:55 2016
+++ pkgsrc/print/py-PDF2/Makefile       Mon Jul 29 20:40:19 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2016/09/02 14:29:55 mef Exp $
+# $NetBSD: Makefile,v 1.6 2019/07/29 20:40:19 joerg Exp $
 
 VERSION=       1.26.0
 DISTNAME=      PyPDF2-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/Py//}
+PKGREVISION=   1
 CATEGORIES=    print python
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mstamy2/}
 GITHUB_PROJECT=        PyPDF2
Index: pkgsrc/print/py-PDF2/distinfo
diff -u pkgsrc/print/py-PDF2/distinfo:1.5 pkgsrc/print/py-PDF2/distinfo:1.6
--- pkgsrc/print/py-PDF2/distinfo:1.5   Fri Sep  2 14:29:55 2016
+++ pkgsrc/print/py-PDF2/distinfo       Mon Jul 29 20:40:19 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2016/09/02 14:29:55 mef Exp $
+$NetBSD: distinfo,v 1.6 2019/07/29 20:40:19 joerg Exp $
 
 SHA1 (PyPDF2-1.26.0.tar.gz) = 29859e086b6e78459feb660ba24f3b22773e11c1
 RMD160 (PyPDF2-1.26.0.tar.gz) = e372225e2cb72a0247c28dba18d8b99f73e0d826
 SHA512 (PyPDF2-1.26.0.tar.gz) = fe29c1e24be765c43fed47185dc69cfe959d36c693f6ac9fed9a33c48035c651eed8f2f6eb674697f923b769fcfdd275624b128ab99992477bfc0e854b90fa5c
 Size (PyPDF2-1.26.0.tar.gz) = 199539 bytes
+SHA1 (patch-PyPDF2_pdf.py) = e0f80e59de5163ff82c2fbda08560767065ea958

Added files:

Index: pkgsrc/print/py-PDF2/patches/patch-PyPDF2_pdf.py
diff -u /dev/null pkgsrc/print/py-PDF2/patches/patch-PyPDF2_pdf.py:1.1
--- /dev/null   Mon Jul 29 20:40:19 2019
+++ pkgsrc/print/py-PDF2/patches/patch-PyPDF2_pdf.py    Mon Jul 29 20:40:19 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-PyPDF2_pdf.py,v 1.1 2019/07/29 20:40:19 joerg Exp $
+
+--- PyPDF2/pdf.py.orig 2019-07-29 19:44:01.901056460 +0000
++++ PyPDF2/pdf.py
+@@ -2256,7 +2256,7 @@ class PageObject(DictionaryObject):
+                     for ref in annots:
+                         newAnnots.append(ref)
+ 
+-        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