diff options
| author | joerg <joerg@pkgsrc.org> | 2017-01-09 12:02:23 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2017-01-09 12:02:23 +0000 |
| commit | efb474f92a02529b9ea0e76b230472793abd0c1e (patch) | |
| tree | 00326af54ef0541d58a914eea7679a2adb87f07e /print | |
| parent | 0b71b6633d8546aaf0a80ba5ada85dd6f375508a (diff) | |
| download | pkgsrc-efb474f92a02529b9ea0e76b230472793abd0c1e.tar.gz | |
Ensure that renaming on page merge actually creates unique names. Bump
revision.
Diffstat (limited to 'print')
| -rw-r--r-- | print/py-Pdf/Makefile | 4 | ||||
| -rw-r--r-- | print/py-Pdf/distinfo | 4 | ||||
| -rw-r--r-- | print/py-Pdf/patches/patch-pyPdf_pdf.py | 18 |
3 files changed, 21 insertions, 5 deletions
diff --git a/print/py-Pdf/Makefile b/print/py-Pdf/Makefile index 2ca4e378a32..5fe8b6f6a0a 100644 --- a/print/py-Pdf/Makefile +++ b/print/py-Pdf/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2014/01/23 14:38:42 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2017/01/09 12:02:23 joerg Exp $ DISTNAME= pyPdf-1.13 PKGNAME= ${PYPKGPREFIX}-Pdf-1.13 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print python MASTER_SITES= http://pybrary.net/pyPdf/ diff --git a/print/py-Pdf/distinfo b/print/py-Pdf/distinfo index 1aec042ae50..301d3682e82 100644 --- a/print/py-Pdf/distinfo +++ b/print/py-Pdf/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 01:01:38 agc Exp $ +$NetBSD: distinfo,v 1.6 2017/01/09 12:02:23 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) = b4e2822531b6d54676c1d7e5d672e1fe50f50ee5 +SHA1 (patch-pyPdf_pdf.py) = 560fbb475c976fc2c0e653d8a17e4a4277ac5a06 SHA1 (patch-pyPdf_utils.py) = 11b14d0c3bdbdac04312f1a4f8eb9f27c6d09009 diff --git a/print/py-Pdf/patches/patch-pyPdf_pdf.py b/print/py-Pdf/patches/patch-pyPdf_pdf.py index 52f1674dd93..0aa4d62ed4d 100644 --- a/print/py-Pdf/patches/patch-pyPdf_pdf.py +++ b/print/py-Pdf/patches/patch-pyPdf_pdf.py @@ -1,6 +1,7 @@ -$NetBSD: patch-pyPdf_pdf.py,v 1.1 2014/01/23 14:38:42 wiz Exp $ +$NetBSD: patch-pyPdf_pdf.py,v 1.2 2017/01/09 12:02:23 joerg Exp $ python-3.x compatibility. +When renaming resources, make sure that the new name is actually new. --- pyPdf/pdf.py.orig 2010-12-04 22:49:56.000000000 +0000 +++ pyPdf/pdf.py @@ -51,3 +52,18 @@ python-3.x compatibility. user_password, key = self._authenticateUserPassword(password) if user_password: self._decryption_key = key +@@ -1062,7 +1062,13 @@ class PageObject(DictionaryObject): + renameRes = {} + for key in page2Res.keys(): + if newRes.has_key(key) and newRes[key] != page2Res[key]: +- newname = NameObject(key + "renamed") ++ base_newkey = key + "renamed" ++ newkey = base_newkey ++ counter = 0 ++ while newRes.has_key(newkey) or page2Res.has_key(newkey): ++ newkey = "%s%d" % (base_newkey, counter) ++ counter = counter + 1 ++ newname = NameObject(newkey) + renameRes[key] = newname + newRes[newname] = page2Res[key] + elif not newRes.has_key(key): |