<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/614879abeef2c4a07dfad26e6bb5768f4a125dfd">https://github.com/macports/macports-ports/commit/614879abeef2c4a07dfad26e6bb5768f4a125dfd</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 614879a inkscape: update to version 0.92.4
</span>614879a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 614879abeef2c4a07dfad26e6bb5768f4a125dfd
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Jan 17 22:42:29 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> inkscape: update to version 0.92.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * now uses preferred cmake/ninja build
</span><span style='display:block; white-space:pre;color:#404040;'> * switch to cmake fixes display of version in Help/About
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/56806
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/56867
</span>---
graphics/inkscape/Portfile | 90 ++---
.../10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3.diff | 14 -
.../f0697de012598ea84edafea9a326e5e101eccd2a.diff | 105 ------
graphics/inkscape/files/patch-openmp_test.diff | 17 -
graphics/inkscape/files/patch-poppler-0.69.diff | 388 ---------------------
graphics/inkscape/files/patch-poppler-0.71.diff | 27 --
graphics/inkscape/files/patch-poppler-0.72.diff | 35 --
.../inkscape/files/patch-use-configured-perl.diff | 45 ---
8 files changed, 27 insertions(+), 694 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 c65f753..d425dbb 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;'>@@ -3,11 +3,13 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.generator Ninja
</span>
name inkscape
conflicts inkscape-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.92.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.92.4
</span> license GPL-2 LGPL-2.1
maintainers {devans @dbevans}
categories graphics gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,24 +22,27 @@ long_description Inkscape is an multi-platform, Open-Source Vector Graphics E
</span> ${description}
homepage http://www.inkscape.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://inkscape.org/en/gallery/item/12187
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://inkscape.org/en/gallery/item/13330
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 95648c6b491e09920662e03a51f2278a0ff10392 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 063296c05a65d7a92a0f627485b66221487acfc64a24f712eb5237c4bd7816b2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 31606442
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${distname}_A6N0YOn${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 18a998ed050030a6c89621f47e2e11b69d9f151b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 57ec2da8177b36614a513e2822efd73af721e690f7ddc6bd0a5fbb1525b4515e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 31929728
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set perl_version 5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_major 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_minor 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version ${python_major}${python_minor}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:libtool \
port:intltool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl${perl_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtest
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:desktop-file-utils \
</span> port:popt \
port:boehmgc \
port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,70 +60,29 @@ depends_lib port:desktop-file-utils \
</span> port:aspell \
port:gtkspell2 \
port:potrace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-lxml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-use-configured-perl.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# backport fixes from upstream for poppler 0.65 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (patches can presumably be removed on next update)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f0697de012598ea84edafea9a326e5e101eccd2a.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix for poppler 0.69
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-poppler-0.69.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# additional fix for poppler 0.71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-poppler-0.71.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix for API change in poppler 0.72
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-poppler-0.72.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/57744
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-openmp_test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-lxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-numpy
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MP_PERL@@|${prefix}/bin/perl${perl_version}|" ${worksrcpath}/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.7\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python${python_major}.${python_minor}\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
</span> reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|lib/inkscape|lib|" ${worksrcpath}/src/CMakeLists.txt
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# py27-numpy is currently not universal (#48263).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# py-numpy is currently not universal (#48263).
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# on Sierra, building with clang optimization enabled causes crash at startup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# issue affects both +x11 and +quartz builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 15} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.optflags -O0
</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> # clang-425.0.28 cannot handle glibmm's headers
compiler.blacklist-append {clang < 500} gcc-4.0 *gcc-4.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh && ./configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --without-gnome-vfs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-lcms \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-poppler-cairo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-dbusapi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-openmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-strict-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_DBUS:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_GNOME_VFS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_OPENMP=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${worksrcpath}/src/extension/script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant strict description {Enable strict build} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-strict-build --enable-strict-build
</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> # the following dummy variants are used
# to identify this port's binary dependencies
# based on which variant of gtkmm is used for the build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3.diff b/graphics/inkscape/files/10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 809d955..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/extension/internal/pdfinput/pdf-parser.cpp src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 721524e10afcb9979fbbab5292ac9f973f316412..a3aa3213a1c39df80f3e41e0932f4c7bfc683af7 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;'>-@@ -37,8 +37,7 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "util/units.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "goo/gmem.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "goo/GooTimer.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "goo/GooHash.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "goo/GooString.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "GlobalParams.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "CharTypes.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Object.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/f0697de012598ea84edafea9a326e5e101eccd2a.diff b/graphics/inkscape/files/f0697de012598ea84edafea9a326e5e101eccd2a.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fb98816..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/f0697de012598ea84edafea9a326e5e101eccd2a.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;'>-diff --git src/extension/internal/pdfinput/pdf-parser.cpp src/extension/internal/pdfinput/pdf-parser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 604b7f80795ff10cce26b2581ba961f4dd4a0750..721524e10afcb9979fbbab5292ac9f973f316412 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;'>-@@ -2582,7 +2582,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
</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 PdfParser::doShowText(GooString *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void PdfParser::doShowText(const GooString *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxFont *font;
</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;'>-@@ -2601,7 +2601,7 @@ void PdfParser::doShowText(GooString *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- font = state->getFont();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wMode = font->getWMode();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- builder->beginString(state, s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ builder->beginString(state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // handle a Type 3 char
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2631,7 +2631,7 @@ void PdfParser::doShowText(GooString *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double lineX = state->getLineX();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double lineY = state->getLineY();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- oldParser = parser;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p = s->getCString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p = g_strdup(s->getCString());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- len = s->getLength();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (len > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- n = font->getNextChar(p, len, &code,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2686,7 +2686,7 @@ void PdfParser::doShowText(GooString *s) {
</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;'>- state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p = s->getCString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p = g_strdup(s->getCString());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- len = s->getLength();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (len > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- n = font->getNextChar(p, len, &code,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2732,7 +2732,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Object obj1, obj2, obj3, refObj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *name = args[0].getName();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *name = g_strdup(args[0].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;'>- if ((obj1 = res->lookupXObject(name)).isNull()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/extension/internal/pdfinput/pdf-parser.h src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e28fecc2e155af155d3e84205bb28d269cdda6be..f985b15cad7aa4354d0108127ecedaebb95ea540 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -287,7 +287,7 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void opMoveShowText(Object args[], int numArgs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void opMoveSetShowText(Object args[], int numArgs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void opShowSpaceText(Object args[], int numArgs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void doShowText(GooString *s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void doShowText(const GooString *s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // XObject operators
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void opXObject(Object args[], int numArgs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/extension/internal/pdfinput/svg-builder.cpp src/extension/internal/pdfinput/svg-builder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a448be639761b81a62aa5b95482f11e6c54045fd..617861928d964a66e88a43666905bab5c9e7ef10 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;'>-@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *state) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxFont *font = state->getFont();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Store original name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (font->getName()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _font_specification = font->getName()->getCString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _font_specification = g_strdup(font->getName()->getCString());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _font_specification = (char*) "Arial";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1361,7 +1361,7 @@ void SvgBuilder::_flushText() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _glyphs.clear();
</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 SvgBuilder::beginString(GfxState *state, GooString * /*s*/) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void SvgBuilder::beginString(GfxState *state) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (_need_font_update) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- updateFont(state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/extension/internal/pdfinput/svg-builder.h src/extension/internal/pdfinput/svg-builder.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ad15c9c06fecba95ada6b7beb4184be2456a95a8..ed2a4d48e07b3ee4cd8a4b88c0ea4a685c2ff5b5 100644
</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;'>-+++ src/extension/internal/pdfinput/svg-builder.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,6 @@ namespace Inkscape {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <glibmm/ustring.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "CharTypes.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--class GooString;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Function;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class GfxState;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct GfxColor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,7 +135,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void clearSoftMask(GfxState *state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Text handling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void beginString(GfxState *state, GooString *s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void beginString(GfxState *state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void endString(GfxState *state);
</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;color:#808080;'>diff --git a/graphics/inkscape/files/patch-openmp_test.diff b/graphics/inkscape/files/patch-openmp_test.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 25f2e0e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/patch-openmp_test.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2018-03-11 13:38:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2018-12-07 14:19:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,12 +201,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Check for OpenMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ******************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_OPENMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_prog_cxx_openmp" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openmp_ok=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl We have it, now set up the flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ********************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Check for libpotrace
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d9f9f14..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,388 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 96781f5cea8af9777d87e056506b2bce660c397e 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: Fri, 28 Sep 2018 18:05:30 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: fix 1789208 poppler 0.69
</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/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c0fce14..c124405 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeScripts/DefineDependsandFlags.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeScripts/DefineDependsandFlags.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,18 +116,6 @@ if(ENABLE_POPPLER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(HAVE_POPPLER_GLIB ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_VERSION VERSION_EQUAL "0.26.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_VERSION VERSION_EQUAL "0.29.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_VERSION VERSION_EQUAL "0.58.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(POPPLER_NEW_OBJECT_API ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(ENABLE_POPPLER_CAIRO OFF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</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 e311562..9621e30 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;'>-@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dlg->getImportSettings(prefs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Apply crop settings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PDFRectangle *clipToBox = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CONST PDFRectangle *clipToBox = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double crop_setting;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sp_repr_get_double(prefs, "cropTo", &crop_setting);
</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.h b/src/extension/internal/pdfinput/pdf-input.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6e36603..73bbfe2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/pdf-input.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/pdf-input.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,6 +15,7 @@
</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;'>- #ifdef HAVE_POPPLER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "poppler-transition-api.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gtkmm/dialog.h>
</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 ea9f902..4a7fd8a 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;'>-@@ -295,8 +295,8 @@ PdfParser::PdfParser(XRef *xrefA,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int /*pageNum*/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int rotate,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Dict *resDict,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PDFRectangle *box,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PDFRectangle *cropBox) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CONST PDFRectangle *box,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CONST PDFRectangle *cropBox) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xref(xrefA),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builder(builderA),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subPage(gFalse),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -318,7 +318,7 @@ PdfParser::PdfParser(XRef *xrefA,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double *ctm = state->getCTM();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const double *ctm = state->getCTM();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double scaledCTM[6];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0; i < 6; ++i) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- baseMatrix[i] = ctm[i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -353,7 +353,7 @@ PdfParser::PdfParser(XRef *xrefA,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PdfParser::PdfParser(XRef *xrefA,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Inkscape::Extension::Internal::SvgBuilder *builderA,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Dict *resDict,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PDFRectangle *box) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CONST PDFRectangle *box) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xref(xrefA),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builder(builderA),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subPage(gTrue),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -572,7 +572,7 @@ const char *PdfParser::getPreviousOperator(unsigned int look_back) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PdfOperator *op;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Object *argPtr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -620,7 +620,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (this->*op->func)(argPtr, numArgs);
</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;'>--PdfOperator* PdfParser::findOp(char *name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PdfOperator* PdfParser::findOp(const char *name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int a = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int b = numOps;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int cmp = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1752,7 +1752,7 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GBool stroke, GBool eoFill) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxShading *shading;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxPath *savedPath;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double *ctm, *btm, *ptm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const double *ctm, *btm, *ptm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double m[6], ictm[6], m1[6];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double xMin, yMin, xMax, yMax;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double det;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1994,7 +1994,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *shading,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxColor color0M, color1M, colorM0, colorM1, colorMM;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxColor colors2[4];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double functionColorDelta = colorDeltas[pdfFunctionShading-1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double *matrix;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const double *matrix;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double xM, yM;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int nComps, i, j;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2174,7 +2174,7 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading *shading) {
</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 PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxPatch patch00 = blankPatch();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxPatch patch01 = blankPatch();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxPatch patch10 = blankPatch();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2595,7 +2595,7 @@ void PdfParser::doShowText(GooString *s) {
</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;'>-- double *mat;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const double *mat;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Object charProc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Dict *resDict;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Parser *oldParser;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3669,7 +3669,6 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*numArgs*/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Stream *PdfParser::buildImageStream() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Object dict;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Object obj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *key;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Stream *str;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // build dictionary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3687,26 +3686,17 @@ Stream *PdfParser::buildImageStream() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- obj.free();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- key = copyString(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;'>-- obj.free();
</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:#ffe0e0;'>-- gfree(key);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Object obj2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CALL(obj2, parser->getObj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (obj2.isEOF() || obj2.isError()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_FREE(obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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;'>-- dict.dictAdd(key, std::move(obj));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_DICTADD(dict, obj.getName(), obj2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_FREE(obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_FREE(obj2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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;'>-- dict.dictAdd(key, &obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</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;'>-+ _POPPLER_CALL(obj, parser->getObj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (obj.isEOF()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error(errSyntaxError, getPos(), "End of file in inline image");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index ed28274..0a04c81 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,6 +9,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PDF_PARSER_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_POPPLER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "poppler-transition-api.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_GCC_PRAGMAS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma interface
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,11 +129,14 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Constructor for regular output.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Dict *resDict,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CONST PDFRectangle *box,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CONST PDFRectangle *cropBox);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Constructor for a sub-page object.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Dict *resDict, PDFRectangle *box);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Dict *resDict,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CONST PDFRectangle *box);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual ~PdfParser();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,7 +190,7 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void go(GBool topLevel);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void execOp(Object *cmd, Object args[], int numArgs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PdfOperator *findOp(char *name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PdfOperator *findOp(const char *name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GBool checkArg(Object *arg, TchkType type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int getPos();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -257,7 +261,7 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double x2, double y2, GfxColor *color2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int nComps, int depth);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void doPatchMeshShFill(GfxPatchMeshShading *shading);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void fillPatch(GfxPatch *patch, int nComps, int depth);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void doEndPath();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // path clipping operators
</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;'>-new file mode 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..898e64b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</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;'>-@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef SEEN_POPPLER_TRANSITION_API_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SEEN_POPPLER_TRANSITION_API_H
</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,70,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_CONST 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
</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,69,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(key, std::move(obj))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif POPPLER_CHECK_VERSION(0,58,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), std::move(obj))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), &obj)
</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,58,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POPPLER_NEW_OBJECT_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_FREE(obj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_CALL(ret, func) (ret = func())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_CALL_ARGS(ret, func, ...) (ret = func(__VA_ARGS__))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_FREE(obj) (obj).free()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_CALL(ret, func) (*func(&ret))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POPPLER_CALL_ARGS(ret, func, ...) (*func(__VA_ARGS__, &ret))
</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, 29, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
</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, 25, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define POPPLER_EVEN_NEWER_COLOR_SPACE_API
</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;'>-+#endif
</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 767c8af..d449d1a 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;'>-@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( pattern != NULL ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( pattern->getType() == 2 ) { // Shading pattern
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double *ptm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const double *ptm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double m[6] = {1, 0, 0, 1, 0, 0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double det;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Set pattern transform matrix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double *p2u = tiling_pattern->getMatrix();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const double *p2u = tiling_pattern->getMatrix();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double m[6] = {1, 0, 0, 1, 0, 0};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double det;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2]; // see LP Bug 1168908
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pattern_node->setAttribute("patternUnits", "userSpaceOnUse");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Set pattern tiling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // FIXME: don't ignore XStep and YStep
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double *bbox = tiling_pattern->getBBox();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const double *bbox = tiling_pattern->getBBox();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sp_repr_set_svg_double(pattern_node, "x", 0.0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sp_repr_set_svg_double(pattern_node, "y", 0.0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Inkscape::XML::Node *gradient;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Function *func;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CONST Function *func;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int num_funcs;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool extend0, extend1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxShading *shading, double offset, GfxRGB *re
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define INT_EPSILON 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Function *func) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CONST Function *func) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int type = func->getType();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( type == 0 || type == 2 ) { // Sampled or exponential function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxRGB stop1, stop2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _addStopToGradient(gradient, 1.0, &stop2, 1.0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if ( type == 3 ) { // Stitching
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- StitchingFunction *stitchingFunc = static_cast<StitchingFunction*>(func);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double *bounds = stitchingFunc->getBounds();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double *encode = stitchingFunc->getEncode();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const double *bounds = stitchingFunc->getBounds();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const double *encode = stitchingFunc->getEncode();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int num_funcs = stitchingFunc->getNumFuncs();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Add stops from all the stitched functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- svgGetShadingColorRGB(shading, bounds[i + 1], &color);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Add stops
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double expE = (static_cast<ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (expE > 1.0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- if (encode[2*i] == 0) { // normal sequence
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *state) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Inkscape::CSSOStringStream os_font_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double css_font_size = _font_scaling * state->getFontSize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( font->getType() == fontType3 ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double *font_matrix = font->getFontMatrix();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const double *font_matrix = font->getFontMatrix();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( font_matrix[0] != 0.0 ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- css_font_size *= font_matrix[3] / font_matrix[0];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(double tx, double ty) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void SvgBuilder::updateTextMatrix(GfxState *state) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _flushText();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Update text matrix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double *text_matrix = state->getTextMat();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const double *text_matrix = state->getTextMat();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- 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:#ffe0e0;'>- double max_scale;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 55daace..34b42e1 100644
</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;'>-+++ src/extension/internal/pdfinput/svg-builder.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,6 +15,7 @@
</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;'>- #ifdef HAVE_POPPLER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "poppler-transition-api.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class SPDocument;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace Inkscape {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -174,7 +175,7 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void _addStopToGradient(Inkscape::XML::Node *gradient, double offset,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GfxRGB *color, double opacity);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Function *func);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _POPPLER_CONST Function *func);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool is_stroke=false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Image/mask creation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2b2a1d8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/patch-poppler-0.71.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 4e014550a5d4c575a5d70cc9b37b7791d7c951d5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Lars Wendler <polynomial-c@gentoo.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 7 Nov 2018 16:36:22 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fix build with poppler-0.71.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix blatantly backported from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://launchpadlibrarian.net/396085203/inkscape-poppler-v071.patch
</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/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6ed911b..4437052 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,71,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef bool GBool;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define gTrue true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define gFalse false
</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,70,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _POPPLER_CONST const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v0.10.2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/patch-poppler-0.72.diff b/graphics/inkscape/files/patch-poppler-0.72.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index eac4ed7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/patch-poppler-0.72.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b3d59cc8106da3bf6020a6c47eeb3b8a7bbae1a9 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: Sun, 9 Dec 2018 10:21:34 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: fix poppler 0.72.0 build
</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.h b/src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2d4441a..31c84d5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/extension/internal/pdfinput/pdf-parser.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,7 +26,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // TODO clean up and remove using:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using Inkscape::Extension::Internal::SvgBuilder;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "goo/gtypes.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Object.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class GooString;
</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 5141bf8..61a1508 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,10 @@
</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, 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;'>- #if POPPLER_CHECK_VERSION(0,71,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef bool GBool;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define gTrue true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v0.10.2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/patch-use-configured-perl.diff b/graphics/inkscape/files/patch-use-configured-perl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e3e4541..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/patch-use-configured-perl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.am.orig 2016-10-25 03:16:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.am 2016-10-25 03:21:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -598,12 +598,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d=`sed -n 's,/,-,g;s,.*\$$[D]ate: \(..........\).*,\1,p' $<`; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pod2man --utf8 $< \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | sed 's/^\.TH .*/.TH INKSCAPE 1 "'"$$d"'" "Inkscape-$(VERSION)" "Inkscape"/' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- | perl -pe 'if (/^\[\% .*INCLUDE.*AUTHORS.* \%\]/) { open(FOO, "$(srcdir)/AUTHORS");$$_ = join(",\n", map { chomp; $$_ } <FOO>) . "\n"; }' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- | perl $(srcdir)/fix-roff-punct \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | @@MP_PERL@@ -pe 'if (/^\[\% .*INCLUDE.*AUTHORS.* \%\]/) { open(FOO, "$(srcdir)/AUTHORS");$$_ = join(",\n", map { chomp; $$_ } <FOO>) . "\n"; }' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | @@MP_PERL@@ $(srcdir)/fix-roff-punct \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- > tmp.$$$$ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && mv -f tmp.$$$$ $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ut8-to-roff removed (groff now supports utf8).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# | perl -CI $(srcdir)/utf8-to-roff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# | @@MP_PERL@@ -CI $(srcdir)/utf8-to-roff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # man 7 groff_char for further remarks on charset encoding for man pages.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- po/inkscape.pot:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -630,21 +630,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #.PHONY: warn_markup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- noinst_DATA = warn_markup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- warn_markup:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @if perl $(srcdir)/po/check-markup $(srcdir)/po/*.po; [ $$? = 1 ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @if @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po; [ $$? = 1 ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "WARNING: Bad markup found in translations. Please consider fixing the above problems." >&2; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: check_markup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_DATA = check_markup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_markup:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- perl $(srcdir)/po/check-markup $(srcdir)/po/*.po || [ $$? = 127 ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po || [ $$? = 127 ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # # `make check' probably shouldn't require perl to be installed, hence ignoring 127.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distcheck-hook:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- perl $(srcdir)/po/check-markup $(srcdir)/po/*.po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/*.po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test-check-markup:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if perl -e 42; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- perl $(srcdir)/po/check-markup $(srcdir)/po/bad.po.test 2>&1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if @@MP_PERL@@ -e 42; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @@MP_PERL@@ $(srcdir)/po/check-markup $(srcdir)/po/bad.po.test 2>&1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | diff $(srcdir)/po/bad.po.test.exp -; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span></pre><pre style='margin:0'>
</pre>