<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/73219233451be8274f8c41060c3bcf8f71ea9ccb">https://github.com/macports/macports-ports/commit/73219233451be8274f8c41060c3bcf8f71ea9ccb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 73219233451be8274f8c41060c3bcf8f71ea9ccb
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Sep 25 12:50:00 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    inkscape: rebuild with patch for poppler 0.69.0
</span>---
 graphics/inkscape/Portfile                      |  9 +++++---
 graphics/inkscape/files/patch-poppler-0.69.diff | 29 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/Portfile b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3adc040..5d9e347 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup           compiler_blacklist_versions 1.0
</span> name                inkscape
 conflicts           inkscape-devel
 version             0.92.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            5
</span> license             GPL-2 LGPL-2.1
 maintainers         {devans @dbevans}
 categories          graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,8 +61,11 @@ patchfiles          patch-use-configured-perl.diff
</span> 
 # backport fixes from upstream for poppler 0.65 compatibility
 # (patches can presumably be removed on next update)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append    10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     f0697de012598ea84edafea9a326e5e101eccd2a.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    f0697de012598ea84edafea9a326e5e101eccd2a.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix for poppler 0.69
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-poppler-0.69.diff
</span> 
 post-patch {
     reinplace "s|@@MP_PERL@@|${prefix}/bin/perl${perl_version}|" ${worksrcpath}/Makefile.am
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/patch-poppler-0.69.diff b/graphics/inkscape/files/patch-poppler-0.69.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..78d7cc6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/files/patch-poppler-0.69.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig    2018-09-25 11:19:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/pdf-parser.cpp 2018-09-25 11:21:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3656,7 +3656,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Stream *PdfParser::buildImageStream() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   Object dict;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   Object obj;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  char *key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  const char *key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   Stream *str;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   // build dictionary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3674,7 +3674,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       obj.free();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-      key = copyString(obj.getName());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      key = obj.getName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(POPPLER_NEW_OBJECT_API)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       obj = parser->getObj();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3682,7 +3682,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       parser->getObj(&obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if (obj.isEOF() || obj.isError()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  gfree(key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//        gfree(key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(POPPLER_NEW_OBJECT_API)
</span></pre><pre style='margin:0'>

</pre>