diff --git a/.gitignore b/.gitignore index 3674a95..fa4278b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ inkscape.tar.bz2 /inkscape-0.92.2.tar.bz2 /inkscape-0.92.3.tar.bz2 /inkscape-INKSCAPE_0_92_3.tar.bz2 +/inkscape-INKSCAPE_0_92_4.tar.bz2 diff --git a/inkscape-0.92.3-1575842.patch b/inkscape-0.92.3-1575842.patch deleted file mode 100644 index 6dd3b58..0000000 --- a/inkscape-0.92.3-1575842.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libnrtype/Layout-TNG-OutIter.cpp~ 2018-03-11 16:38:09.000000000 -0400 -+++ src/libnrtype/Layout-TNG-OutIter.cpp 2018-06-16 13:17:03.129605681 -0400 -@@ -182,6 +182,8 @@ - if (_input_stream[source_index]->Type() != TEXT_SOURCE) - return iterator(this, char_index); - -+ if (char_index >= _characters.size()) -+ return end(); - return iterator(this, char_index); - /* This code was never used, the text_iterator argument was "NULL" in all calling code - InputStreamTextSource const *text_source = static_cast(_input_stream[source_index]); diff --git a/inkscape-0.92.3-poppler-0.64.patch b/inkscape-0.92.3-poppler-0.64.patch deleted file mode 100644 index b80ae8f..0000000 --- a/inkscape-0.92.3-poppler-0.64.patch +++ /dev/null @@ -1,111 +0,0 @@ -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 deleted file mode 100644 index e44a1bf..0000000 --- a/inkscape-0.92.3-poppler-0.65.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 04a0448..919b00d 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,6 +1,6 @@ Name: inkscape -Version: 0.92.3 -Release: 11%{?dist} +Version: 0.92.4 +Release: 1%{?dist} Summary: Vector-based drawing program using SVG # Inkscape tags their releases with underscores and in ALLCAPS @@ -18,11 +18,8 @@ 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 -Patch4: inkscape-0.92.3-oob.patch -Patch5: inkscape-0.92.3-endofline.patch +Patch2: inkscape-0.92.3-oob.patch +Patch3: inkscape-0.92.3-endofline.patch Provides: bundled(libcroco) Provides: bundled(libgdl) @@ -115,13 +112,11 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format. %prep -%setup -qn inkscape-INKSCAPE_0_92_3 +%setup -qn inkscape-INKSCAPE_0_92_4 %patch0 -p0 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p0 -%patch5 -p0 +%patch2 -p0 +%patch3 -p0 pathfix.py -pni "%{__python2} %{py2_shbang_opts}" . # https://bugs.launchpad.net/inkscape/+bug/314381 @@ -208,6 +203,7 @@ pathfix.py -pni "%{__python2} %{py2_shbang_opts}" $RPM_BUILD_ROOT%{_datadir}/ink %{_datadir}/inkscape/templates %{_datadir}/inkscape/ui %{_datadir}/appdata/*inkscape.appdata.xml +%{_datadir}/metainfo/inkscape.appdata.xml %{_datadir}/applications/*inkscape.desktop %{_datadir}/icons/hicolor/*/*/inkscape* %{_mandir}/*/*gz @@ -231,6 +227,9 @@ pathfix.py -pni "%{__python2} %{py2_shbang_opts}" $RPM_BUILD_ROOT%{_datadir}/ink %changelog +* Thu Jan 17 2019 Gwyn Ciesla - 0.92.4-1 +- 0.92.4 + * Tue Jan 15 2019 Gwyn Ciesla - 0.92.3-11 - End of line patch. diff --git a/sources b/sources index 81a69d0..499e633 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (inkscape-INKSCAPE_0_92_3.tar.bz2) = 83985c03de8c64e1ea0b00a58bc8bb5e2ed2620aa34bc7cc6d587fd37d5476eb9987e86131388651025c95c842a57606e74197e224830fdfabd336d2176c499a +SHA512 (inkscape-INKSCAPE_0_92_4.tar.bz2) = 761a6b83a12c577d964e79cadecb756fc3f802aa011c04acd635b60b104f29891a9df78f6b525a185300361ed98952d6eae6d3d555684d5cfa1937ba40bb2580