From 2cb742a28c30e226cac9e3f4c124a86280f75761 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 10 May 2022 03:03:22 -0400 Subject: [PATCH] import inkscape-0.92.3-16.module+el8.6.0+13197+b722211d --- .gitignore | 2 + .inkscape.metadata | 2 + SOURCES/0003-use-python2.patch | 71 ++ SOURCES/0004-text-input-crash.patch | 12 + SOURCES/Fedora-Color-Palette.gpl | 14 + SOURCES/inkscape-poppler-0.64.0.patch | 120 +++ SOURCES/inkscape-poppler-0.65.0.patch | 29 + SOURCES/inkscape-poppler-20.11.0.patch | 1041 +++++++++++++++++++++ SOURCES/inkscape.appdata.xml | 31 + SPECS/inkscape.spec | 1151 ++++++++++++++++++++++++ 10 files changed, 2473 insertions(+) create mode 100644 .gitignore create mode 100644 .inkscape.metadata create mode 100644 SOURCES/0003-use-python2.patch create mode 100644 SOURCES/0004-text-input-crash.patch create mode 100644 SOURCES/Fedora-Color-Palette.gpl create mode 100644 SOURCES/inkscape-poppler-0.64.0.patch create mode 100644 SOURCES/inkscape-poppler-0.65.0.patch create mode 100644 SOURCES/inkscape-poppler-20.11.0.patch create mode 100644 SOURCES/inkscape.appdata.xml create mode 100644 SPECS/inkscape.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..be05aae --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +SOURCES/ImageMagick-6.9.9.38-1.fc32.src.rpm +SOURCES/inkscape-0.92.3.tar.bz2 diff --git a/.inkscape.metadata b/.inkscape.metadata new file mode 100644 index 0000000..b6f8c35 --- /dev/null +++ b/.inkscape.metadata @@ -0,0 +1,2 @@ +2d9033b4b8e57adbd5ccfa945c0bbab460e205b1 SOURCES/ImageMagick-6.9.9.38-1.fc32.src.rpm +e1886317f8e6d4fb340f6a783fe410aaff9f28a7 SOURCES/inkscape-0.92.3.tar.bz2 diff --git a/SOURCES/0003-use-python2.patch b/SOURCES/0003-use-python2.patch new file mode 100644 index 0000000..710db61 --- /dev/null +++ b/SOURCES/0003-use-python2.patch @@ -0,0 +1,71 @@ +diff -up inkscape-0.92.3/share/filters/CMakeLists.txt.python2 inkscape-0.92.3/share/filters/CMakeLists.txt +--- inkscape-0.92.3/share/filters/CMakeLists.txt.python2 2018-07-13 09:49:16.745284660 +0200 ++++ inkscape-0.92.3/share/filters/CMakeLists.txt 2018-07-13 09:49:19.718289481 +0200 +@@ -1,6 +1,6 @@ + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h +- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h ++ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py + ) +diff -up inkscape-0.92.3/share/palettes/CMakeLists.txt.python2 inkscape-0.92.3/share/palettes/CMakeLists.txt +--- inkscape-0.92.3/share/palettes/CMakeLists.txt.python2 2018-07-13 09:48:29.279207685 +0200 ++++ inkscape-0.92.3/share/palettes/CMakeLists.txt 2018-07-13 09:48:32.351212667 +0200 +@@ -2,7 +2,7 @@ set(I18N_FILES "inkscape.gpl" "svg.gpl" + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h +- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h ++ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} + ) +diff -up inkscape-0.92.3/share/patterns/CMakeLists.txt.python2 inkscape-0.92.3/share/patterns/CMakeLists.txt +--- inkscape-0.92.3/share/patterns/CMakeLists.txt.python2 2018-07-13 09:48:48.886239480 +0200 ++++ inkscape-0.92.3/share/patterns/CMakeLists.txt 2018-07-13 09:48:51.762244143 +0200 +@@ -1,6 +1,6 @@ + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h +- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h ++ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py + ) +diff -up inkscape-0.92.3/share/symbols/CMakeLists.txt.python2 inkscape-0.92.3/share/symbols/CMakeLists.txt +--- inkscape-0.92.3/share/symbols/CMakeLists.txt.python2 2018-07-13 09:49:03.745263577 +0200 ++++ inkscape-0.92.3/share/symbols/CMakeLists.txt 2018-07-13 09:49:05.959267167 +0200 +@@ -2,7 +2,7 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURREN + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h +- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h ++ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} + ) +diff -up inkscape-0.92.3/share/templates/CMakeLists.txt.python2 inkscape-0.92.3/share/templates/CMakeLists.txt +--- inkscape-0.92.3/share/templates/CMakeLists.txt.python2 2018-07-12 14:53:11.195317573 +0200 ++++ inkscape-0.92.3/share/templates/CMakeLists.txt 2018-07-12 14:53:13.824322527 +0200 +@@ -2,7 +2,7 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURREN + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/templates.h +- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h ++ COMMAND python2 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} + ) +diff -up inkscape-0.92.3/src/extension/implementation/implementation.cpp.python2 inkscape-0.92.3/src/extension/implementation/implementation.cpp +diff -up inkscape-0.92.3/src/extension/implementation/script.cpp.python2 inkscape-0.92.3/src/extension/implementation/script.cpp +--- inkscape-0.92.3/src/extension/implementation/script.cpp.python2 2018-07-12 14:54:09.974428340 +0200 ++++ inkscape-0.92.3/src/extension/implementation/script.cpp 2018-07-12 14:54:19.590446461 +0200 +@@ -87,7 +87,7 @@ Script::interpreter_t const Script::inte + #ifdef WIN32 + {"python", "python-interpreter", "pythonw" }, + #else +- {"python", "python-interpreter", "python" }, ++ {"python", "python-interpreter", "python2" }, + #endif + {"ruby", "ruby-interpreter", "ruby" }, + {"shell", "shell-interpreter", "sh" }, diff --git a/SOURCES/0004-text-input-crash.patch b/SOURCES/0004-text-input-crash.patch new file mode 100644 index 0000000..91bacf1 --- /dev/null +++ b/SOURCES/0004-text-input-crash.patch @@ -0,0 +1,12 @@ +--- 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/SOURCES/Fedora-Color-Palette.gpl b/SOURCES/Fedora-Color-Palette.gpl new file mode 100644 index 0000000..0a455e2 --- /dev/null +++ b/SOURCES/Fedora-Color-Palette.gpl @@ -0,0 +1,14 @@ +GIMP Palette +Name: Fedora RGB +Columns: 2 +# + 60 110 180 Fedora Blue + 41 65 114 Fedora Dark Blue +219 50 121 Friends Magenta +229 151 40 Features Orange +121 219 50 First Green +160 124 188 Freedom Purple + 0 0 0 Black + 76 76 76 Dark Grey +140 140 140 Grey +222 222 222 Light Grey diff --git a/SOURCES/inkscape-poppler-0.64.0.patch b/SOURCES/inkscape-poppler-0.64.0.patch new file mode 100644 index 0000000..3efbe55 --- /dev/null +++ b/SOURCES/inkscape-poppler-0.64.0.patch @@ -0,0 +1,120 @@ +From a600c6438fef2f4c06f9a4a7d933d99fb054a973 Mon Sep 17 00:00:00 2001 +From: Eduard Braun +Date: Tue, 24 Apr 2018 19:18:26 +0200 +Subject: [PATCH] Fix compilation with poppler 0.64 + +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 10 +++++----- + src/extension/internal/pdfinput/pdf-parser.h | 2 +- + src/extension/internal/pdfinput/svg-builder.cpp | 4 ++-- + src/extension/internal/pdfinput/svg-builder.h | 3 +-- + 4 files changed, 9 insertions(+), 10 deletions(-) + +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, +-- +2.17.1 + diff --git a/SOURCES/inkscape-poppler-0.65.0.patch b/SOURCES/inkscape-poppler-0.65.0.patch new file mode 100644 index 0000000..5f91f7d --- /dev/null +++ b/SOURCES/inkscape-poppler-0.65.0.patch @@ -0,0 +1,29 @@ +From fa1c469aa8c005e07bb8676d72af9f7c16fae3e0 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Fri, 25 May 2018 00:30:17 +0200 +Subject: [PATCH] Fix compilation with poppler 0.65.0 + +replace unused includes with one that is actually used + +Signed-off-by: Jan Palus +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +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" +-- +2.17.1 + diff --git a/SOURCES/inkscape-poppler-20.11.0.patch b/SOURCES/inkscape-poppler-20.11.0.patch new file mode 100644 index 0000000..d12656e --- /dev/null +++ b/SOURCES/inkscape-poppler-20.11.0.patch @@ -0,0 +1,1041 @@ +--- inkscape-0.92.3/src/extension/internal/pdfinput/pdf-input.cpp ++++ inkscape-0.92.3/src/extension/internal/pdfinput/pdf-input.cpp +@@ -319,7 +319,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc + _render_thumb = true; + + // Create PopplerDocument +- Glib::ustring filename = _pdf_doc->getFileName()->getCString(); ++ Glib::ustring filename = _pdf_doc->getFileName()->c_str(); + if (!Glib::path_is_absolute(filename)) { + filename = Glib::build_filename(Glib::get_current_dir(),filename); + } +@@ -694,7 +694,7 @@ PdfInput::open(::Inkscape::Extension::In + globalParams = new GlobalParams(); + } + #else +- globalParams = new GlobalParams(); ++ globalParams.reset(new GlobalParams()); + #endif // ENABLE_OSX_APP_LOCATIONS + } + +@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::In + dlg->getImportSettings(prefs); + + // Apply crop settings +- PDFRectangle *clipToBox = NULL; ++ const PDFRectangle *clipToBox = NULL; + double crop_setting; + sp_repr_get_double(prefs, "cropTo", &crop_setting); + +--- inkscape-0.92.3/src/extension/internal/pdfinput/pdf-parser.cpp ++++ inkscape-0.92.3/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -270,8 +270,8 @@ public: + // Manipulate clip path stack + ClipHistoryEntry *save(); + ClipHistoryEntry *restore(); +- GBool hasSaves() { return saved != NULL; } +- void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal); ++ bool hasSaves() { return saved != NULL; } ++ void setClip(const GfxPath *newClipPath, GfxClipType newClipType = clipNormal); + GfxPath *getClipPath() { return clipPath; } + GfxClipType getClipType() { return clipType; } + +@@ -294,15 +294,15 @@ PdfParser::PdfParser(XRef *xrefA, + int /*pageNum*/, + int rotate, + Dict *resDict, +- PDFRectangle *box, +- PDFRectangle *cropBox) : ++ const PDFRectangle *box, ++ const PDFRectangle *cropBox) : + xref(xrefA), + builder(builderA), +- subPage(gFalse), ++ subPage(false), + printCommands(false), + res(new GfxResources(xref, resDict, NULL)), // start the resource stack +- state(new GfxState(72.0, 72.0, box, rotate, gTrue)), +- fontChanged(gFalse), ++ state(new GfxState(72.0, 72.0, box, rotate, true)), ++ fontChanged(false), + clip(clipNone), + ignoreUndef(0), + baseMatrix(), +@@ -317,7 +317,7 @@ PdfParser::PdfParser(XRef *xrefA, + builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"), + Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px")); + +- double *ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + double scaledCTM[6]; + for (int i = 0; i < 6; ++i) { + baseMatrix[i] = ctm[i]; +@@ -352,14 +352,14 @@ PdfParser::PdfParser(XRef *xrefA, + PdfParser::PdfParser(XRef *xrefA, + Inkscape::Extension::Internal::SvgBuilder *builderA, + Dict *resDict, +- PDFRectangle *box) : ++ const PDFRectangle *box) : + xref(xrefA), + builder(builderA), +- subPage(gTrue), ++ subPage(true), + printCommands(false), + res(new GfxResources(xref, resDict, NULL)), // start the resource stack +- state(new GfxState(72, 72, box, 0, gFalse)), +- fontChanged(gFalse), ++ state(new GfxState(72, 72, box, 0, false)), ++ fontChanged(false), + clip(clipNone), + ignoreUndef(0), + baseMatrix(), +@@ -408,7 +408,7 @@ PdfParser::~PdfParser() { + } + } + +-void PdfParser::parse(Object *obj, GBool topLevel) { ++void PdfParser::parse(Object *obj, bool topLevel) { + Object obj2; + + if (obj->isArray()) { +@@ -433,13 +433,13 @@ void PdfParser::parse(Object *obj, GBool + error(errInternal, -1, "Weird page contents"); + return; + } +- parser = new Parser(xref, new Lexer(xref, obj), gFalse); ++ parser = new Parser(xref, obj, false); + go(topLevel); + delete parser; + parser = NULL; + } + +-void PdfParser::go(GBool /*topLevel*/) ++void PdfParser::go(bool /*topLevel*/) + { + Object obj; + Object args[maxArgs]; +@@ -571,7 +571,7 @@ const char *PdfParser::getPreviousOperat + + void PdfParser::execOp(Object *cmd, Object args[], int numArgs) { + PdfOperator *op; +- char *name; ++ const char *name; + Object *argPtr; + int i; + +@@ -619,7 +619,7 @@ void PdfParser::execOp(Object *cmd, Obje + (this->*op->func)(argPtr, numArgs); + } + +-PdfOperator* PdfParser::findOp(char *name) { ++PdfOperator* PdfParser::findOp(const char *name) { + int a = -1; + int b = numOps; + int cmp = -1; +@@ -639,7 +639,7 @@ PdfOperator* PdfParser::findOp(char *nam + return &opTab[a]; + } + +-GBool PdfParser::checkArg(Object *arg, TchkType type) { ++bool PdfParser::checkArg(Object *arg, TchkType type) { + switch (type) { + case tchkBool: return arg->isBool(); + case tchkInt: return arg->isInt(); +@@ -649,9 +649,9 @@ GBool PdfParser::checkArg(Object *arg, T + case tchkArray: return arg->isArray(); + case tchkProps: return arg->isDict() || arg->isName(); + case tchkSCN: return arg->isNum() || arg->isName(); +- case tchkNone: return gFalse; ++ case tchkNone: return false; + } +- return gFalse; ++ return false; + } + + int PdfParser::getPos() { +@@ -706,7 +706,7 @@ void PdfParser::opConcat(Object args[], + builder->pushGroup(); + builder->setTransform(a0, a1, a2, a3, a4, a5); + } +- fontChanged = gTrue; ++ fontChanged = true; + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -772,8 +772,8 @@ void PdfParser::opSetExtGState(Object ar + Object obj1, obj2, obj3, obj4, obj5; + Function *funcs[4] = {0, 0, 0, 0}; + GfxColor backdropColor; +- GBool haveBackdropColor = gFalse; +- GBool alpha = gFalse; ++ bool haveBackdropColor = false; ++ bool alpha = false; + + #if defined(POPPLER_NEW_OBJECT_API) + if ((obj1 = res->lookupGState(args[0].getName())).isNull()) { +@@ -829,7 +829,7 @@ void PdfParser::opSetExtGState(Object ar + #endif + + // fill/stroke overprint +- GBool haveFillOP = gFalse; ++ bool haveFillOP = false; + #if defined(POPPLER_NEW_OBJECT_API) + if ((haveFillOP = (obj2 = obj1.dictLookup(const_cast("op"))).isBool())) { + #else +@@ -924,9 +924,9 @@ void PdfParser::opSetExtGState(Object ar + #else + if (obj2.dictLookup(const_cast("S"), &obj3)->isName(const_cast("Alpha"))) { + #endif +- alpha = gTrue; ++ alpha = true; + } else { // "Luminosity" +- alpha = gFalse; ++ alpha = false; + } + #if !defined(POPPLER_NEW_OBJECT_API) + obj3.free(); +@@ -977,8 +977,8 @@ void PdfParser::opSetExtGState(Object ar + if (obj3.streamGetDict()->lookup(const_cast("Group"), &obj4)->isDict()) { + #endif + GfxColorSpace *blendingColorSpace = 0; +- GBool isolated = gFalse; +- GBool knockout = gFalse; ++ bool isolated = false; ++ bool knockout = false; + #if defined(POPPLER_NEW_OBJECT_API) + if (!((obj5 = obj4.dictLookup(const_cast("CS"))).isNull())) { + #else +@@ -1049,9 +1049,9 @@ void PdfParser::opSetExtGState(Object ar + #endif + } + +-void PdfParser::doSoftMask(Object *str, GBool alpha, ++void PdfParser::doSoftMask(Object *str, bool alpha, + GfxColorSpace *blendingColorSpace, +- GBool isolated, GBool knockout, ++ bool isolated, bool knockout, + Function *transferFunc, GfxColor *backdropColor) { + Dict *dict, *resDict; + double m[6], bbox[4]; +@@ -1144,7 +1144,7 @@ void PdfParser::doSoftMask(Object *str, + + // draw it + ++formDepth; +- doForm1(str, resDict, m, bbox, gTrue, gTrue, ++ doForm1(str, resDict, m, bbox, true, true, + blendingColorSpace, isolated, knockout, + alpha, transferFunc, backdropColor); + --formDepth; +@@ -1614,7 +1614,7 @@ void PdfParser::opFill(Object /*args*/[] + if (state->isPath()) { + if (state->getFillColorSpace()->getMode() == csPattern && + !builder->isPatternTypeSupported(state->getFillPattern())) { +- doPatternFillFallback(gFalse); ++ doPatternFillFallback(false); + } else { + builder->addPath(state, true, false); + } +@@ -1631,7 +1631,7 @@ void PdfParser::opEOFill(Object /*args*/ + if (state->isPath()) { + if (state->getFillColorSpace()->getMode() == csPattern && + !builder->isPatternTypeSupported(state->getFillPattern())) { +- doPatternFillFallback(gTrue); ++ doPatternFillFallback(true); + } else { + builder->addPath(state, true, false, true); + } +@@ -1646,7 +1646,7 @@ void PdfParser::opFillStroke(Object /*ar + return; + } + if (state->isPath()) { +- doFillAndStroke(gFalse); ++ doFillAndStroke(false); + } else { + builder->addPath(state, true, true); + } +@@ -1661,7 +1661,7 @@ void PdfParser::opCloseFillStroke(Object + } + if (state->isPath()) { + state->closePath(); +- doFillAndStroke(gFalse); ++ doFillAndStroke(false); + } + doEndPath(); + } +@@ -1673,7 +1673,7 @@ void PdfParser::opEOFillStroke(Object /* + return; + } + if (state->isPath()) { +- doFillAndStroke(gTrue); ++ doFillAndStroke(true); + } + doEndPath(); + } +@@ -1686,20 +1686,20 @@ void PdfParser::opCloseEOFillStroke(Obje + } + if (state->isPath()) { + state->closePath(); +- doFillAndStroke(gTrue); ++ doFillAndStroke(true); + } + doEndPath(); + } + +-void PdfParser::doFillAndStroke(GBool eoFill) { +- GBool fillOk = gTrue, strokeOk = gTrue; ++void PdfParser::doFillAndStroke(bool eoFill) { ++ bool fillOk = true, strokeOk = true; + if (state->getFillColorSpace()->getMode() == csPattern && + !builder->isPatternTypeSupported(state->getFillPattern())) { +- fillOk = gFalse; ++ fillOk = false; + } + if (state->getStrokeColorSpace()->getMode() == csPattern && + !builder->isPatternTypeSupported(state->getStrokePattern())) { +- strokeOk = gFalse; ++ strokeOk = false; + } + if (fillOk && strokeOk) { + builder->addPath(state, true, true, eoFill); +@@ -1709,7 +1709,7 @@ void PdfParser::doFillAndStroke(GBool eo + } + } + +-void PdfParser::doPatternFillFallback(GBool eoFill) { ++void PdfParser::doPatternFillFallback(bool eoFill) { + GfxPattern *pattern; + + if (!(pattern = state->getFillPattern())) { +@@ -1719,7 +1719,7 @@ void PdfParser::doPatternFillFallback(GB + case 1: + break; + case 2: +- doShadingPatternFillFallback(static_cast(pattern), gFalse, eoFill); ++ doShadingPatternFillFallback(static_cast(pattern), false, eoFill); + break; + default: + error(errUnimplemented, getPos(), "Unimplemented pattern type (%d) in fill", +@@ -1738,7 +1738,7 @@ void PdfParser::doPatternStrokeFallback( + case 1: + break; + case 2: +- doShadingPatternFillFallback(static_cast(pattern), gTrue, gFalse); ++ doShadingPatternFillFallback(static_cast(pattern), true, false); + break; + default: + error(errUnimplemented, getPos(), "Unimplemented pattern type ({0:d}) in stroke", +@@ -1748,10 +1748,10 @@ void PdfParser::doPatternStrokeFallback( + } + + void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat, +- GBool stroke, GBool eoFill) { ++ bool stroke, bool eoFill) { + GfxShading *shading; + GfxPath *savedPath; +- double *ctm, *btm, *ptm; ++ const double *ctm, *btm, *ptm; + double m[6], ictm[6], m1[6]; + double xMin, yMin, xMax, yMax; + double det; +@@ -1862,7 +1862,7 @@ void PdfParser::opShFill(Object args[], + double xTemp, yTemp; + double gradientTransform[6]; + double *matrix = NULL; +- GBool savedState = gFalse; ++ bool savedState = false; + + #if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) + if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) { +@@ -1878,13 +1878,13 @@ void PdfParser::opShFill(Object args[], + if (shading->getType() != 2 && shading->getType() != 3) { + savedPath = state->getPath()->copy(); + saveState(); +- savedState = gTrue; ++ savedState = true; + } else { // get gradient transform if possible + // check proper operator sequence + // first there should be one W(*) and then one 'cm' somewhere before 'sh' +- GBool seenClip, seenConcat; ++ bool seenClip, seenConcat; + seenClip = (clipHistory->getClipPath() != NULL); +- seenConcat = gFalse; ++ seenConcat = false; + int i = 1; + while (i <= maxOperatorHistoryDepth) { + const char *opName = getPreviousOperator(i); +@@ -1892,7 +1892,7 @@ void PdfParser::opShFill(Object args[], + if (seenConcat) { // more than one 'cm' + break; + } else { +- seenConcat = gTrue; ++ seenConcat = true; + } + } + i++; +@@ -1993,7 +1993,7 @@ void PdfParser::doFunctionShFill1(GfxFun + GfxColor color0M, color1M, colorM0, colorM1, colorMM; + GfxColor colors2[4]; + double functionColorDelta = colorDeltas[pdfFunctionShading-1]; +- double *matrix; ++ const double *matrix; + double xM, yM; + int nComps, i, j; + +@@ -2173,7 +2173,7 @@ void PdfParser::doPatchMeshShFill(GfxPat + } + } + +-void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) { ++void PdfParser::fillPatch(const GfxPatch *patch, int nComps, int depth) { + GfxPatch patch00 = blankPatch(); + GfxPatch patch01 = blankPatch(); + GfxPatch patch10 = blankPatch(); +@@ -2347,7 +2347,7 @@ void PdfParser::opBeginText(Object /*arg + state->setTextMat(1, 0, 0, 1, 0, 0); + state->textMoveTo(0, 0); + builder->updateTextPosition(0.0, 0.0); +- fontChanged = gTrue; ++ fontChanged = true; + builder->beginTextObject(state); + } + +@@ -2375,20 +2375,20 @@ void PdfParser::opSetFont(Object args[], + // unsetting the font (drawing no text) is better than using the + // previous one and drawing random glyphs from it + state->setFont(NULL, args[1].getNum()); +- fontChanged = gTrue; ++ fontChanged = true; + return; + } + if (printCommands) { + printf(" font: tag=%s name='%s' %g\n", +- font->getTag()->getCString(), +- font->getName() ? font->getName()->getCString() : "???", ++ font->getTag()->c_str(), ++ font->getName() ? font->getName()->c_str() : "???", + args[1].getNum()); + fflush(stdout); + } + + font->incRefCnt(); + state->setFont(font, args[1].getNum()); +- fontChanged = gTrue; ++ fontChanged = true; + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -2421,7 +2421,7 @@ void PdfParser::opSetHorizScaling(Object + { + state->setHorizScaling(args[0].getNum()); + builder->updateTextMatrix(state); +- fontChanged = gTrue; ++ fontChanged = true; + } + + //------------------------------------------------------------------------ +@@ -2461,7 +2461,7 @@ void PdfParser::opSetTextMatrix(Object a + state->textMoveTo(0, 0); + builder->updateTextMatrix(state); + builder->updateTextPosition(0.0, 0.0); +- fontChanged = gTrue; ++ fontChanged = true; + } + + void PdfParser::opTextNextLine(Object /*args*/[], int /*numArgs*/) +@@ -2487,7 +2487,7 @@ void PdfParser::opShowText(Object args[] + } + if (fontChanged) { + builder->updateFont(state); +- fontChanged = gFalse; ++ fontChanged = false; + } + doShowText(args[0].getString()); + } +@@ -2504,7 +2504,7 @@ void PdfParser::opMoveShowText(Object ar + } + if (fontChanged) { + builder->updateFont(state); +- fontChanged = gFalse; ++ fontChanged = false; + } + tx = state->getLineX(); + ty = state->getLineY() - state->getLeading(); +@@ -2525,7 +2525,7 @@ void PdfParser::opMoveSetShowText(Object + } + if (fontChanged) { + builder->updateFont(state); +- fontChanged = gFalse; ++ fontChanged = false; + } + state->setWordSpace(args[0].getNum()); + state->setCharSpace(args[1].getNum()); +@@ -2549,7 +2549,7 @@ void PdfParser::opShowSpaceText(Object a + } + if (fontChanged) { + builder->updateFont(state); +- fontChanged = gFalse; ++ fontChanged = false; + } + wMode = state->getFont()->getWMode(); + a = args[0].getArray(); +@@ -2586,11 +2586,11 @@ void PdfParser::doShowText(const GooStri + int wMode; + double riseX, riseY; + CharCode code; +- Unicode *u = NULL; ++ Unicode const *u = NULL; + double x, y, dx, dy, tdx, tdy; + double originX, originY, tOriginX, tOriginY; + double oldCTM[6], newCTM[6]; +- double *mat; ++ const double *mat; + Object charProc; + Dict *resDict; + Parser *oldParser; +@@ -2630,7 +2630,7 @@ void PdfParser::doShowText(const GooStri + double lineX = state->getLineX(); + double lineY = state->getLineY(); + oldParser = parser; +- p = g_strdup(s->getCString()); ++ p = g_strdup(s->c_str()); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, +@@ -2659,7 +2659,7 @@ void PdfParser::doShowText(const GooStri + pushResources(resDict); + } + if (charProc.isStream()) { +- //parse(&charProc, gFalse); // TODO: parse into SVG font ++ //parse(&charProc, false); // TODO: parse into SVG font + } else { + error(errSyntaxError, getPos(), "Missing or bad Type3 CharProc entry"); + } +@@ -2685,7 +2685,7 @@ void PdfParser::doShowText(const GooStri + + } else { + state->textTransformDelta(0, state->getRise(), &riseX, &riseY); +- p = g_strdup(s->getCString()); ++ p = g_strdup(s->c_str()); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, +@@ -2757,7 +2757,7 @@ void PdfParser::opXObject(Object args[], + #else + res->lookupXObjectNF(name, &refObj); + #endif +- doImage(&refObj, obj1.getStream(), gFalse); ++ doImage(&refObj, obj1.getStream(), false); + #if !defined(POPPLER_NEW_OBJECT_API) + refObj.free(); + #endif +@@ -2782,19 +2782,19 @@ void PdfParser::opXObject(Object args[], + #endif + } + +-void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) ++void PdfParser::doImage(Object * /*ref*/, Stream *str, bool inlineImg) + { + Dict *dict; + int width, height; + int bits; +- GBool interpolate; ++ bool interpolate; + StreamColorSpaceMode csMode; +- GBool mask; +- GBool invert; ++ bool mask; ++ bool invert; + Object maskObj, smaskObj; +- GBool haveColorKeyMask, haveExplicitMask, haveSoftMask; +- GBool maskInvert; +- GBool maskInterpolate; ++ bool haveColorKeyMask, haveExplicitMask, haveSoftMask; ++ bool maskInvert; ++ bool maskInterpolate; + Object obj1, obj2; + + // get info from the stream +@@ -2872,11 +2872,11 @@ void PdfParser::doImage(Object * /*ref*/ + if (obj1.isBool()) + interpolate = obj1.getBool(); + else +- interpolate = gFalse; ++ interpolate = false; + #if !defined(POPPLER_NEW_OBJECT_API) + obj1.free(); + #endif +- maskInterpolate = gFalse; ++ maskInterpolate = false; + + // image or mask? + #if defined(POPPLER_NEW_OBJECT_API) +@@ -2892,7 +2892,7 @@ void PdfParser::doImage(Object * /*ref*/ + dict->lookup(const_cast("IM"), &obj1); + #endif + } +- mask = gFalse; ++ mask = false; + if (obj1.isBool()) { + mask = obj1.getBool(); + } +@@ -2936,7 +2936,7 @@ void PdfParser::doImage(Object * /*ref*/ + if (bits != 1) { + goto err1; + } +- invert = gFalse; ++ invert = false; + #if defined(POPPLER_NEW_OBJECT_API) + obj1 = dict->lookup(const_cast("Decode")); + #else +@@ -2957,7 +2957,7 @@ void PdfParser::doImage(Object * /*ref*/ + obj1.arrayGet(0, &obj2); + #endif + if (obj2.isInt() && obj2.getInt() == 1) { +- invert = gTrue; ++ invert = true; + } + #if !defined(POPPLER_NEW_OBJECT_API) + obj2.free(); +@@ -3054,11 +3054,11 @@ void PdfParser::doImage(Object * /*ref*/ + + // get the mask + int maskColors[2*gfxColorMaxComps]; +- haveColorKeyMask = haveExplicitMask = haveSoftMask = gFalse; ++ haveColorKeyMask = haveExplicitMask = haveSoftMask = false; + Stream *maskStr = NULL; + int maskWidth = 0; + int maskHeight = 0; +- maskInvert = gFalse; ++ maskInvert = false; + GfxImageColorMap *maskColorMap = NULL; + #if defined(POPPLER_NEW_OBJECT_API) + maskObj = dict->lookup(const_cast("Mask")); +@@ -3145,7 +3145,7 @@ void PdfParser::doImage(Object * /*ref*/ + if (obj1.isBool()) + maskInterpolate = obj1.getBool(); + else +- maskInterpolate = gFalse; ++ maskInterpolate = false; + #if defined(POPPLER_NEW_OBJECT_API) + obj1 = maskDict->lookup(const_cast("ColorSpace")); + #else +@@ -3214,7 +3214,7 @@ void PdfParser::doImage(Object * /*ref*/ + goto err1; + } + //~ handle the Matte entry +- haveSoftMask = gTrue; ++ haveSoftMask = true; + } else if (maskObj.isArray()) { + // color key mask + int i; +@@ -3229,7 +3229,7 @@ void PdfParser::doImage(Object * /*ref*/ + obj1.free(); + #endif + } +- haveColorKeyMask = gTrue; ++ haveColorKeyMask = true; + } else if (maskObj.isStream()) { + // explicit mask + if (inlineImg) { +@@ -3306,11 +3306,11 @@ void PdfParser::doImage(Object * /*ref*/ + if (obj1.isBool()) + maskInterpolate = obj1.getBool(); + else +- maskInterpolate = gFalse; ++ maskInterpolate = false; + #if !defined(POPPLER_NEW_OBJECT_API) + obj1.free(); + #endif +- maskInvert = gFalse; ++ maskInvert = false; + #if defined(POPPLER_NEW_OBJECT_API) + obj1 = maskDict->lookup(const_cast("Decode")); + #else +@@ -3331,7 +3331,7 @@ void PdfParser::doImage(Object * /*ref*/ + obj1.arrayGet(0, &obj2); + #endif + if (obj2.isInt() && obj2.getInt() == 1) { +- maskInvert = gTrue; ++ maskInvert = true; + } + #if !defined(POPPLER_NEW_OBJECT_API) + obj2.free(); +@@ -3342,7 +3342,7 @@ void PdfParser::doImage(Object * /*ref*/ + #if !defined(POPPLER_NEW_OBJECT_API) + obj1.free(); + #endif +- haveExplicitMask = gTrue; ++ haveExplicitMask = true; + } + + // draw it +@@ -3377,7 +3377,7 @@ void PdfParser::doImage(Object * /*ref*/ + + void PdfParser::doForm(Object *str) { + Dict *dict; +- GBool transpGroup, isolated, knockout; ++ bool transpGroup, isolated, knockout; + GfxColorSpace *blendingColorSpace; + Object matrixObj, bboxObj; + double m[6], bbox[4]; +@@ -3471,7 +3471,7 @@ void PdfParser::doForm(Object *str) { + resDict = resObj.isDict() ? resObj.getDict() : (Dict *)NULL; + + // check for a transparency group +- transpGroup = isolated = knockout = gFalse; ++ transpGroup = isolated = knockout = false; + blendingColorSpace = NULL; + #if defined(POPPLER_NEW_OBJECT_API) + if ((obj1 = dict->lookup(const_cast("Group"))).isDict()) { +@@ -3480,7 +3480,7 @@ void PdfParser::doForm(Object *str) { + if (dict->lookup(const_cast("Group"), &obj1)->isDict()) { + if (obj1.dictLookup(const_cast("S"), &obj2)->isName(const_cast("Transparency"))) { + #endif +- transpGroup = gTrue; ++ transpGroup = true; + #if defined(POPPLER_NEW_OBJECT_API) + if (!((obj3 = obj1.dictLookup(const_cast("CS"))).isNull())) { + #else +@@ -3524,7 +3524,7 @@ void PdfParser::doForm(Object *str) { + // draw it + ++formDepth; + doForm1(str, resDict, m, bbox, +- transpGroup, gFalse, blendingColorSpace, isolated, knockout); ++ transpGroup, false, blendingColorSpace, isolated, knockout); + --formDepth; + + if (blendingColorSpace) { +@@ -3536,10 +3536,10 @@ void PdfParser::doForm(Object *str) { + } + + void PdfParser::doForm1(Object *str, Dict *resDict, double *matrix, double *bbox, +- GBool transpGroup, GBool softMask, ++ bool transpGroup, bool softMask, + GfxColorSpace *blendingColorSpace, +- GBool isolated, GBool knockout, +- GBool alpha, Function *transferFunc, ++ bool isolated, bool knockout, ++ bool alpha, Function *transferFunc, + GfxColor *backdropColor) { + Parser *oldParser; + double oldBaseMatrix[6]; +@@ -3600,7 +3600,7 @@ void PdfParser::doForm1(Object *str, Dic + } + + // draw the form +- parse(str, gFalse); ++ parse(str, false); + + // restore base matrix + for (i = 0; i < 6; ++i) { +@@ -3640,7 +3640,7 @@ void PdfParser::opBeginImage(Object /*ar + + // display the image + if (str) { +- doImage(NULL, str, gTrue); ++ doImage(NULL, str, true); + + // skip 'EI' tag + int c1 = str->getUndecodedStream()->getChar(); +@@ -3686,7 +3686,7 @@ Stream *PdfParser::buildImageStream() { + break; + } + #if defined(POPPLER_NEW_OBJECT_API) +- dict.dictAdd(key, std::move(obj)); ++ dict.dictAdd((const char *) key, std::move(obj)); + } + obj = parser->getObj(); + #else +@@ -3709,10 +3709,10 @@ Stream *PdfParser::buildImageStream() { + + // make stream + #if defined(POPPLER_NEW_OBJECT_API) +- str = new EmbedStream(parser->getStream(), dict.copy(), gFalse, 0); ++ str = new EmbedStream(parser->getStream(), dict.copy(), false, 0); + str = str->addFilters(dict.getDict()); + #else +- str = new EmbedStream(parser->getStream(), &dict, gFalse, 0); ++ str = new EmbedStream(parser->getStream(), &dict, false, 0); + str = str->addFilters(&dict); + #endif + +@@ -3875,7 +3875,7 @@ ClipHistoryEntry::~ClipHistoryEntry() + } + } + +-void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) { ++void ClipHistoryEntry::setClip(const GfxPath *clipPathA, GfxClipType clipTypeA) { + // Free previous clip path + if (clipPath) { + delete clipPath; +--- inkscape-0.92.3/src/extension/internal/pdfinput/pdf-parser.h ++++ inkscape-0.92.3/src/extension/internal/pdfinput/pdf-parser.h +@@ -25,7 +25,7 @@ namespace Inkscape { + // TODO clean up and remove using: + using Inkscape::Extension::Internal::SvgBuilder; + +-#include "goo/gtypes.h" ++/*#include "goo/gtypes.h"*/ + #include "Object.h" + + class GooString; +@@ -96,7 +96,7 @@ struct PdfOperator { + struct OpHistoryEntry { + const char *name; // operator's name + GfxState *state; // saved state, NULL if none +- GBool executed; // whether the operator has been executed ++ bool executed; // whether the operator has been executed + + OpHistoryEntry *next; // next entry on stack + unsigned depth; // total number of entries descending from this +@@ -127,16 +127,16 @@ public: + + // Constructor for regular output. + PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate, +- Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox); ++ Dict *resDict, const PDFRectangle *box, const PDFRectangle *cropBox); + + // Constructor for a sub-page object. + PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA, +- Dict *resDict, PDFRectangle *box); ++ Dict *resDict, const PDFRectangle *box); + + virtual ~PdfParser(); + + // Interpret a stream or array of streams. +- void parse(Object *obj, GBool topLevel = gTrue); ++ void parse(Object *obj, bool topLevel = true); + + // Save graphics state. + void saveState(); +@@ -154,12 +154,12 @@ private: + + XRef *xref; // the xref table for this PDF file + SvgBuilder *builder; // SVG generator +- GBool subPage; // is this a sub-page object? +- GBool printCommands; // print the drawing commands (for debugging) ++ bool subPage; // is this a sub-page object? ++ bool printCommands; // print the drawing commands (for debugging) + GfxResources *res; // resource stack + + GfxState *state; // current graphics state +- GBool fontChanged; // set if font or text matrix has changed ++ bool fontChanged; // set if font or text matrix has changed + GfxClipType clip; // do a clip? + int ignoreUndef; // current BX/EX nesting level + double baseMatrix[6]; // default matrix for most recent +@@ -183,10 +183,10 @@ private: + OpHistoryEntry *popOperator(); + const char *getPreviousOperator(unsigned int look_back=1); // returns the nth previous operator's name + +- void go(GBool topLevel); ++ void go(bool topLevel); + void execOp(Object *cmd, Object args[], int numArgs); +- PdfOperator *findOp(char *name); +- GBool checkArg(Object *arg, TchkType type); ++ PdfOperator *findOp(const char *name); ++ bool checkArg(Object *arg, TchkType type); + int getPos(); + + // graphics state operators +@@ -200,9 +200,9 @@ private: + void opSetMiterLimit(Object args[], int numArgs); + void opSetLineWidth(Object args[], int numArgs); + void opSetExtGState(Object args[], int numArgs); +- void doSoftMask(Object *str, GBool alpha, ++ void doSoftMask(Object *str, bool alpha, + GfxColorSpace *blendingColorSpace, +- GBool isolated, GBool knockout, ++ bool isolated, bool knockout, + Function *transferFunc, GfxColor *backdropColor); + void opSetRenderingIntent(Object args[], int numArgs); + +@@ -239,11 +239,11 @@ private: + void opCloseFillStroke(Object args[], int numArgs); + void opEOFillStroke(Object args[], int numArgs); + void opCloseEOFillStroke(Object args[], int numArgs); +- void doFillAndStroke(GBool eoFill); +- void doPatternFillFallback(GBool eoFill); ++ void doFillAndStroke(bool eoFill); ++ void doPatternFillFallback(bool eoFill); + void doPatternStrokeFallback(); + void doShadingPatternFillFallback(GfxShadingPattern *sPat, +- GBool stroke, GBool eoFill); ++ bool stroke, bool eoFill); + void opShFill(Object args[], int numArgs); + void doFunctionShFill(GfxFunctionShading *shading); + void doFunctionShFill1(GfxFunctionShading *shading, +@@ -256,7 +256,7 @@ private: + double x2, double y2, GfxColor *color2, + int nComps, int depth); + void doPatchMeshShFill(GfxPatchMeshShading *shading); +- void fillPatch(GfxPatch *patch, int nComps, int depth); ++ void fillPatch(const GfxPatch *patch, int nComps, int depth); + void doEndPath(); + + // path clipping operators +@@ -291,13 +291,13 @@ private: + + // XObject operators + void opXObject(Object args[], int numArgs); +- void doImage(Object *ref, Stream *str, GBool inlineImg); ++ void doImage(Object *ref, Stream *str, bool inlineImg); + void doForm(Object *str); + void doForm1(Object *str, Dict *resDict, double *matrix, double *bbox, +- GBool transpGroup = gFalse, GBool softMask = gFalse, ++ bool transpGroup = false, bool softMask = false, + GfxColorSpace *blendingColorSpace = NULL, +- GBool isolated = gFalse, GBool knockout = gFalse, +- GBool alpha = gFalse, Function *transferFunc = NULL, ++ bool isolated = false, bool knockout = false, ++ bool alpha = false, Function *transferFunc = NULL, + GfxColor *backdropColor = NULL); + + // in-line image operators +--- inkscape-0.92.3/src/extension/internal/pdfinput/svg-builder.cpp ++++ inkscape-0.92.3/src/extension/internal/pdfinput/svg-builder.cpp +@@ -264,10 +264,10 @@ static void svgSetTransform(Inkscape::XM + /** + * \brief Generates a SVG path string from poppler's data structure + */ +-static gchar *svgInterpretPath(GfxPath *path) { ++static gchar *svgInterpretPath(const GfxPath *path) { + Inkscape::SVG::PathString pathString; + for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) { +- GfxSubpath *subpath = path->getSubpath(i); ++ const GfxSubpath *subpath = path->getSubpath(i); + if (subpath->getNumPoints() > 0) { + pathString.moveTo(subpath->getX(0), subpath->getY(0)); + int j = 1; +@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPat + if ( pattern != NULL ) { + if ( pattern->getType() == 2 ) { // Shading pattern + GfxShadingPattern *shading_pattern = static_cast(pattern); +- double *ptm; ++ const double *ptm; + double m[6] = {1, 0, 0, 1, 0, 0}; + double det; + +@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern( + + Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern"); + // Set pattern transform matrix +- double *p2u = tiling_pattern->getMatrix(); ++ const double *p2u = tiling_pattern->getMatrix(); + double m[6] = {1, 0, 0, 1, 0, 0}; + double det; + det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2]; // see LP Bug 1168908 +@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern( + pattern_node->setAttribute("patternUnits", "userSpaceOnUse"); + // Set pattern tiling + // FIXME: don't ignore XStep and YStep +- double *bbox = tiling_pattern->getBBox(); ++ const double *bbox = tiling_pattern->getBBox(); + sp_repr_set_svg_double(pattern_node, "x", 0.0); + sp_repr_set_svg_double(pattern_node, "y", 0.0); + sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]); +@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern( + */ + gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) { + Inkscape::XML::Node *gradient; +- Function *func; ++ const Function *func; + int num_funcs; + bool extend0, extend1; + +@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxSha + + #define INT_EPSILON 8 + bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading, +- Function *func) { ++ const Function *func) { + int type = func->getType(); + if ( type == 0 || type == 2 ) { // Sampled or exponential function + GfxRGB stop1, stop2; +@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inksc + _addStopToGradient(gradient, 1.0, &stop2, 1.0); + } + } else if ( type == 3 ) { // Stitching +- StitchingFunction *stitchingFunc = static_cast(func); +- double *bounds = stitchingFunc->getBounds(); +- double *encode = stitchingFunc->getEncode(); ++ auto stitchingFunc = static_cast(func); ++ const double *bounds = stitchingFunc->getBounds(); ++ const double *encode = stitchingFunc->getEncode(); + int num_funcs = stitchingFunc->getNumFuncs(); + + // Add stops from all the stitched functions +@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inksc + svgGetShadingColorRGB(shading, bounds[i + 1], &color); + // Add stops + if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn +- double expE = (static_cast(stitchingFunc->getFunc(i)))->getE(); ++ double expE = (static_cast(stitchingFunc->getFunc(i)))->getE(); + if (expE > 1.0) { + expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1 + if (encode[2*i] == 0) { // normal sequence +@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *st + GfxFont *font = state->getFont(); + // Store original name + if (font->getName()) { +- _font_specification = g_strdup(font->getName()->getCString()); ++ _font_specification = g_strdup(font->getName()->c_str()); + } else { + _font_specification = (char*) "Arial"; + } +@@ -1047,7 +1047,7 @@ void SvgBuilder::updateFont(GfxState *st + + // Font family + if (font->getFamily()) { // if font family is explicitly given use it. +- sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->getCString()); ++ sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->c_str()); + } else { + int attr_value = 1; + sp_repr_get_int(_preferences, "localFonts", &attr_value); +@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *st + Inkscape::CSSOStringStream os_font_size; + double css_font_size = _font_scaling * state->getFontSize(); + if ( font->getType() == fontType3 ) { +- double *font_matrix = font->getFontMatrix(); ++ const double *font_matrix = font->getFontMatrix(); + if ( font_matrix[0] != 0.0 ) { + css_font_size *= font_matrix[3] / font_matrix[0]; + } +@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(doub + void SvgBuilder::updateTextMatrix(GfxState *state) { + _flushText(); + // Update text matrix +- double *text_matrix = state->getTextMat(); ++ const double *text_matrix = state->getTextMat(); + double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] ); + double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] ); + double max_scale; +@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *s + void SvgBuilder::addChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, +- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) { ++ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) { + + + bool is_space = ( uLen == 1 && u[0] == 32 ); +--- inkscape-0.92.3/src/extension/internal/pdfinput/svg-builder.h ++++ inkscape-0.92.3/src/extension/internal/pdfinput/svg-builder.h +@@ -140,7 +140,7 @@ public: + void addChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, +- CharCode code, int nBytes, Unicode *u, int uLen); ++ CharCode code, int nBytes, Unicode const *u, int uLen); + void beginTextObject(GfxState *state); + void endTextObject(GfxState *state); + +@@ -174,7 +174,7 @@ private: + void _addStopToGradient(Inkscape::XML::Node *gradient, double offset, + GfxRGB *color, double opacity); + bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading, +- Function *func); ++ const Function *func); + gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state, + bool is_stroke=false); + // Image/mask creation diff --git a/SOURCES/inkscape.appdata.xml b/SOURCES/inkscape.appdata.xml new file mode 100644 index 0000000..1b66314 --- /dev/null +++ b/SOURCES/inkscape.appdata.xml @@ -0,0 +1,31 @@ + + + + + inkscape.desktop + CC0-1.0 + +

