<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/a5a9cd861f343e519e26b3cc5160f04b38468165">https://github.com/macports/macports-ports/commit/a5a9cd861f343e519e26b3cc5160f04b38468165</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a5a9cd861f343e519e26b3cc5160f04b38468165
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Apr 29 17:47:10 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> inkscape: update to version 0.9.25
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * building against libpoppler 0.88.0
</span><span style='display:block; white-space:pre;color:#404040;'> * python extensions will now run using python38
</span>---
graphics/inkscape/Portfile | 22 ++---
graphics/inkscape/files/patch-poppler-0.76.diff | 44 ----------
graphics/inkscape/files/patch-poppler-0.82.diff | 71 ----------------
graphics/inkscape/files/patch-poppler-0.83.diff | 105 ------------------------
4 files changed, 8 insertions(+), 234 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 a96c32c..8a009b8 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;'>@@ -8,8 +8,8 @@ cmake.generator Ninja
</span>
name inkscape
conflicts inkscape-devel inkscape-gtk3-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.92.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.92.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license GPL-2 LGPL-2.1
maintainers {devans @dbevans}
categories graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,18 +22,16 @@ long_description Inkscape is an multi-platform, Open-Source Vector Graphics E
</span> ${description}
homepage https://inkscape.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://inkscape.org/en/gallery/item/13330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://inkscape.org/en/gallery/item/18051
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${distname}_A6N0YOn${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 360feade19ee48dd081bb43df68189717a63267b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 81ee7f69e2bd64a97343d8395a4a7a7905b21b861566ed5e5d9179178d519a0b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32175410
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 18a998ed050030a6c89621f47e2e11b69d9f151b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 57ec2da8177b36614a513e2822efd73af721e690f7ddc6bd0a5fbb1525b4515e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 31929728
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_major 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_minor 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_major 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_minor 8
</span> set python_version ${python_major}${python_minor}
# this port only uses boost headers during build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,10 +65,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.76.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-poppler-0.82.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-poppler-0.83.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/files/patch-poppler-0.76.diff b/graphics/inkscape/files/patch-poppler-0.76.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d9c23a8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/patch-poppler-0.76.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Marc Jeanmougin <marc@jeanmougin.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 24 Apr 2019 14:11:26 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Tentative fix for poppler 0.76
</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;'>- 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 | 7 +++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 8 insertions(+), 1 deletion(-)
</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 2981d6ee51..ddbff7671f 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;'>-@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error(errInternal, -1, "Weird page contents");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- parser = new Parser(xref, new Lexer(xref, obj), gFalse);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ parser = new _POPPLER_NEW_PARSER(xref, obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- go(topLevel);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete parser;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parser = NULL;
</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 6e4dde7dee..21a60702fa 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,13 @@
</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, 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;'>-+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
</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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if POPPLER_CHECK_VERSION(0, 72, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define getCString c_str
</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;'>-2.18.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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>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/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><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e8f56f6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/patch-poppler-0.83.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,105 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b5360a807b12d4e8318475ffd0464b84882788b5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jan Tojnar <jtojnar@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 3 Dec 2019 00:17:05 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix build with Poppler 0.83.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(cherry picked from commit 51351358a62acb6887eab49bc0dc4a7a3d18c17a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/extension/internal/pdfinput/pdf-input.cpp | 6 +++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .../internal/pdfinput/poppler-transition-api.h | 12 ++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/extension/internal/pdfinput/svg-builder.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 19 insertions(+), 7 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-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9621e306a0..7027b7e642 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/pdf-input.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/pdf-input.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -689,12 +689,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (poppler_datadir != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- globalParams = new GlobalParams(poppler_datadir);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- globalParams = new GlobalParams();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- globalParams = new GlobalParams();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // ENABLE_OSX_APP_LOCATIONS
</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;'>-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 e71bb79381..2ff448828d 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;'>-@@ -272,7 +272,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ClipHistoryEntry *save();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ClipHistoryEntry *restore();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GBool hasSaves() { return saved != NULL; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxPath *getClipPath() { return clipPath; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxClipType getClipType() { return clipType; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3394,7 +3394,7 @@ ClipHistoryEntry::~ClipHistoryEntry()
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void ClipHistoryEntry::setClip(_POPPLER_CONST_83 GfxPath *clipPathA, GfxClipType clipTypeA) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Free previous clip path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (clipPath) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete clipPath;
</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 93c0f99ba1..1118c0849f 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, 83, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_CONST_83 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_83
</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, 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;'>-@@ -15,6 +21,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
</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, 83, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) std::unique_ptr<GlobalParams>(new GlobalParams(args))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_NEW_GLOBAL_PARAMS(args...) new GlobalParams(args)
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if POPPLER_CHECK_VERSION(0, 72, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define getCString c_str
</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 ea2940ffe1..6454089134 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;'>-@@ -264,10 +264,10 @@ static void svgSetTransform(Inkscape::XML::Node *node, double c0, double c1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * \brief Generates a SVG path string from poppler's data structure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static gchar *svgInterpretPath(GfxPath *path) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static gchar *svgInterpretPath(_POPPLER_CONST_83 GfxPath *path) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Inkscape::SVG::PathString pathString;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GfxSubpath *subpath = path->getSubpath(i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CONST_83 GfxSubpath *subpath = path->getSubpath(i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (subpath->getNumPoints() > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pathString.moveTo(subpath->getX(0), subpath->getY(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int j = 1;
</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>