<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/66fa0e0401b9f7fdbf5db43789fbca7986d4efa5">https://github.com/macports/macports-ports/commit/66fa0e0401b9f7fdbf5db43789fbca7986d4efa5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 66fa0e0  inkscape: rebuild with poppler 0.76.0
</span>66fa0e0 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 66fa0e0401b9f7fdbf5db43789fbca7986d4efa5
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Apr 30 12:57:38 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    inkscape: rebuild with poppler 0.76.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Apply upstream build fix.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/58415
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/58416
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/58417
</span>---
 graphics/inkscape/Portfile                      |  4 ++-
 graphics/inkscape/files/patch-poppler-0.76.diff | 44 +++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

<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 72e6881..288277d 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;'>@@ -10,7 +10,7 @@ cmake.generator     Ninja
</span> name                inkscape
 conflicts           inkscape-devel inkscape-gtk3-devel
 version             0.92.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            3
</span> license             GPL-2 LGPL-2.1
 maintainers         {devans @dbevans}
 categories          graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +65,8 @@ depends_lib-append  port:desktop-file-utils \
</span>                     port:py${python_version}-lxml \
                     port:py${python_version}-numpy
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-poppler-0.76.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
     reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python${python_major}.${python_minor}\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
     reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/patch-poppler-0.76.diff b/graphics/inkscape/files/patch-poppler-0.76.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d9c23a8
</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.76.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Marc Jeanmougin <marc@jeanmougin.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 24 Apr 2019 14:11:26 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Tentative fix for poppler 0.76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 8 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2981d6ee51..ddbff7671f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   error(errInternal, -1, "Weird page contents");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  parser = new Parser(xref, new Lexer(xref, obj), gFalse);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  parser = new _POPPLER_NEW_PARSER(xref, obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   go(topLevel);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   delete parser;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   parser = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6e4dde7dee..21a60702fa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/poppler-transition-api.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/poppler-transition-api.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib/poppler-features.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_CHECK_VERSION(0, 76, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if POPPLER_CHECK_VERSION(0, 72, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define getCString c_str
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.18.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>

</pre>