diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2017-12-10 16:02:59 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2017-12-10 16:02:59 +0000 |
| commit | 4fb8858034e92497445763681ccec4d551c8b770 (patch) | |
| tree | 7e14e012975c82a1ba887f5b06b6204a42fecc0a | |
| parent | f5f1d4133ef57bc4d070378d10ab7f1b245a1f43 (diff) | |
| download | pkgsrc-4fb8858034e92497445763681ccec4d551c8b770.tar.gz | |
Fix poppler-glib build.
The gtkdoc.py patch used a mixture of tabs and spaces, which was rejected
by the Python interpreter. Also (with Python 3.6 as default), there was an
uncaught TypeError, which I added to the existing except clause.
| -rw-r--r-- | print/poppler/distinfo | 4 | ||||
| -rw-r--r-- | print/poppler/patches/patch-gtkdoc.py | 21 |
2 files changed, 20 insertions, 5 deletions
diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 746722805d2..2350c5e7425 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.123 2017/12/08 07:48:11 spz Exp $ +$NetBSD: distinfo,v 1.124 2017/12/10 16:02:59 bsiegert Exp $ SHA1 (poppler-0.61.1.tar.xz) = 70a3440e0ac9957cee94ff6a56a173f3377b02ba RMD160 (poppler-0.61.1.tar.xz) = 62fa0f917e31e0c733228ea9289b4493a0fc29a8 SHA512 (poppler-0.61.1.tar.xz) = 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d Size (poppler-0.61.1.tar.xz) = 1433696 bytes SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa -SHA1 (patch-gtkdoc.py) = 22f12d2eabfa0bff78dc88f87cd6d7bf536c8056 +SHA1 (patch-gtkdoc.py) = b9bf7a8c2288bdec314c795317e2a4e1aac21913 diff --git a/print/poppler/patches/patch-gtkdoc.py b/print/poppler/patches/patch-gtkdoc.py index 0dc22c477cc..5126ee10e94 100644 --- a/print/poppler/patches/patch-gtkdoc.py +++ b/print/poppler/patches/patch-gtkdoc.py @@ -1,14 +1,29 @@ -$NetBSD: patch-gtkdoc.py,v 1.1 2017/12/08 07:48:11 spz Exp $ +$NetBSD: patch-gtkdoc.py,v 1.2 2017/12/10 16:02:59 bsiegert Exp $ --- gtkdoc.py.orig 2017-11-12 18:14:32.000000000 +0000 +++ gtkdoc.py +@@ -196,12 +196,12 @@ class GTKDoc(object): + if stdout: + try: + sys.stdout.write(stdout.encode("utf-8")) +- except UnicodeDecodeError: ++ except (TypeError, UnicodeDecodeError): + sys.stdout.write(stdout) + if stderr: + try: + sys.stderr.write(stderr.encode("utf-8")) +- except UnicodeDecodeError: ++ except (TypeError, UnicodeDecodeError): + sys.stderr.write(stderr) + + if process.returncode != 0: @@ -223,6 +223,9 @@ class GTKDoc(object): return def copy_file_replacing_existing(src, dest): + if src == dest: -+ self.logger.debug('copy_file_replacing_existing not copying to itself: %s', src) -+ return ++ self.logger.debug('copy_file_replacing_existing not copying to itself: %s', src) ++ return if os.path.isdir(src): self.logger.debug('skipped directory %s', src) return |