<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/3bee8913e19dd6716a0fe2a90792316fbe875491">https://github.com/macports/macports-ports/commit/3bee8913e19dd6716a0fe2a90792316fbe875491</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 3bee891 inkscape-devel: update to version 0.92.4 branch 0.92.x as of 20191120
</span>3bee891 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3bee8913e19dd6716a0fe2a90792316fbe875491
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Dec 1 21:06:43 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> inkscape-devel: update to version 0.92.4 branch 0.92.x as of 20191120
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix for libpoppler 0.82.0 compatibility now encorporated upstream.
</span>---
graphics/inkscape-devel/Portfile | 7 +--
.../inkscape-devel/files/patch-poppler-0.82.diff | 71 ----------------------
2 files changed, 2 insertions(+), 76 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape-devel/Portfile b/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 75fa096..80953bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,9 @@ cmake.generator Ninja
</span> name inkscape-devel
conflicts inkscape inkscape-gtk3-devel
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit 39435a2e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20190925
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit 835b6bb6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20191120
</span> version 0.92.4-${git_date}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> license GPL-2 LGPL-2.1
maintainers {devans @dbevans}
categories graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,8 +62,6 @@ 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:#ffe0e0;'>-patchfiles patch-poppler-0.82.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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-devel/files/patch-poppler-0.82.diff b/graphics/inkscape-devel/files/patch-poppler-0.82.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9168442..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape-devel/files/patch-poppler-0.82.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,71 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 324c7903d9fd62e74c042c31477299be3b980fd2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Thomas Holder <thomas@thomas-holder.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 26 Oct 2019 14:39:31 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] fix poppler 0.82.0 build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Unicode _POPPLER_CONST_82 *u = nullptr;---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/extension/internal/pdfinput/pdf-parser.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/extension/internal/pdfinput/svg-builder.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/extension/internal/pdfinput/svg-builder.h | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 9 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 4f798e35bf..4eae275757 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int wMode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double riseX, riseY;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CharCode code;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Unicode *u = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Unicode _POPPLER_CONST_82 *u = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double x, y, dx, dy, tdx, tdy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double originX, originY, tOriginX, tOriginY;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double oldCTM[6], newCTM[6];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 5e8bc4ae90..01834007e8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/poppler-transition-api.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/poppler-transition-api.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glib/poppler-features.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if POPPLER_CHECK_VERSION(0, 82, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_CONST_82 const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_CONST_82
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if POPPLER_CHECK_VERSION(0, 76, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 14727eba5f..a7134684a0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *state) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void SvgBuilder::addChar(GfxState *state, double x, double y,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double dx, double dy,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double originX, double originY,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool is_space = ( uLen == 1 && u[0] == 32 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/extension/internal/pdfinput/svg-builder.h.orig b/src/extension/internal/pdfinput/svg-builder.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 34b42e1..78e3020 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/svg-builder.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/svg-builder.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,7 +141,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void addChar(GfxState *state, double x, double y,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double dx, double dy,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double originX, double originY,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CharCode code, int nBytes, Unicode *u, int uLen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CharCode code, int nBytes, Unicode const *u, int uLen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void beginTextObject(GfxState *state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void endTextObject(GfxState *state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.22.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>