From fd43b4ec3770aeb6b10210423543e2307aba602334b077c231821fc775133bae Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 6 Dec 2018 13:52:20 +0000 Subject: [PATCH] Accepting request 653607 from home:iznogood:branches:graphics Switch to git checkout from stable branch. Fix build with new poppler and as a bonus get other bug fixes already in upstream git. OBS-URL: https://build.opensuse.org/request/show/653607 OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=43 --- Fix-compilation-poppler-0_65.patch | 150 -------------------- _service | 15 ++ _servicedata | 4 + inkscape-0.92.3+20181125.5aff6bad34.tar.bz2 | 3 + inkscape-0.92.3.tar.bz2 | 3 - inkscape.changes | 21 +++ inkscape.spec | 11 +- 7 files changed, 48 insertions(+), 159 deletions(-) delete mode 100644 Fix-compilation-poppler-0_65.patch create mode 100644 _service create mode 100644 _servicedata create mode 100644 inkscape-0.92.3+20181125.5aff6bad34.tar.bz2 delete mode 100644 inkscape-0.92.3.tar.bz2 diff --git a/Fix-compilation-poppler-0_65.patch b/Fix-compilation-poppler-0_65.patch deleted file mode 100644 index e19b4a2..0000000 --- a/Fix-compilation-poppler-0_65.patch +++ /dev/null @@ -1,150 +0,0 @@ -From f0697de012598ea84edafea9a326e5e101eccd2a 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 - -(cherry picked from commit a600c6438fef2f4c06f9a4a7d933d99fb054a973) ---- - 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 604b7f8079..721524e10a 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 a448be6397..617861928d 100644 ---- a/src/extension/internal/pdfinput/svg-builder.cpp -+++ b/src/extension/internal/pdfinput/svg-builder.cpp -@@ -1020,7 +1020,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"; - } -@@ -1361,7 +1361,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 - - -From 332a80f4847715546be9a00756f693b4aa1316e2 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 6c498f9..caaeca1 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.0 diff --git a/_service b/_service new file mode 100644 index 0000000..6be4a76 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + https://gitlab.com/inkscape/inkscape.git + git + 0.92.x + 0.92.3+%cd.%h + enable + + + *.tar + bz2 + + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..e187bdf --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://gitlab.com/inkscape/inkscape.git + 5aff6bad34a274c9b5937e075edccbf159395029 \ No newline at end of file diff --git a/inkscape-0.92.3+20181125.5aff6bad34.tar.bz2 b/inkscape-0.92.3+20181125.5aff6bad34.tar.bz2 new file mode 100644 index 0000000..9c8ecd2 --- /dev/null +++ b/inkscape-0.92.3+20181125.5aff6bad34.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20ee95ece9e743f18c45bffdc1653a71447cd9ac78e05b05e35fc498ee240c0d +size 31635111 diff --git a/inkscape-0.92.3.tar.bz2 b/inkscape-0.92.3.tar.bz2 deleted file mode 100644 index 6f59fb7..0000000 --- a/inkscape-0.92.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:063296c05a65d7a92a0f627485b66221487acfc64a24f712eb5237c4bd7816b2 -size 31606442 diff --git a/inkscape.changes b/inkscape.changes index 3286588..65c39c6 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Dec 03 21:39:34 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 0.92.3+20181125.5aff6bad34: + * Backport from master, Fix bug 1804946: Measurement tool is very + slow when using grids This move from Namedview to a new + prefernes value of type point to not reload full namedvies/grid + on meassure + * CMake: Do not override CMAKE__LINK_EXECUTABLE variables + * CMake: Specifically enable Microsoft bit-field layout for + structs + * CMake/MSYS2: Add new dependency of libtiff (libzstd) + * Fix build with poppler-0.71.0 + * Fix encoding of "title" label in win32 native file dialog + * ShapeEditor: Always keep KnotHolders in set_item() + * CI: Fix wrong path in docker registry for 14.04 + * CI: Make ccache and -std=c++98 actually work with old CMake + * Fix code incompatible with old gcc / C++ < 11 +- Switch to source service checkout from stable branch. +- Drop Fix-compilation-poppler-0_65.patch: Fixed upstream. + ------------------------------------------------------------------- Mon Jul 9 14:23:19 UTC 2018 - bjorn.lie@gmail.com diff --git a/inkscape.spec b/inkscape.spec index d237ac4..58d8109 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -12,18 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: inkscape -Version: 0.92.3 +Version: 0.92.3+20181125.5aff6bad34 Release: 0 Summary: Vector Illustration Program License: GPL-3.0-only Group: Productivity/Graphics/Vector Editors Url: http://www.inkscape.org/ -Source: https://media.inkscape.org/dl/resources/file/%{name}-%{version}.tar.bz2 +#Source: https://media.inkscape.org/dl/resources/file/%%{name}-%%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 + # openSUSE palette file Source1: openSUSE.gpl Source2: inkscape-split-extensions-extra.sh @@ -33,8 +35,6 @@ Patch0: inkscape-packages.patch Patch1: build_internal_libraries_as_static.patch # PATCH-FIX-OPENSUSE fix_install_targets.patch -- use correct libdir etc. Patch2: fix_install_targets.patch -# PATCH-FIX-UPSTREAM Fix-compilation-poppler-0_65.patch -- Fix compilation with poppler 0.65.0 -Patch3: Fix-compilation-poppler-0_65.patch BuildRequires: gtkspell-devel %if 0%{?suse_version} > 1325 @@ -161,7 +161,6 @@ Inkscape is a vector graphics editor. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build %ifarch %{arm}