pool/inkscape
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 240740 from GNOME:Apps

Browse Source 
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
This commit is contained in:
Stephan Kulow 2014-07-21 19:38:50 +00:00 committed by Git OBS Bridge
parent 1567d730f5
commit d0ed5b3e11
7 changed files with 20 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff
View File

@ -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<char*>("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<char*>("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

3
inkscape-0.48.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d
size 19712522

3
inkscape-0.48.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969
size 19719332

13
inkscape-gcc48-buildfix.patch
View File

@ -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);

12
inkscape-use-recommended-freetype-include.patch
View File

@ -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 <pango/pangowin32.h>
#else
#include <pango/pangoft2.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#endif
namespace Glib

15
inkscape.changes
View File

@ -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

15
inkscape.spec
View File

@ -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}"