From d0ed5b3e111981a9c5ed8bed2cd4e8d9af096a49b675ec3f4b79674f2d321d63 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 21 Jul 2014 19:38:50 +0000 Subject: [PATCH] Accepting request 240740 from GNOME:Apps 1 OBS-URL: https://build.opensuse.org/request/show/240740 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=73 --- ...nal_pdfinput_pdf-parser_cpp-r13333-v2.diff | 92 ------------------- inkscape-0.48.4.tar.bz2 | 3 - inkscape-0.48.5.tar.bz2 | 3 + inkscape-gcc48-buildfix.patch | 13 --- ...ape-use-recommended-freetype-include.patch | 12 --- inkscape.changes | 15 +++ inkscape.spec | 15 +-- 7 files changed, 20 insertions(+), 133 deletions(-) delete mode 100644 bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff delete mode 100644 inkscape-0.48.4.tar.bz2 create mode 100644 inkscape-0.48.5.tar.bz2 delete mode 100644 inkscape-gcc48-buildfix.patch delete mode 100644 inkscape-use-recommended-freetype-include.patch diff --git a/bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff b/bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff deleted file mode 100644 index 46b89cc..0000000 --- a/bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff +++ /dev/null @@ -1,92 +0,0 @@ -=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp' -Index: src/extension/internal/pdfinput/pdf-parser.cpp -=================================================================== ---- src/extension/internal/pdfinput/pdf-parser.cpp.orig -+++ src/extension/internal/pdfinput/pdf-parser.cpp -@@ -861,7 +861,7 @@ void PdfParser::opSetExtGState(Object ar - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); -+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL); - #else - blendingColorSpace = GfxColorSpace::parse(&obj5); - #endif -@@ -1085,9 +1085,9 @@ void PdfParser::opSetFillColorSpace(Obje - res->lookupColorSpace(args[0].getName(), &obj); - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0], NULL); -+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); - } else { -- colorSpace = GfxColorSpace::parse(&obj, NULL); -+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL); - } - #else - if (obj.isNull()) { -@@ -1120,9 +1120,9 @@ void PdfParser::opSetStrokeColorSpace(Ob - res->lookupColorSpace(args[0].getName(), &obj); - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0], NULL); -+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); - } else { -- colorSpace = GfxColorSpace::parse(&obj, NULL); -+ colorSpace = GfxColorSpace::parse(&obj, NULL, NULL); - } - #else - if (obj.isNull()) { -@@ -1213,7 +1213,7 @@ void PdfParser::opSetFillColorN(Object a - } - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { -+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { - state->setFillPattern(pattern); - builder->updateStyle(state); - } -@@ -1273,7 +1273,7 @@ void PdfParser::opSetStrokeColorN(Object - } - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { -+ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) { - state->setStrokePattern(pattern); - builder->updateStyle(state); - } -@@ -1711,7 +1711,7 @@ void PdfParser::opShFill(Object args[], - GBool savedState = gFalse; - - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- if (!(shading = res->lookupShading(args[0].getName(), NULL))) { -+ if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) { - return; - } - #else -@@ -2727,7 +2727,7 @@ void PdfParser::doImage(Object *ref, Str - } - if (!obj1.isNull()) { - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- colorSpace = GfxColorSpace::parse(&obj1, NULL); -+ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); - #else - colorSpace = GfxColorSpace::parse(&obj1); - #endif -@@ -2816,7 +2816,7 @@ void PdfParser::doImage(Object *ref, Str - } - } - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- maskColorSpace = GfxColorSpace::parse(&obj1, NULL); -+ maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); - #else - maskColorSpace = GfxColorSpace::parse(&obj1); - #endif -@@ -3007,7 +3007,7 @@ void PdfParser::doForm(Object *str) { - transpGroup = gTrue; - if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { - #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) -- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); -+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL); - #else - blendingColorSpace = GfxColorSpace::parse(&obj3); - #endif diff --git a/inkscape-0.48.4.tar.bz2 b/inkscape-0.48.4.tar.bz2 deleted file mode 100644 index e614977..0000000 --- a/inkscape-0.48.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d -size 19712522 diff --git a/inkscape-0.48.5.tar.bz2 b/inkscape-0.48.5.tar.bz2 new file mode 100644 index 0000000..fdeb06b --- /dev/null +++ b/inkscape-0.48.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969 +size 19719332 diff --git a/inkscape-gcc48-buildfix.patch b/inkscape-gcc48-buildfix.patch deleted file mode 100644 index a011420..0000000 --- a/inkscape-gcc48-buildfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'src/widgets/desktop-widget.h' ---- src/widgets/desktop-widget.h 2011-06-06 06:43:00 +0000 -+++ src/widgets/desktop-widget.h 2013-01-05 14:34:09 +0000 -@@ -239,7 +239,7 @@ - private: - GtkWidget *tool_toolbox; - GtkWidget *aux_toolbox; -- GtkWidget *commands_toolbox,; -+ GtkWidget *commands_toolbox; - GtkWidget *snap_toolbox; - - static void init(SPDesktopWidget *widget); - diff --git a/inkscape-use-recommended-freetype-include.patch b/inkscape-use-recommended-freetype-include.patch deleted file mode 100644 index 2849248..0000000 --- a/inkscape-use-recommended-freetype-include.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/libnrtype/FontFactory.h.orig 2013-12-08 11:01:49.000000000 +0100 -+++ src/libnrtype/FontFactory.h 2013-12-08 11:02:22.000000000 +0100 -@@ -31,7 +31,8 @@ - #include - #else - #include --#include -+#include -+#include FT_FREETYPE_H - #endif - - namespace Glib diff --git a/inkscape.changes b/inkscape.changes index e26b082..f0a91a7 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Jul 11 20:57:03 UTC 2014 - dimstar@opensuse.org + +- Update to version 0.48.5: + + Adobe Illustrator SVG files containing entities can be loaded + again. + + Support for Poppler 0.26. + + Support for Boehm-GC 7.4.0 and later. + + Several crash bugs were fixed. + + 64-bit compilation is now possible on Windows. +- Drop upstream included patches: + + inkscape-gcc48-buildfix.patch. + + inkscape-use-recommended-freetype-include.patch. + + bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff. + ------------------------------------------------------------------- Tue May 13 19:44:15 UTC 2014 - coolo@suse.com diff --git a/inkscape.spec b/inkscape.spec index f1831a5..25551f5 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -17,13 +17,13 @@ Name: inkscape -Version: 0.48.4 +Version: 0.48.5 Release: 0 Summary: Vector Illustration Program License: GPL-2.0 and LGPL-2.1 Group: Productivity/Graphics/Vector Editors Url: http://www.inkscape.org/ -Source: http://downloads.sourceforge.net/project/inkscape/inkscape/0.48.4/%{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/project/inkscape/inkscape/0.48.5/%{name}-%{version}.tar.bz2 # openSUSE palette file Source1: openSUSE.gpl Source2: inkscape-split-extensions-extra.sh @@ -35,12 +35,6 @@ Patch1: inkscape-packages.patch Patch2: inkscape-return-on-exit.patch # PATCH-FIX-UPSTREAM inkscape-apply-invert-transform.patch bnc#779560 lp#840625 malcolmlewis@opensuse.org -- Apply invert transform to all image tags. Patch4: inkscape-apply-invert-transform.patch -# PATCH-FIX-UPSTREAM inkscape-gcc48-buildfix.patch lp#1095364 nicoduf@yahoo.fr -- Fix build with GCC 4.8. -Patch5: inkscape-gcc48-buildfix.patch -# PATCH-FIX-UPSTREAM inkscape-use-recommended-freetype-include.patch hrvoje.senjan@gmail.com -- Use freetype recommended include style -Patch6: inkscape-use-recommended-freetype-include.patch -# PATCH-FIX-UPSTREAM bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff lp#1315142 coolo@suse.com -- port to poppler 0.26 -Patch7: bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff BuildRequires: boost-devel BuildRequires: docbook-toys BuildRequires: fdupes @@ -164,11 +158,6 @@ Inkscape is a vector illustration program for the GNOME desktop. %patch1 -p1 %patch2 -p1 %patch4 -p1 -%patch5 -p0 -%patch6 -p0 -%if 0%{suse_version} > 1310 -%patch7 -p0 -%endif %build RPM_OPT_FLAGS="%{optflags}"