<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/504ce25d5a6f9fe62b41892d2d2581e27665ab75">https://github.com/macports/macports-ports/commit/504ce25d5a6f9fe62b41892d2d2581e27665ab75</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 504ce25 inkscape: apply upstream patch for poppler 0.83.0 compatibility, rebuild
</span>504ce25 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 504ce25d5a6f9fe62b41892d2d2581e27665ab75
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Dec 1 17:16:04 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> inkscape: apply upstream patch for poppler 0.83.0 compatibility, rebuild
</span>---
graphics/inkscape/Portfile | 5 +-
graphics/inkscape/files/patch-poppler-0.83.diff | 105 ++++++++++++++++++++++++
2 files changed, 108 insertions(+), 2 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 5297a78..7d9e922 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;'>@@ -9,7 +9,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 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 11
</span> license GPL-2 LGPL-2.1
maintainers {devans @dbevans}
categories graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +65,8 @@ depends_lib-append port:desktop-file-utils \
</span> port:py${python_version}-numpy
patchfiles patch-poppler-0.76.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-poppler-0.82.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-poppler-0.82.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-poppler-0.83.diff
</span>
post-patch {
reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python${python_major}.${python_minor}\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/patch-poppler-0.83.diff b/graphics/inkscape/files/patch-poppler-0.83.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e8f56f6
</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.83.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,105 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b5360a807b12d4e8318475ffd0464b84882788b5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jan Tojnar <jtojnar@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 3 Dec 2019 00:17:05 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix build with Poppler 0.83.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit 51351358a62acb6887eab49bc0dc4a7a3d18c17a)
</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-input.cpp | 6 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../internal/pdfinput/poppler-transition-api.h | 12 ++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/extension/internal/pdfinput/svg-builder.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 19 insertions(+), 7 deletions(-)
</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-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9621e306a0..7027b7e642 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/pdf-input.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/pdf-input.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -689,12 +689,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (poppler_datadir != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- globalParams = new GlobalParams(poppler_datadir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- globalParams = new GlobalParams();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- globalParams = new GlobalParams();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // ENABLE_OSX_APP_LOCATIONS
</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;'>+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 e71bb79381..2ff448828d 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;'>+@@ -272,7 +272,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClipHistoryEntry *save();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ClipHistoryEntry *restore();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GBool hasSaves() { return saved != NULL; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxPath *getClipPath() { return clipPath; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxClipType getClipType() { return clipType; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3394,7 +3394,7 @@ ClipHistoryEntry::~ClipHistoryEntry()
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void ClipHistoryEntry::setClip(_POPPLER_CONST_83 GfxPath *clipPathA, GfxClipType clipTypeA) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Free previous clip path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clipPath) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete clipPath;
</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 93c0f99ba1..1118c0849f 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,12 @@
</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, 83, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_CONST_83 const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_CONST_83
</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;'>+ #if POPPLER_CHECK_VERSION(0, 82, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _POPPLER_CONST_82 const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +21,12 @@
</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;'>++#if POPPLER_CHECK_VERSION(0, 83, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_NEW_GLOBAL_PARAMS(args...) std::unique_ptr<GlobalParams>(new GlobalParams(args))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_NEW_GLOBAL_PARAMS(args...) new GlobalParams(args)
</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;'>+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ea2940ffe1..6454089134 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -264,10 +264,10 @@ static void svgSetTransform(Inkscape::XML::Node *node, double c0, double c1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * \brief Generates a SVG path string from poppler's data structure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static gchar *svgInterpretPath(GfxPath *path) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static gchar *svgInterpretPath(_POPPLER_CONST_83 GfxPath *path) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Inkscape::SVG::PathString pathString;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GfxSubpath *subpath = path->getSubpath(i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CONST_83 GfxSubpath *subpath = path->getSubpath(i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (subpath->getNumPoints() > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pathString.moveTo(subpath->getX(0), subpath->getY(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int j = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.22.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>