<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/e9190ffc4b25db362b17949773171b1d37963be9">https://github.com/macports/macports-ports/commit/e9190ffc4b25db362b17949773171b1d37963be9</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 e9190ff inkscape: build fix for poppler 0.82.0
</span>e9190ff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e9190ffc4b25db362b17949773171b1d37963be9
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Oct 26 08:54:51 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> inkscape: build fix for poppler 0.82.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * backport patch from upstream git master
</span><span style='display:block; white-space:pre;color:#404040;'> * retire cxx11 PortGroup
</span>---
graphics/inkscape/Portfile | 9 ++--
graphics/inkscape/files/patch-poppler-0.82.diff | 71 +++++++++++++++++++++++++
2 files changed, 77 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 0993906..ad5ea1e 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;'>@@ -2,7 +2,6 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span> PortGroup cmake 1.1
cmake.generator Ninja
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,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 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 9
</span> license GPL-2 LGPL-2.1
maintainers {devans @dbevans}
categories graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +64,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:#ffe0e0;'>-patchfiles patch-poppler-0.76.diff
</span><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;'>+ patch-poppler-0.82.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;background:#e0e0e0;'>@@ -78,6 +78,9 @@ post-patch {
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# dependencies require C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # clang-425.0.28 cannot handle glibmm's headers
# allow build with more modern gcc on 10.5 and earlier
compiler.blacklist-append {clang < 500} *gcc-3.* *gcc-4.*
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/patch-poppler-0.82.diff b/graphics/inkscape/files/patch-poppler-0.82.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9168442
</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.82.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,71 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 324c7903d9fd62e74c042c31477299be3b980fd2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Thomas Holder <thomas@thomas-holder.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 26 Oct 2019 14:39:31 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] fix poppler 0.82.0 build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Unicode _POPPLER_CONST_82 *u = nullptr;---
</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 | 6 ++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/extension/internal/pdfinput/svg-builder.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/extension/internal/pdfinput/svg-builder.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 9 insertions(+), 3 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-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4f798e35bf..4eae275757 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;'>+@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int wMode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double riseX, riseY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CharCode code;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Unicode *u = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Unicode _POPPLER_CONST_82 *u = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double x, y, dx, dy, tdx, tdy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double originX, originY, tOriginX, tOriginY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double oldCTM[6], newCTM[6];
</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 5e8bc4ae90..01834007e8 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, 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;'>++#define _POPPLER_CONST_82
</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, 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;'>+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 14727eba5f..a7134684a0 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;'>+@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void SvgBuilder::addChar(GfxState *state, double x, double y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double dx, double dy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double originX, double originY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) {
</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;'>+ bool is_space = ( uLen == 1 && u[0] == 32 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+index 34b42e1..78e3020 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/svg-builder.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/svg-builder.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,7 +141,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void addChar(GfxState *state, double x, double y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double dx, double dy,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double originX, double originY,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CharCode code, int nBytes, Unicode *u, int uLen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CharCode code, int nBytes, Unicode const *u, int uLen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void beginTextObject(GfxState *state);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void endTextObject(GfxState *state);
</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;'>+2.22.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>