From c4ea6a9aafc5c184197f08b55a295b27e8a50d44 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 14 Aug 2018 01:13:31 +0200 Subject: [PATCH] Rebuild for poppler-0.67.0 --- inkscape-0.92.3-poppler-0.64.patch | 111 +++++++++++++++++++++++++++++ inkscape-0.92.3-poppler-0.65.patch | 23 ++++++ inkscape.spec | 10 ++- 3 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 inkscape-0.92.3-poppler-0.64.patch create mode 100644 inkscape-0.92.3-poppler-0.65.patch diff --git a/inkscape-0.92.3-poppler-0.64.patch b/inkscape-0.92.3-poppler-0.64.patch new file mode 100644 index 0000000..b80ae8f --- /dev/null +++ b/inkscape-0.92.3-poppler-0.64.patch @@ -0,0 +1,111 @@ +From a600c6438fef2f4c06f9a4a7d933d99fb054a973 Mon Sep 17 00:00:00 2001 +From: Eduard Braun +Date: Tue, 24 Apr 2018 19:18:26 +0200 +Subject: Fix compilation with poppler 0.64 + + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 15bc2d746d..6c498f9812 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -2582,7 +2582,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/) + } + } + +-void PdfParser::doShowText(GooString *s) { ++void PdfParser::doShowText(const GooString *s) { + GfxFont *font; + int wMode; + double riseX, riseY; +@@ -2601,7 +2601,7 @@ void PdfParser::doShowText(GooString *s) { + font = state->getFont(); + wMode = font->getWMode(); + +- builder->beginString(state, s); ++ builder->beginString(state); + + // handle a Type 3 char + if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) { +@@ -2631,7 +2631,7 @@ void PdfParser::doShowText(GooString *s) { + double lineX = state->getLineX(); + double lineY = state->getLineY(); + oldParser = parser; +- p = s->getCString(); ++ p = g_strdup(s->getCString()); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, +@@ -2686,7 +2686,7 @@ void PdfParser::doShowText(GooString *s) { + + } else { + state->textTransformDelta(0, state->getRise(), &riseX, &riseY); +- p = s->getCString(); ++ p = g_strdup(s->getCString()); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, +@@ -2732,7 +2732,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/) + { + Object obj1, obj2, obj3, refObj; + +- char *name = args[0].getName(); ++ char *name = g_strdup(args[0].getName()); + #if defined(POPPLER_NEW_OBJECT_API) + if ((obj1 = res->lookupXObject(name)).isNull()) { + #else +diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h +index e28fecc2e1..f985b15cad 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.h ++++ b/src/extension/internal/pdfinput/pdf-parser.h +@@ -287,7 +287,7 @@ private: + void opMoveShowText(Object args[], int numArgs); + void opMoveSetShowText(Object args[], int numArgs); + void opShowSpaceText(Object args[], int numArgs); +- void doShowText(GooString *s); ++ void doShowText(const GooString *s); + + // XObject operators + void opXObject(Object args[], int numArgs); +diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp +index 158c5ae068..8e5a5f6396 100644 +--- a/src/extension/internal/pdfinput/svg-builder.cpp ++++ b/src/extension/internal/pdfinput/svg-builder.cpp +@@ -1021,7 +1021,7 @@ void SvgBuilder::updateFont(GfxState *state) { + GfxFont *font = state->getFont(); + // Store original name + if (font->getName()) { +- _font_specification = font->getName()->getCString(); ++ _font_specification = g_strdup(font->getName()->getCString()); + } else { + _font_specification = (char*) "Arial"; + } +@@ -1362,7 +1362,7 @@ void SvgBuilder::_flushText() { + _glyphs.clear(); + } + +-void SvgBuilder::beginString(GfxState *state, GooString * /*s*/) { ++void SvgBuilder::beginString(GfxState *state) { + if (_need_font_update) { + updateFont(state); + } +diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h +index ad15c9c06f..ed2a4d48e0 100644 +--- a/src/extension/internal/pdfinput/svg-builder.h ++++ b/src/extension/internal/pdfinput/svg-builder.h +@@ -29,7 +29,6 @@ namespace Inkscape { + #include + + #include "CharTypes.h" +-class GooString; + class Function; + class GfxState; + struct GfxColor; +@@ -136,7 +135,7 @@ public: + void clearSoftMask(GfxState *state); + + // Text handling +- void beginString(GfxState *state, GooString *s); ++ void beginString(GfxState *state); + void endString(GfxState *state); + void addChar(GfxState *state, double x, double y, + double dx, double dy, diff --git a/inkscape-0.92.3-poppler-0.65.patch b/inkscape-0.92.3-poppler-0.65.patch new file mode 100644 index 0000000..e44a1bf --- /dev/null +++ b/inkscape-0.92.3-poppler-0.65.patch @@ -0,0 +1,23 @@ +From fa1c469aa8c005e07bb8676d72af9f7c16fae3e0 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Fri, 25 May 2018 00:30:17 +0200 +Subject: Fix compilation with poppler 0.65.0 + +replace unused includes with one that is actually used + +Signed-off-by: Jan Palus + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 6c498f9812..caaeca18e0 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -37,8 +37,7 @@ extern "C" { + #include "util/units.h" + + #include "goo/gmem.h" +-#include "goo/GooTimer.h" +-#include "goo/GooHash.h" ++#include "goo/GooString.h" + #include "GlobalParams.h" + #include "CharTypes.h" + #include "Object.h" diff --git a/inkscape.spec b/inkscape.spec index c89b779..7f9a844 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,6 +1,6 @@ Name: inkscape Version: 0.92.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Vector-based drawing program using SVG License: GPLv2+ and CC-BY @@ -20,6 +20,9 @@ Patch0: inkscape-0.92.3-1575842.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1604371 Patch1: inkscape-python2.patch +Patch2: inkscape-0.92.3-poppler-0.64.patch +Patch3: inkscape-0.92.3-poppler-0.65.patch + BuildRequires: gcc-c++ BuildRequires: aspell-devel aspell-en BuildRequires: atk-devel @@ -111,6 +114,8 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format. %setup -q %patch0 -p0 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 # https://bugs.launchpad.net/inkscape/+bug/314381 # A couple of files have executable bits set, @@ -217,6 +222,9 @@ install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/ %changelog +* Tue Aug 14 2018 Marek Kasik - 0.92.3-5 +- Rebuild for poppler-0.67.0 + * Fri Jul 20 2018 Debarshi Ray - 0.92.3-4 - Fix FTBFS due to Python2 - Remove GTK3-based BuildRequires