<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/cdd987205b2186ae775b3aeff1e1fb2ca22c07e9">https://github.com/macports/macports-ports/commit/cdd987205b2186ae775b3aeff1e1fb2ca22c07e9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cdd987205b2186ae775b3aeff1e1fb2ca22c07e9
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Dec 4 19:54:48 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> inkscape: backport upstream poppler fixes through 0.71, rebuild
</span>---
graphics/inkscape/Portfile | 5 +-
graphics/inkscape/files/patch-poppler-0.69.diff | 389 +++++++++++++++++++++++-
graphics/inkscape/files/patch-poppler-0.71.diff | 27 ++
3 files changed, 405 insertions(+), 16 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 5d9e347..8fc6f87 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;'>@@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name inkscape
conflicts inkscape-devel
version 0.92.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> license GPL-2 LGPL-2.1
maintainers {devans @dbevans}
categories graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,6 +67,9 @@ patchfiles-append 10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3.diff \
</span> # fix for poppler 0.69
patchfiles-append patch-poppler-0.69.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# additional fix for poppler 0.71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-poppler-0.71.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@@MP_PERL@@|${prefix}/bin/perl${perl_version}|" ${worksrcpath}/Makefile.am
reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.7\"|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.69.diff b/graphics/inkscape/files/patch-poppler-0.69.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 78d7cc6..d9f9f14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/patch-poppler-0.69.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/files/patch-poppler-0.69.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +1,388 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2018-09-25 11:19:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/pdf-parser.cpp 2018-09-25 11:21:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3656,7 +3656,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 96781f5cea8af9777d87e056506b2bce660c397e 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: Fri, 28 Sep 2018 18:05:30 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: fix 1789208 poppler 0.69
</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/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c0fce14..c124405 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeScripts/DefineDependsandFlags.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeScripts/DefineDependsandFlags.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,18 +116,6 @@ if(ENABLE_POPPLER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(HAVE_POPPLER_GLIB ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_VERSION VERSION_EQUAL "0.26.0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_VERSION VERSION_EQUAL "0.29.0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_VERSION VERSION_EQUAL "0.58.0")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(POPPLER_NEW_OBJECT_API ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ENABLE_POPPLER_CAIRO OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</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 e311562..9621e30 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;'>+@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dlg->getImportSettings(prefs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Apply crop settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PDFRectangle *clipToBox = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CONST PDFRectangle *clipToBox = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double crop_setting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sp_repr_get_double(prefs, "cropTo", &crop_setting);
</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.h b/src/extension/internal/pdfinput/pdf-input.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6e36603..73bbfe2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/pdf-input.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/pdf-input.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,7 @@
</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;'>+ #ifdef HAVE_POPPLER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "poppler-transition-api.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gtkmm/dialog.h>
</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 ea9f902..4a7fd8a 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;'>+@@ -295,8 +295,8 @@ PdfParser::PdfParser(XRef *xrefA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int /*pageNum*/,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int rotate,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dict *resDict,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PDFRectangle *box,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PDFRectangle *cropBox) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CONST PDFRectangle *box,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CONST PDFRectangle *cropBox) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xref(xrefA),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ builder(builderA),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subPage(gFalse),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,7 +318,7 @@ PdfParser::PdfParser(XRef *xrefA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *ctm = state->getCTM();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *ctm = state->getCTM();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double scaledCTM[6];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < 6; ++i) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ baseMatrix[i] = ctm[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -353,7 +353,7 @@ PdfParser::PdfParser(XRef *xrefA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PdfParser::PdfParser(XRef *xrefA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Inkscape::Extension::Internal::SvgBuilder *builderA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dict *resDict,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PDFRectangle *box) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CONST PDFRectangle *box) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xref(xrefA),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ builder(builderA),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subPage(gTrue),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -572,7 +572,7 @@ const char *PdfParser::getPreviousOperator(unsigned int look_back) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PdfOperator *op;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char *name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Object *argPtr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -620,7 +620,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (this->*op->func)(argPtr, numArgs);
</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;'>+-PdfOperator* PdfParser::findOp(char *name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PdfOperator* PdfParser::findOp(const char *name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int a = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int b = numOps;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int cmp = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1752,7 +1752,7 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GBool stroke, GBool eoFill) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxShading *shading;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxPath *savedPath;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *ctm, *btm, *ptm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *ctm, *btm, *ptm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double m[6], ictm[6], m1[6];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double xMin, yMin, xMax, yMax;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double det;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1994,7 +1994,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *shading,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxColor color0M, color1M, colorM0, colorM1, colorMM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxColor colors2[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double functionColorDelta = colorDeltas[pdfFunctionShading-1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *matrix;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *matrix;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double xM, yM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nComps, i, j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2174,7 +2174,7 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading *shading) {
</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 PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxPatch patch00 = blankPatch();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxPatch patch01 = blankPatch();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxPatch patch10 = blankPatch();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2595,7 +2595,7 @@ void PdfParser::doShowText(GooString *s) {
</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;'>+- double *mat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *mat;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Object charProc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dict *resDict;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Parser *oldParser;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3669,7 +3669,6 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*numArgs*/)
</span> Stream *PdfParser::buildImageStream() {
Object dict;
Object obj;
- char *key;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *key;
</span> Stream *str;
// build dictionary
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3674,7 +3674,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3687,26 +3686,17 @@ Stream *PdfParser::buildImageStream() {
</span> obj.free();
#endif
} else {
- key = copyString(obj.getName());
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ key = obj.getName();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(POPPLER_NEW_OBJECT_API)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- obj = parser->getObj();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3682,7 +3682,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parser->getObj(&obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (obj.isEOF() || obj.isError()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(POPPLER_NEW_OBJECT_API)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- obj = parser->getObj();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- obj.free();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- parser->getObj(&obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (obj.isEOF() || obj.isError()) {
</span> - gfree(key);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+// gfree(key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Object obj2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CALL(obj2, parser->getObj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (obj2.isEOF() || obj2.isError()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_FREE(obj);
</span> break;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(POPPLER_NEW_OBJECT_API)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(POPPLER_NEW_OBJECT_API)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dict.dictAdd(key, std::move(obj));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_DICTADD(dict, obj.getName(), obj2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_FREE(obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_FREE(obj2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- obj = parser->getObj();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dict.dictAdd(key, &obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- parser->getObj(&obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CALL(obj, parser->getObj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (obj.isEOF()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error(errSyntaxError, getPos(), "End of file in inline image");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ed28274..0a04c81 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PDF_PARSER_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_POPPLER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "poppler-transition-api.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef USE_GCC_PRAGMAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma interface
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,11 +129,14 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Constructor for regular output.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Dict *resDict,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CONST PDFRectangle *box,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CONST PDFRectangle *cropBox);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Constructor for a sub-page object.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Dict *resDict, PDFRectangle *box);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Dict *resDict,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CONST PDFRectangle *box);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual ~PdfParser();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,7 +190,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void go(GBool topLevel);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void execOp(Object *cmd, Object args[], int numArgs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PdfOperator *findOp(char *name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PdfOperator *findOp(const char *name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GBool checkArg(Object *arg, TchkType type);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int getPos();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,7 +261,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double x2, double y2, GfxColor *color2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nComps, int depth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void doPatchMeshShFill(GfxPatchMeshShading *shading);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void fillPatch(GfxPatch *patch, int nComps, int depth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void doEndPath();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // path clipping operators
</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;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..898e64b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</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;'>+@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef SEEN_POPPLER_TRANSITION_API_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SEEN_POPPLER_TRANSITION_API_H
</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,70,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_CONST 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
</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,69,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(key, std::move(obj))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif POPPLER_CHECK_VERSION(0,58,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), std::move(obj))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), &obj)
</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,58,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POPPLER_NEW_OBJECT_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_FREE(obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_CALL(ret, func) (ret = func())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_CALL_ARGS(ret, func, ...) (ret = func(__VA_ARGS__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_FREE(obj) (obj).free()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_CALL(ret, func) (*func(&ret))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _POPPLER_CALL_ARGS(ret, func, ...) (*func(__VA_ARGS__, &ret))
</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, 29, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
</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, 25, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POPPLER_EVEN_NEWER_COLOR_SPACE_API
</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;'>++#endif
</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 767c8af..d449d1a 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;'>+@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( pattern != NULL ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( pattern->getType() == 2 ) { // Shading pattern
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *ptm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *ptm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double m[6] = {1, 0, 0, 1, 0, 0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double det;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Set pattern transform matrix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *p2u = tiling_pattern->getMatrix();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *p2u = tiling_pattern->getMatrix();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double m[6] = {1, 0, 0, 1, 0, 0};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double det;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2]; // see LP Bug 1168908
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pattern_node->setAttribute("patternUnits", "userSpaceOnUse");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Set pattern tiling
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: don't ignore XStep and YStep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *bbox = tiling_pattern->getBBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *bbox = tiling_pattern->getBBox();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sp_repr_set_svg_double(pattern_node, "x", 0.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sp_repr_set_svg_double(pattern_node, "y", 0.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Inkscape::XML::Node *gradient;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Function *func;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CONST Function *func;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int num_funcs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool extend0, extend1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxShading *shading, double offset, GfxRGB *re
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INT_EPSILON 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Function *func) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CONST Function *func) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int type = func->getType();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( type == 0 || type == 2 ) { // Sampled or exponential function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxRGB stop1, stop2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _addStopToGradient(gradient, 1.0, &stop2, 1.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if ( type == 3 ) { // Stitching
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- StitchingFunction *stitchingFunc = static_cast<StitchingFunction*>(func);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *bounds = stitchingFunc->getBounds();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *encode = stitchingFunc->getEncode();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *bounds = stitchingFunc->getBounds();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *encode = stitchingFunc->getEncode();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int num_funcs = stitchingFunc->getNumFuncs();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Add stops from all the stitched functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svgGetShadingColorRGB(shading, bounds[i + 1], &color);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Add stops
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double expE = (static_cast<ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (expE > 1.0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (encode[2*i] == 0) { // normal sequence
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Inkscape::CSSOStringStream os_font_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double css_font_size = _font_scaling * state->getFontSize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( font->getType() == fontType3 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *font_matrix = font->getFontMatrix();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *font_matrix = font->getFontMatrix();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( font_matrix[0] != 0.0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ css_font_size *= font_matrix[3] / font_matrix[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(double tx, double ty) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void SvgBuilder::updateTextMatrix(GfxState *state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _flushText();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Update text matrix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double *text_matrix = state->getTextMat();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const double *text_matrix = state->getTextMat();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double max_scale;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 55daace..34b42e1 100644
</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;'>++++ src/extension/internal/pdfinput/svg-builder.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,7 @@
</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;'>+ #ifdef HAVE_POPPLER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "poppler-transition-api.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class SPDocument;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace Inkscape {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,7 +175,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void _addStopToGradient(Inkscape::XML::Node *gradient, double offset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxRGB *color, double opacity);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Function *func);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _POPPLER_CONST Function *func);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool is_stroke=false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Image/mask creation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.10.2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/patch-poppler-0.71.diff b/graphics/inkscape/files/patch-poppler-0.71.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2b2a1d8
</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.71.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4e014550a5d4c575a5d70cc9b37b7791d7c951d5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Lars Wendler <polynomial-c@gentoo.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 7 Nov 2018 16:36:22 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Fix build with poppler-0.71.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix blatantly backported from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://launchpadlibrarian.net/396085203/inkscape-poppler-v071.patch
</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/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6ed911b..4437052 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,71,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef bool GBool;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define gTrue true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define gFalse false
</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,70,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _POPPLER_CONST const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.10.2
</span></pre><pre style='margin:0'>
</pre>