+ An Open Source vector graphics editor, with capabilities similar to Illustrator, + CorelDraw, or Xara X, using the W3C standard Scalable Vector Graphics (SVG) file + format. +

+

+ Inkscape supports many advanced SVG features (markers, clones, alpha blending, + etc.) and great care is taken in designing a streamlined interface. It is very + easy to edit nodes, perform complex path operations, trace bitmaps and much more. + We also aim to maintain a thriving user and developer community by using open, + community-oriented development. +

+ + http://inkscape.org/ + + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/inkscape/a.png + + + diff --git a/SPECS/inkscape.spec b/SPECS/inkscape.spec new file mode 100644 index 0000000..ca1db2c --- /dev/null +++ b/SPECS/inkscape.spec @@ -0,0 +1,1151 @@ +%global bundle_im 0 + +Name: inkscape +Version: 0.92.3 +Release: 16%{?dist} +Summary: Vector-based drawing program using SVG + +License: GPLv2+ and CC-BY +URL: http://inkscape.sourceforge.net/ +Source0: http://downloads.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 +#Source0: https://inkscape.org/en/gallery/item/10682/inkscape-0.92.1.tar_XlpI7qT.bz2 +#Source0: inkscape-r15740.tar.bz2 +# AppData file. Upstream has merged a patch adding an appdata file +# after into the 0.92 release branch. +Source1: %{name}.appdata.xml +# Fedora Color Palette, GIMP format, CC-BY 3.0 +Source2: Fedora-Color-Palette.gpl +Source3: ImageMagick-6.9.9.38-1.fc32.src.rpm +# https://gitlab.com/inkscape/inkscape/commit/9418824967eb4c53371ef8588243fed4cab496e0 +#Patch0: 0001-adapt-to-poppler-0.58.patch +Patch1: 0003-use-python2.patch +Patch2: inkscape-poppler-0.64.0.patch +Patch3: inkscape-poppler-0.65.0.patch +Patch4: inkscape-poppler-20.11.0.patch +Patch5: 0004-text-input-crash.patch + +BuildRequires: aspell-devel aspell-en +BuildRequires: atk-devel +BuildRequires: boost-devel +BuildRequires: cairo-devel +BuildRequires: dos2unix +BuildRequires: desktop-file-utils +BuildRequires: freetype-devel +BuildRequires: gc-devel >= 6.4 +BuildRequires: gettext +BuildRequires: gsl-devel +BuildRequires: gtkmm24-devel +BuildRequires: gtkspell3-devel +BuildRequires: intltool +BuildRequires: lcms2-devel +BuildRequires: libpng-devel >= 1.2 +BuildRequires: libwpg-devel +BuildRequires: libxml2-devel >= 2.6.11 +BuildRequires: libxslt-devel >= 1.0.15 +BuildRequires: pango-devel +BuildRequires: pkgconfig +BuildRequires: python2-devel +BuildRequires: poppler-glib-devel +BuildRequires: popt-devel +BuildRequires: libappstream-glib +BuildRequires: libtool +BuildRequires: potrace-devel +BuildRequires: cmake +BuildRequires: libwpd-devel +BuildRequires: dbus-glib-devel +BuildRequires: gtk3-devel +BuildRequires: libjpeg-devel +BuildRequires: libsigc++20-devel + +# ImageMagick BuildRequires +%if 0%{?bundle_im} +BuildRequires: bzip2-devel, freetype-devel +BuildRequires: libtiff-devel, giflib-devel, zlib-devel, perl-devel >= 5.8.1 +BuildRequires: perl-generators +BuildRequires: ghostscript-devel +BuildRequires: libwmf-devel, jasper-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: libX11-devel, libXext-devel, libXt-devel +BuildRequires: lcms2-devel, libxml2-devel, librsvg2-devel, OpenEXR-devel +BuildRequires: fftw-devel, OpenEXR-devel, libwebp-devel +BuildRequires: jbigkit-devel +BuildRequires: openjpeg2-devel >= 2.1.0 +%endif +#BuildRequires: autoconf automake gcc gcc-c++ + + + +# Disable all for now. TODO: Be smarter +%if 0 +Requires: dia +Requires: ghostscript +Requires: perl(Image::Magick) +Requires: transfig +Requires: gimp +%endif + +Requires: python2-lxml +Requires: python2-numpy +Suggests: uniconvertor +Requires: python2-scour + +# For ClipArt functionality +%if 0%{?flatpak} +Requires: gvfs-client +%else +Requires: gvfs +%endif + +Provides: bundled(libcroco) = 0.6 + +# Weak dependencies for the LaTeX plugin +Suggests: pstoedit +Suggests: tex(latex) +Suggests: tex(dvips) +Suggests: texlive-amsmath +Suggests: texlive-amsfonts + +%description +Inkscape is a vector graphics editor, with capabilities similar to +Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector +Graphics (SVG) file format. It is therefore a very useful tool for web +designers and as an interchange format for desktop publishing. + +Inkscape supports many advanced SVG features (markers, clones, alpha +blending, etc.) and great care is taken in designing a streamlined +interface. It is very easy to edit nodes, perform complex path operations, +trace bitmaps and much more. + + +%package view +Summary: Viewing program for SVG files +Requires: inkscape = %{version}-%{release} + +%description view +Viewer for files in W3C standard Scalable Vector Graphics (SVG) file +format. + + +%package docs +Summary: Documentation for Inkscape + +%description docs +Tutorial and examples for Inkscape, a graphics editor for vector +graphics in W3C standard Scalable Vector Graphics (SVG) file format. + + +%prep +rpmbuild --showrc +%setup -q +#%%patch0 -p1 -b.poppler +%patch1 -p1 -b .python2 +%patch2 -p1 -b .poppler-0.64.0 +%patch3 -p1 -b .poppler-0.65.0 +%patch4 -p1 -b .poppler-20.11.0 +%patch5 -p0 -b .text-input-crash + +# https://bugs.launchpad.net/inkscape/+bug/314381 +# A couple of files have executable bits set, +# despite not being executable +find . -name '*.cpp' | xargs chmod -x +find . -name '*.h' | xargs chmod -x +find share/extensions -name '*.py' | xargs chmod -x +# Explicitly use python2 for the extensions +sed -i -e "s|#![ ]*/usr/bin/env python[ ]*\$|#!/usr/bin/env python2|" share/extensions/*.py + +# Fix end of line encodings +dos2unix -k -q share/extensions/*.py + +%build + +BUNDLED_PREFIX="%{_topdir}/RPMS" +function build_bundled_library() { + PACKAGE_RPM=$1 + PACKAGE_SOURCE=$2 + PACKAGE_DIR="%{_topdir}/RPMS" + + echo "Rebuilding library $PACKAGE_RPM from $PACKAGE_SOURCE for bundling"; echo "===============================" + rpmbuild --nodeps --define "_exec_prefix $BUNDLED_PREFIX" --rebuild $PACKAGE_SOURCE + if [ ! -f $PACKAGE_DIR/$PACKAGE_RPM ]; then + # Hack for tps tests + ARCH_STR=%{_arch} + %ifarch i386 i686 + ARCH_STR="i?86" + %endif + PACKAGE_DIR="$PACKAGE_DIR/$ARCH_STR" + fi + # Get rid of -debug package that we don't unpack them later + rm -f $PACKAGE_DIR/*debug*.rpm + # Unpack all rpm with given name to the .../rpmbuild/bundle + for rpm in $PACKAGE_DIR/$PACKAGE_RPM; do + echo "Installing $rpm" to $BUNDLED_PREFIX; echo "===============================" + pushd $BUNDLED_PREFIX + rpm2cpio $rpm | cpio -iduv + rm -f $rpm + popd + done +} + +INSTALL_PREFIX="usr" + +%if 0%{?flatpak} +export DEVLIBS_PATH=/app +export RHEL_ALLOW_PYTHON2_FOR_BUILD=1 +INSTALL_PREFIX="app" +%endif + +%if 0%{?bundle_im} +# First build and install bundled ImageMagick +build_bundled_library 'ImageMagick*.rpm' '%{SOURCE3}' +#FIXME %filter_provides $BUNDLED_PREFIX%{_libdir} +#FIXME %filter_from_requires /libMagick*.so.*/d +export PKG_CONFIG_PATH=$BUNDLED_PREFIX/$INSTALL_PREFIX/%{_lib}/pkgconfig +%endif + + +echo "===============================" +echo "Building Inkscape" +echo "===============================" +%cmake \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$CFLAGS -DNDEBUG -fno-strict-aliasing -I$BUNDLED_PREFIX/$INSTALL_PREFIX/include/ImageMagick-6" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$CXXFLAGS -DNDEBUG -I$BUNDLED_PREFIX/$INSTALL_PREFIX/include/ImageMagick-6" \ + -DCMAKE_Fortran_FLAGS_RELEASE:STRING="$FCFLAGS -DNDEBUG" \ +%if 0%{?bundle_im} + -DCMAKE_SHARED_LINKER_FLAGS:STRING="$LDFLAGS -L$BUNDLED_PREFIX%{_libdir} -Wl,-rpath,/$INSTALL_PREFIX/lib/inkscape" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="$LDFLAGS -L$BUNDLED_PREFIX%{_libdir} -Wl,-rpath,/$INSTALL_PREFIX/lib/inkscape" \ +%endif + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=/$INSTALL_PREFIX \ + -DINCLUDE_INSTALL_DIR:PATH=/$INSTALL_PREFIX/include \ + -DLIB_INSTALL_DIR:PATH=/$INSTALL_PREFIX/lib64 \ + -DSYSCONF_INSTALL_DIR:PATH=/etc \ + -DSHARE_INSTALL_PREFIX:PATH=/$INSTALL_PREFIX/share \ +%if "lib64" == "lib64" + -DLIB_SUFFIX=64 \ +%endif + -DBUILD_SHARED_LIBS:BOOL=OFF . +make %{?_smp_mflags} + + +%install +rpmbuild --showrc + +make install DESTDIR=$RPM_BUILD_ROOT +sed -i 's/Drawing Shortcut Group/X-Drawing Shortcut Group/g' $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +find $RPM_BUILD_ROOT -type f -name 'lib*.a' | xargs rm -f + +desktop-file-install --vendor="%{?desktop_vendor}" --delete-original --remove-key=TargetEnvironment \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop + + +# No skencil anymore +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh + +%if 0%{?flatpak} +# Pulls in ruby +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/simplepath.rb +%endif + +# Install and validate appdata file +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appdata.xml + +# Install Fedora Color Pallette +install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/ + +%find_lang %{name} --with-man + +# Add ImageMagick libraries and modules +%if 0%{?bundle_im} +BUNDLED_PREFIX="%{_topdir}/RPMS" +# Remove extra files +rm -rf $BUNDLED_PREFIX%{_prefix}/%{_lib}/pkgconfig +rm -rf $BUNDLED_PREFIX%{_prefix}/%{_lib}/perl5 +# Copy libraries to libdir +%{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}/%{_lib} +cp -r $BUNDLED_PREFIX%{_prefix}/%{_lib}/* $RPM_BUILD_ROOT%{_prefix}/%{_lib} +%endif + +%if 0%{?flatpak} +# Remove /usr/bin/env/python2? in a way that works for both /usr/bin/python2 +# and /app/bin/python2 (brp-mangle-shebangs doesn't) +grep -E -rl '^#!\s*/usr/bin/env\s+python' --include=\*.py "%{buildroot}" | + while read file; do + sed -r '1s,^#!\s*/usr/bin/env\s+python(2?)(\s|$),#!%{__python2}\2,' -i "$file" + done +%endif + +#%check +# XXX: Tests fail, ignore it for now +#make -k check || : + + + +%files -f %{name}.lang +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS NEWS README +%{_bindir}/inkscape +%dir %{_datadir}/inkscape +%{_datadir}/inkscape/attributes +%{_datadir}/inkscape/branding +%{_datadir}/inkscape/extensions +# Pulls in perl, if needed should go into a -perl subpackage +%exclude %{_datadir}/inkscape/extensions/embed_raster_in_svg.pl +%{_datadir}/inkscape/filters +%{_datadir}/inkscape/fonts +%{_datadir}/inkscape/gradients +%{_datadir}/inkscape/icons +%{_datadir}/inkscape/keys +%{_datadir}/inkscape/markers +%{_datadir}/inkscape/palettes +%{_datadir}/inkscape/patterns +%{_datadir}/inkscape/screens +%{_datadir}/inkscape/symbols +%{_datadir}/inkscape/templates +%{_datadir}/inkscape/ui +%{_datadir}/appdata/*inkscape.appdata.xml +%{_datadir}/applications/*inkscape.desktop +%{_datadir}/icons/hicolor/*/*/inkscape* +%{_mandir}/*/* +%exclude %{_mandir}/man1/inkview.1* +%{_datadir}/inkscape/tutorials +%dir %{_prefix}/lib/inkscape +%{_prefix}/lib/inkscape/lib*.so + +%if 0%{?bundle_im} +%{_libdir}/libMagick* +%{_libdir}/ImageMagick-* +%endif + +%files view +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS NEWS README +%{_bindir}/inkview +%{_mandir}/man1/inkview.1* + + +%files docs +%license COPYING +%dir %{_datadir}/inkscape +%{_datadir}/inkscape/examples + + +%changelog +* Mon Nov 08 2021 Jan Horak - 0.92.3-16 +- Fixing crashes on text input, rhbz#1997106 + +* Thu May 13 2021 Jan Horak - 0.92.3-15 +- Added python dependency for the flatpak too + +* Mon May 10 2021 Jan Horak - 0.92.3-14 +- Use rpath only for the bundled im + +* Wed Jul 10 2019 Jan Horak - 0.92.3-13 +- Rebuild due to newer poppler + +* Mon Oct 15 2018 Jan Horak - 0.92.3-11 +- Fixed cflags and inkscape-view dependency + +* Wed Sep 5 2018 Jan Horak - 0.92.3-10 +- Stop using bundled ImageMagick + +* Thu Aug 9 2018 Jan Horak - 0.92.3-8 +- Filtering magick from requires/provides +- Removed libgdl depedency + +* Wed Jul 25 2018 Jan Horak - 0.92.3-6 +- Enable s390x again + +* Fri Jul 13 2018 Jan Horak - 0.92.3-5 +- Use python2 for building +- Fix building with poppler 0.66.0 + +* Tue May 22 2018 Jan Horak - 0.92.3-3 +- Use python2 for the extensions explicitly +- Exluding s390x, build problems, making no sense to build Inkscape for + mainframe hardware + +* Thu May 10 2018 Jan Horak - 0.92.3-2 +- Bundle ImageMagick into the package +- Removed gnome-vfs2-devel requirement +- Make uniconvertor weak dependency + +* Tue Apr 17 2018 Gwyn Ciesla - 0.92.3-1 +- 0.92.3. + +* Fri Mar 23 2018 Marek Kasik - 0.92.2-8 +- Rebuild for poppler-0.63.0 + +* Thu Mar 01 2018 Iryna Shcherbina - 0.92.2-7 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Feb 14 2018 David Tardon - 0.92.2-6 +- rebuild for poppler 0.62.0 + +* Wed Feb 07 2018 Fedora Release Engineering - 0.92.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 11 2018 Igor Gnatenko - 0.92.2-4 +- Remove obsolete scriptlets + +* Wed Nov 08 2017 David Tardon - 0.92.2-3 +- rebuild for poppler 0.61.0 + +* Fri Oct 06 2017 David Tardon - 0.92.2-2 +- rebuild for poppler 0.60.1 + +* Mon Sep 25 2017 Gwyn Ciesla - 0.92.2-1 +- 0.92.2 final. + +* Fri Sep 08 2017 David Tardon - 0.92.1-15.20170713bzr15740 +- rebuild for poppler 0.59.0 + +* Tue Sep 05 2017 Adam Williamson - 0.92.1-14.20170713bzr15740 +- Rebuild for ImageMagick 6 reversion, drop ImageMagick 7 patch + +* Sun Aug 27 2017 Ville Skyttä - 0.92.1-13.20170713bzr15740 +- Own the /usr/lib/inkscape dir +- %%langify non-English man pages + +* Fri Aug 25 2017 Michael Cronenworth - 0.92.1-12.20170713bzr15740 +- Rebuilt for ImageMagick + +* Tue Aug 08 2017 Gwyn Ciesla - 0.92.1-11.20170713bzr15740 +- Require aspell-en + +* Thu Aug 03 2017 David Tardon - 0.92.1-10.20170713bzr15740 +- rebuild for poppler 0.57.0 + +* Wed Aug 02 2017 Fedora Release Engineering - 0.92.1-9.20170713bzr15740 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Sun Jul 30 2017 Kevin Fenzi - 0.92.1-8.20170713bzr15740 +- Rebuilt for ImageMagick + +* Wed Jul 26 2017 Fedora Release Engineering - 0.92.1-7.20170713bzr15740 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jul 13 2017 Gwyn Ciesla - 0.92.1-6.20170713bzr15740 +- Updated snapshot. + +* Fri Jun 23 2017 Gwyn Ciesla - 0.92.1-5.20170510bzr15686 +- Move from gtkspell to gtkspell3, BZ 1464487. + +* Wed May 10 2017 Gwyn Ciesla - 0.92.1-4.20170510bzr15686 +- Update to fix on Wayland. +- Fix CFLAGS. + +* Tue Mar 28 2017 David Tardon - 0.92.1-3.20170321bzr15604 +- rebuild for poppler 0.53.0 + +* Tue Mar 21 2017 Gwyn Ciesla - 0.92.1-2.20170321bzr15604 +- Snapshot to fix gcc7 FTBFS. + +* Thu Feb 16 2017 Jon Ciesla - 0.92.1-1 +- 0.92.1 final. + +* Fri Feb 10 2017 Fedora Release Engineering - 0.92.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jan 05 2017 Jon Ciesla - 0.92.0-11 +- 0.92 final. + +* Fri Dec 30 2016 Jon Ciesla - 0.92-10.pre5 +- 0.92pre5. + +* Thu Dec 22 2016 Jon Ciesla - 0.92-9.pre4 +- 0.92pre4. + +* Fri Dec 16 2016 David Tardon - 0.92-8.pre3 +- rebuild for poppler 0.50.0 + +* Mon Nov 28 2016 Jon Ciesla - 0.92-7.pre3 +- 0.92pre3. +- Include Fedora Color Palette, BZ 981748 + +* Wed Nov 23 2016 David Tardon - 0.92-6.pre2 +- rebuild for poppler 0.49.0 + +* Fri Oct 28 2016 Jon Ciesla - 0.92-5.pre2 +- Require python-scour, BZ 1389772. + +* Fri Oct 28 2016 Jon Ciesla - 0.92-4.pre2 +- BR potrace-devel, BZ 1389772. + +* Fri Oct 21 2016 Jon Ciesla - 0.92-3.pre2 +- Fix release tag. + +* Fri Oct 21 2016 Marek Kasik - 0.92-2.pre2 +- Rebuild for poppler-0.48.0 + +* Wed Oct 19 2016 Jon Ciesla - 0.92-0.pre2 +- 0.92pre2. + +* Mon Jul 18 2016 Marek Kasik - 0.92-1.pre1 +- Rebuild for poppler-0.45.0 + +* Tue Jun 14 2016 Jon Ciesla - 0.92-0.pre1 +- 0.92pre1. +- Drop docs requirement on main package, BZ 1247239. + +* Tue May 17 2016 Jon Ciesla - 0.92-0.pre0 +- 0.92pre0, BZ 1336412. + +* Tue May 3 2016 Marek Kasik - 0.91-27 +- Rebuild for poppler-0.43.0 + +* Fri Apr 08 2016 Jon Ciesla - 0.91-26 +- Fix FTBFS with patch from https://bugzilla.gnome.org/show_bug.cgi?id=586626 + +* Mon Feb 22 2016 Orion Poplawski +- Rebuild for gsl 2.1 + +* Tue Feb 16 2016 Jonathan Underwood - 0.91-24 +- Add Requires for gvfs + +* Mon Feb 15 2016 Jonathan Underwood - 0.91-23 +- Break appdata file out of spec into its own file +- Validate appdata file once installed +- Add BuildRequires for libappstream-glib (provides appstream-util) +- Remove commented out line in file list +- Re-add export CXXFLAGS="%%{optflags} -std=c++11" to fix build + +* Mon Feb 15 2016 Jonathan Underwood - 0.91-22 +- Drop --disable-strict-build since this is fixed: + https://bugzilla.gnome.org/show_bug.cgi?id=752797 +- Drop export CXXFLAGS="%%{optflags} -std=c++11" since that's now default + +* Mon Feb 15 2016 Jonathan Underwood - 0.91-21 +- Remove BuildRequires for gnome-vfs2-devel + +* Thu Feb 04 2016 Fedora Release Engineering - 0.91-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 22 2016 Marek Kasik - 0.91-19 +- Rebuild for poppler-0.40.0 + +* Fri Jan 15 2016 Jonathan Wakely - 0.91-18 +- Rebuilt for Boost 1.60 + +* Wed Sep 23 2015 Kalev Lember - 0.91-17 +- Fix the build with latest glibmm24 + +* Thu Aug 27 2015 Jonathan Wakely - 0.91-16 +- Rebuilt for Boost 1.59 + +* Wed Aug 05 2015 Jonathan Wakely 0.91-15 +- Rebuilt for Boost 1.58 + +* Tue Aug 4 2015 Jonathan Underwood - 0.91-14 +- Remove some entries from unused Requires block that we now + explicitly Require or Suggests. + +* Tue Aug 4 2015 Jonathan Underwood - 0.91-13 +- Add Suggests deps for packages needed to enable LaTeX fragment + embedding + +* Wed Jul 29 2015 Fedora Release Engineering - 0.91-12 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + +* Thu Jul 23 2015 Adam Williamson - 0.91-11 +- --disable-strict-build (as gtkmm currently uses a deprecated glibmm symbol) + +* Wed Jul 22 2015 David Tardon +- rebuild for Boost 1.58 + +* Wed Jul 22 2015 Marek Kasik - 0.91-10 +- Rebuild (poppler-0.34.0) + +* Wed Jun 17 2015 Fedora Release Engineering - 0.91-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jun 5 2015 Marek Kasik - 0.91-8 +- Rebuild (poppler-0.33.0) + +* Wed Apr 29 2015 Kalev Lember - 0.91-7 +- Rebuilt for GCC 5 ABI change + +* Thu Mar 26 2015 Richard Hughes - 0.91-6 +- Add an AppData file for the software center + +* Fri Mar 06 2015 Jon Ciesla - 0.91-5 +- ImageMagick rebuild. + +* Thu Feb 12 2015 Peter Robinson 0.91-4 +- Cleanup spec +- Use %%license +- Drop (now unneeded) perl requirements (rhbz#579390) +- Drop ChangeLog as details are covered in NEWS + +* Wed Feb 04 2015 Petr Machata - 0.91-3 +- Bump for rebuild. + +* Fri Jan 30 2015 Jon Ciesla - 0.91-2 +- Move tutorials into main package, BZ 1187686. + +* Thu Jan 29 2015 Jon Ciesla - 0.91-1 +- Latest upstream. + +* Tue Jan 27 2015 Petr Machata - 0.48.5-7 +- Rebuild for boost 1.57.0 + +* Fri Jan 23 2015 Marek Kasik - 0.48.5-6 +- Rebuild (poppler-0.30.0) +- Backport commit "Fix build with poppler 0.29.0 (Bug #1399811)" + +* Fri Jan 09 2015 Jon Ciesla - 0.48.5-5 +- Added aspell support, BZ 1171934. + +* Thu Nov 27 2014 Marek Kasik - 0.48.5-4 +- Rebuild (poppler-0.28.1) + +* Thu Aug 28 2014 Jitka Plesnikova - 0.48.5-3 +- Perl 5.20 rebuild + +* Sat Aug 16 2014 Fedora Release Engineering - 0.48.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jul 21 2014 Jon Ciesla - 0.48.5-1 +- Latest bugfix release. +- Spurious comma patch upstreamed. +- Dropped Freetype, poppler, gc patches. + +* Sat Jun 07 2014 Fedora Release Engineering - 0.48.4-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Jun 03 2014 Jon Ciesla - 0.48.4-17 +- Switch to lcms2. + +* Tue May 27 2014 David Tardon - 0.48.4-16 +- switch to librevenge-based import libs + +* Fri May 23 2014 Petr Machata - 0.48.4-15 +- Rebuild for boost 1.55.0 + +* Thu May 15 2014 Lubomir Rintel - 0.48.4-14 +- Fix build with new Poppler and GC (Sandro Mani, #1097945) + +* Wed May 14 2014 Jon Ciesla - 0.48.4-13 +- poppler rebuild. + +* Mon Mar 31 2014 Jon Ciesla - 0.48.4-12 +- ImageMagick rebuild. +- Patch for Freetype path. + +* Wed Oct 09 2013 Jon Ciesla - 0.48.4-11 +- ImageMagick rebuild. + +* Mon Aug 19 2013 Marek Kasik - 0.48.4-10 +- Rebuild (poppler-0.24.0) + +* Sat Aug 03 2013 Fedora Release Engineering - 0.48.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 30 2013 Petr Machata - 0.48.4-8 +- Rebuild for boost 1.54.0 + +* Wed Jul 24 2013 Petr Pisar - 0.48.4-7 +- Perl 5.18 rebuild + +* Tue Jun 25 2013 Jon Ciesla - 0.48.4-6 +- libpoppler rebuild. + +* Mon Mar 18 2013 Jon Ciesla - 0.48.4-5 +- ImageMagick rebuild. + +* Fri Feb 15 2013 Jon Ciesla - 0.48.4-4 +- Fix FTBFS. + +* Thu Feb 14 2013 Fedora Release Engineering - 0.48.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jan 18 2013 Marek Kasik - 0.48.4-2 +- Rebuild (poppler-0.22.0) + +* Thu Dec 06 2012 Jon Ciesla - 0.48.3.1-4 +- 0.48.4, fix XXE security flaw. +- Correct man page ownership. + +* Thu Dec 06 2012 Jon Ciesla - 0.48.3.1-4 +- Fix directory ownership, BZ 873817. +- Fix previous changelog version. + +* Mon Nov 19 2012 Nils Philippsen - 0.48.3.1-3 +- update sourceforge download URL + +* Thu Nov 01 2012 Jon Ciesla - 0.48.3.1-2 +- Allow loading large XML, BZ 871012. + +* Fri Oct 05 2012 Jon Ciesla - 0.48.3.1-1 +- Lastest upstream. + +* Thu Oct 04 2012 Jon Ciesla - 0.48.2-13 +- Added dep on uniconvertor, BZ 796424. + +* Thu Jul 19 2012 Fedora Release Engineering - 0.48.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 09 2012 Petr Pisar - 0.48.2-11 +- Perl 5.16 rebuild + +* Mon Jul 2 2012 Marek Kasik - 0.48.2-10 +- Rebuild (poppler-0.20.1) + +* Wed Jun 27 2012 Petr Pisar - 0.48.2-9 +- Perl 5.16 rebuild + +* Sat Jun 23 2012 Rex Dieter +- 0.48.2-8 +- fix icon/desktop-file scriptlets (#739375) +- drop .desktop vendor (f18+) +- inkscape doesn't build with poppler-0.20.0 (#822413) + +* Fri Jun 15 2012 Petr Pisar - 0.48.2-7 +- Perl 5.16 rebuild + +* Mon Jun 11 2012 Adel Gadllah - 0.48.2-6 +- Rebuild for new poppler + +* Wed Apr 11 2012 Peter Robinson - 0.48.2-5 +- Rebuild for ImageMagik + +* Thu Mar 8 2012 Daniel Drake - 0.48.2-4 +- Fix build with GCC 4.7 + +* Tue Feb 28 2012 Fedora Release Engineering - 0.48.2-3 +- Rebuilt for c++ ABI breakage + +* Fri Jan 13 2012 Fedora Release Engineering - 0.48.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 15 2011 German Ruiz - 0.48.2-1 +- New upstream version +- Fix glib include compile problem +- Fix compilation against libpng-1.5 + +* Fri Oct 28 2011 Rex Dieter - 0.48.1-10 +- rebuild(poppler) + +* Fri Sep 30 2011 Marek Kasik - 0.48.1-9 +- Rebuild (poppler-0.18.0) + +* Mon Sep 19 2011 Marek Kasik - 0.48.1-8 +- Rebuild (poppler-0.17.3) + +* Thu Jul 21 2011 Petr Sabata - 0.48.1-7 +- Perl mass rebuild + +* Tue Jul 19 2011 Petr Sabata - 0.48.1-6 +- Perl mass rebuild + +* Fri Jul 15 2011 Marek Kasik - 0.48.1-5 +- Rebuild (poppler-0.17.0) + +* Sun Mar 13 2011 Marek Kasik - 0.48.1-4 +- Rebuild (poppler-0.16.3) + +* Wed Feb 09 2011 Fedora Release Engineering - 0.48.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Feb 09 2011 Lubomir Rintel - 0.48.1-2 +- Re-enable GVFS for OCAL + +* Mon Feb 07 2011 Lubomir Rintel - 0.48.1-1 +- Bump release + +* Fri Feb 04 2011 Lubomir Rintel - 0.48.0-10 +- Drop gnome-vfs requirement +- Fix Rawhide build + +* Sat Jan 01 2011 Rex Dieter - 0.48.0-9 +- rebuild (poppler) + +* Wed Dec 15 2010 Rex Dieter - 0.48.0-8 +- rebuild (poppler) + +* Wed Dec 08 2010 Caolán McNamara - 0.48.0-7 +- rebuilt (libwpd) + +* Sun Nov 14 2010 Lubomir Rintel - 0.48.0-6 +- rebuilt (poppler) + +* Tue Oct 05 2010 Nils Philippsen - 0.48.0-5 +- Rebuild for poppler update + +* Wed Sep 29 2010 jkeating - 0.48.0-4 +- Rebuilt for gcc bug 634757 + +* Wed Sep 29 2010 Dan Horák - 0.48.0-3 +- drop the s390(x) ExcludeArch + +* Mon Sep 20 2010 Tom "spot" Callaway - 0.48.0-2 +- rebuild for new ImageMagick + +* Wed Aug 25 2010 Lubomir Rintel - 0.48.0-1 +- New upstream release +- Drop el5 support + +* Thu Aug 19 2010 Rex Dieter - 0.48-0.5.20100505bzr +- rebuild (poppler) + +* Tue Jul 27 2010 David Malcolm - 0.48-0.4.20100505bzr +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Tue Jun 01 2010 Marcela Maslanova - 0.48-0.3.20100505bzr +- Mass rebuild with perl-5.12.0 + +* Wed May 05 2010 Lubomir Rintel - 0.48-0.2.20100505bzr +- Move to later snapshot +- Drop uniconvertor patch + +* Tue Apr 06 2010 Caolán McNamara - 0.48-0.2.20100318bzr +- Resolves: rhbz#565106 fix inkscape-0.47-x11.patch to not clobber INKSCAPE_LIBS + +* Thu Mar 18 2010 Lubomir Rintel - 0.48-0.1.20100318bzr +- Update to latest bazaar snapshot + +* Thu Feb 18 2010 Lubomir Rintel - 0.47-7 +- Fix build + +* Wed Jan 20 2010 Stepan Kasal - 0.47-6 +- ExcludeArch: s390 s390x + +* Fri Jan 15 2010 Stepan Kasal - 0.47-5 +- require perl(:MODULE_COMPAT_5.10.x) because the package requires libperl.so +- the same for inkscape-view + +* Fri Jan 8 2010 Owen Taylor - 0.47-4 +- Remove loudmouth BuildRequires; there is no current usage of loudmouth in the code + +* Sun Dec 06 2009 Lubomir Rintel - 0.47-2 +- Fix Rawhide build. + +* Wed Nov 25 2009 Lubomir Rintel - 0.47-1 +- Stable release + +* Mon Nov 23 2009 Adam Jackson 0.47-0.18.pre4.20091101svn +- Fix RHEL6 build. + +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.17.pre4.20091101svn +- Icon for main window (#532325) + +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre4.20091101svn +- Move to a later snapshot +- python-lxml and numpy seem to be rather popular, add them as hard deps + +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre3.20091017svn +- Move to a later snapshot + +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre3.20090925svn +- Move to a later snapshot +- Drop debugging compiler flags, enable optimizations again +- Make it build on everything since EL5 again + +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.16.pre2.20090907svn +- Move inkview man page to -view subpackage (#515358) +- Add license, etc. to main package + +* Mon Sep 07 2009 Lubomir Rintel - 0.47-0.15.pre2.20090907svn +- Update to a post-pre2 snapshot + +* Mon Aug 10 2009 Lubomir Rintel - 0.47-0.15.pre1.20090629svn +- Update to a post-pre1 snapshot +- Drop upstreamed CRC32 fix + +* Fri Jul 24 2009 Fedora Release Engineering - 0.47-0.14.pre0.20090629svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Jun 29 2009 Lubomir Rintel - 0.47-0.13.pre0.20090629svn +- Update to a newer snapshot + +* Tue Jun 16 2009 Lubomir Rintel - 0.47-0.12.pre0.20090616svn +- Update to post-pre0 snapshot + +* Tue Jun 02 2009 Lubomir Rintel - 0.47-0.11.20090602svn +- More recent snapshot +- Upstream removed rasterized icons again + +* Sat May 23 2009 Lubomir Rintel - 0.47-0.10.20090518svn +- Rebuild for new poppler + +* Mon May 18 2009 Lubomir Rintel - 0.47-0.9.20090518svn +- Update past upstream Beta release + +* Mon May 18 2009 Lubomir Rintel - 0.47-0.8.20090508svn +- Fix ODG export + +* Fri May 08 2009 Lubomir Rintel - 0.47-0.7.20090508svn +- Update to a post-alpha snapshot +- Upstream applied our GCC 4.4 patch + +* Fri Apr 10 2009 Lubomir Rintel - 0.47-0.6.20090410svn +- Update to newer snapshot +- Fix doc/incview reversed subpackage content + +* Wed Mar 04 2009 Lubomir Rintel - 0.47-0.6.20090301svn +- Rebuild for new ImageMagick + +* Wed Mar 04 2009 Lubomir Rintel - 0.47-0.5.20090301svn +- Split documentation and inkview into subpackages + +* Mon Mar 02 2009 Lubomir Rintel - 0.47-0.4.20090301svn +- Bump to later SVN snapshot to fix inkscape/+bug/331864 +- Fix a startup crash when compiled with GCC 4.4 +- It even runs now! :) + +* Fri Feb 27 2009 Lubomir Rintel - 0.47-0.4.20090227svn +- Enable the test suite + +* Fri Feb 27 2009 Lubomir Rintel - 0.47-0.3.20090227svn +- Past midnight! :) +- More recent snapshot, our gcc44 fixes now upstream +- One more gcc44 fix, it even compiles now +- We install icons now, update icon cache +- Disable inkboard, for it won't currently compile + +* Thu Feb 26 2009 Lubomir Rintel - 0.47-0.3.20090226svn +- Later snapshot +- Compile with GCC 4.4 + +* Tue Jan 06 2009 Lubomir Rintel - 0.47-0.3.20090105svn +- Update to newer SVN +- Drop upstreamed patches +- Enable WordPerfect Graphics support +- Enable embedded Perl scripting +- Enable Imagemagick support +- Disable OpenSSL due to licensing issues + +* Thu Aug 14 2008 Lubomir Rintel - 0.47-0.3.20080814svn +- Update to today's SVN snapshot +- Drop the upstreamed poppler patch + +* Wed Aug 13 2008 Lubomir Rintel - 0.47-0.2.20080705svn +- Rediff patches for zero fuzz +- Use uniconvertor to handle CDR and WMF (#458845) + +* Wed Jul 09 2008 Lubomir Rintel - 0.47-0.1.20080705svn +- Subversion snapshot + +* Wed Jul 09 2008 Lubomir Rintel - 0.46-4 +- Fix compile issues with newer gtk and poppler + +* Thu Jun 26 2008 Lubomir Rintel - 0.46-3 +- Remove useless old hack, that triggered an assert after gtkfilechooser switched to gio + +* Fri Apr 11 2008 Lubomir Kundrak - 0.46-2.1 +- More buildrequires more flexible, so that this builds on RHEL + +* Sat Apr 05 2008 Lubomir Kundrak - 0.46-2 +- Fix LaTeX rendering, #441017 + +* Tue Mar 25 2008 Lubomir Kundrak - 0.46-1 +- 0.46 released + +* Sun Mar 23 2008 Lubomir Kundrak - 0.46-0.3.pre3 +- Rebuild for newer Poppler + +* Wed Mar 12 2008 Lubomir Kundrak - 0.46-0.2.pre3 +- Probably last prerelease? + +* Fri Feb 22 2008 Lubomir Kundrak - 0.46-0.2.pre2 +- Panel icon sizes + +* Sun Feb 17 2008 Lubomir Kundrak - 0.46-0.1.pre2 +- 0.46pre2 +- Dropping upstreamed patches + +* Sat Feb 16 2008 Lubomir Kundrak - 0.45.1+0.46pre1-5 +- Attempt to fix the font selector (#432892) + +* Thu Feb 14 2008 Lubomir Kundrak - 0.45.1+0.46pre1-4 +- Tolerate recoverable errors in OCAL feeds +- Fix OCAL insecure temporary file usage (#432807) + +* Wed Feb 13 2008 Lubomir Kundrak - 0.45.1+0.46pre1-3 +- Fix crash when adding text objects (#432220) + +* Thu Feb 07 2008 Lubomir Kundrak - 0.45.1+0.46pre1-2 +- Build with gcc-4.3 + +* Wed Feb 06 2008 Lubomir Kundrak - 0.45.1+0.46pre1-1 +- 0.46 prerelease +- Minor cosmetic changes to satisfy the QA script +- Dependency on Boost +- Inkboard is not optional +- Merge from Denis Leroy's svn16571 snapshot: +- Require specific gtkmm24-devel versions +- enable-poppler-cairo +- No longer BuildRequire libsigc++20-devel + +* Wed Dec 5 2007 Denis Leroy - 0.45.1-5 +- Rebuild with new openssl + +* Sun Dec 02 2007 Lubomir Kundrak - 0.45.1-4 +- Added missing dependencies for modules (#301881) + +* Sun Dec 02 2007 Lubomir Kundrak - 0.45.1-3 +- Satisfy desktop-file-validate, so that Rawhide build won't break + +* Sat Dec 01 2007 Lubomir Kundrak - 0.45.1-2 +- Use GTK print dialog +- Added compressed SVG association (#245413) +- popt headers went into popt-devel, post Fedora 7 +- Fix macro usage in changelog + +* Wed Mar 21 2007 Denis Leroy - 0.45.1-1 +- Update to bugfix release 0.45.1 +- Added R to ImageMagick-perl (#231563) + +* Wed Feb 7 2007 Denis Leroy - 0.45-1 +- Update to 0.45 +- Enabled inkboard, perl and python extensions +- Added patch for correct python autodetection +- LaTex patch integrated upstreamed, removed +- Some rpmlint cleanups + +* Wed Dec 6 2006 Denis Leroy - 0.44.1-2 +- Added patches to fix LaTex import (#217699) +- Added patch to base postscript import on pstoedit plot-svg + +* Thu Sep 7 2006 Denis Leroy - 0.44.1-1 +- Update to 0.44.1 +- Removed png export patch, integrated upstream +- Some updated BRs + +* Mon Aug 28 2006 Denis Leroy - 0.44-6 +- FE6 Rebuild + +* Tue Aug 22 2006 Denis Leroy - 0.44-5 +- Removed skencil Require (bug 203229) + +* Thu Aug 10 2006 Denis Leroy - 0.44-4 +- Added patch to fix png dpi export problem (#168406) + +* Wed Aug 9 2006 Denis Leroy - 0.44-3 +- Bumping up release to fix upgrade path + +* Wed Jun 28 2006 Denis Leroy - 0.44-2 +- Update to 0.44 +- Removed obsolete patches +- Disabled experimental perl and python extensions +- Added pstoedit, skencil, gtkspell and LittleCms support +- Inkboard feature disabled pending further security tests + +* Tue Feb 28 2006 Denis Leroy - 0.43-3 +- Rebuild + +* Mon Jan 16 2006 Denis Leroy - 0.43-2 +- Updated GC patch, bug 171791 + +* Sat Dec 17 2005 Denis Leroy - 0.43-1 +- Update to 0.43 +- Added 2 patches to fix g++ 4.1 compilation issues +- Enabled new jabber/loudmouth-based inkboard feature + +* Mon Sep 26 2005 Denis Leroy - 0.42.2-2 +- rebuilt with newer glibmm + +* Thu Sep 1 2005 Michael Schwendt - 0.42.2-1 +- update to 0.42.2 + +* Thu Aug 18 2005 Michael Schwendt - 0.42-3 +- rebuilt +- add patch to repair link-check of GC >= 6.5 (needs pthread and dl) + +* Fri Jul 29 2005 Michael Schwendt - 0.42-2 +- Extend ngettext/dgettext patch for x86_64 build. + +* Tue Jul 26 2005 Michael Schwendt - 0.42-1 +- update to 0.42 (also fixes #160326) +- BR gnome-vfs2-devel +- no files left in %%_libdir/inkscape +- include French manual page +- GCC4 patch obsolete, 64-bit patch obsolete, dgettext patch split off + +* Tue May 31 2005 Michael Schwendt - 0.41-7 +- append another 64-bit related patch (dgettext configure check failed) + +* Tue May 31 2005 Michael Schwendt - 0.41-6 +- remove explicit aclocal/autoconf calls in %%build as they create a + bad Makefile for FC4/i386, which causes build to fail (#156228), + and no comment explains where they were added/needed + +* Tue May 31 2005 Michael Schwendt - 0.41-5 +- bump and rebuild as 0.41-4 failed in build system setup + +* Wed May 25 2005 Jeremy Katz - 0.41-4 +- add patch for gcc4 problems (ignacio, #156228) +- fix build on 64bit boxes. sizeof(int) != sizeof(void*) + +* Sun May 22 2005 Jeremy Katz - 0.41-3 +- rebuild on all arches + +* Thu Apr 07 2005 Michael Schwendt +- rebuilt + +* Wed Feb 09 2005 Phillip Compton - 0.41-1 +- 0.41. +- enable python. + +* Sat Dec 04 2004 Phillip Compton - 0.40-1 +- 0.40. + +* Tue Nov 16 2004 Phillip Compton - 0.40-0.pre3 +- 0.40pre3. + +* Thu Nov 11 2004 Phillip Compton - 0.39-0.fdr.2 +- post/postun for new mime system. +- Dropped redundant BR XFree86-devel. + +* Sun Aug 29 2004 Phillip Compton - 0:0.39-0.fdr.1 +- 0.39. + +* Sat Apr 10 2004 P Linnell 0:0.38.1-0.fdr.1 +- respin real fix for Provides/Requires for perl(SpSVG) + +* Fri Apr 9 2004 P Linnell 0:0.38.1-0.fdr.0 +- respin with updated tarball with fix for postscript printing + +* Thu Apr 8 2004 P Linnell 0:0.38-0.fdr.2 +- respin to fix provides + +* Thu Apr 8 2004 P Linnell 0:0.38.0.fdr.1 +- version upgrade with many improvements and bug fixes + +* Fri Mar 19 2004 P Linnell 0:0.37.0.fdr.7 +- repsin - sourceforge does not allow reloading files with same name +* Tue Mar 16 2004 P Linnell 0:0.37.0.fdr.6 +- fix typo in provides +* Tue Mar 16 2004 P Linnell 0:0.37.0.fdr.5 +- add %%{release} to provides perl(SpSVG) = %%{epoch}:%%{version}:%%{release} only +* Tue Mar 16 2004 P Linnell 0:0.37.0.fdr.4 +- add %%{release} to provides +* Sun Mar 14 2004 P Linnell 0:0.37.0.fdr.3 +- add arch dependent flags +* Thu Mar 11 2004 P Linnell 0:0.37.0.fdr.2 +- add libsigc++-devel instead of add libsigc++ - duh +- add BuildRequires: perl-XML-Parser +- fix package name to follow package naming guidelines +* Mon Mar 1 2004 P Linnell 0:0.37.1.fdr.1 +- disable static libs +- enable inkjar +* Tue Feb 10 2004 P Linnell 0:0.37.0.fdr.1 +- pgp'd tarball from inkscape.org +- clean out the cvs tweaks in spec file +- enable gnome-print +- add the new tutorial files +- make sure .mo file gets packaged +- add provides: perlSVG +- submit to Fedora QA +* Sat Feb 7 2004 P Linnell +- rebuild of current cvs +- tweaks to build cvs instead of dist tarball +- add inkview +* Sat Dec 20 2003 P Linnell +- First crack at Fedora/RH spec file +- nuke gnome print - it won't work (bug is filed already)