commit 1eb6e335f6388cad5864d585feeff616f3424529
Author: Jan Palus <[email protected]>
Date: Thu May 1 19:37:50 2014 +0200
- patch to fix build against poppler 0.26 (taken from arch)
- rel 9
inkscape-poppler-0.26.patch | 89 +++++++++++++++++++++++++++++++++++++++++++++
inkscape.spec | 4 +-
2 files changed, 92 insertions(+), 1 deletion(-)
---
diff --git a/inkscape.spec b/inkscape.spec
index 4a7bf45..d859280 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -16,7 +16,7 @@ Summary: Scalable vector graphics editor
Summary(pl.UTF-8): Edytor skalowalnej grafiki wektorowej
Name: inkscape
Version: 0.48.4
-Release: 8
+Release: 9
License: GPL v2+, LGPL v2.1+
Group: X11/Applications/Graphics
Source0:
http://downloads.sourceforge.net/inkscape/%{name}-%{version}%{beta}.tar.bz2
@@ -25,6 +25,7 @@ Source0:
http://downloads.sourceforge.net/inkscape/%{name}-%{version}%{beta}.tar
Patch0: %{name}-ldl.patch
Patch1: %{name}-0.48.2-types.patch
Patch2: %{name}-build.patch
+Patch3: %{name}-poppler-0.26.patch
URL: http://www.inkscape.org/
BuildRequires: ImageMagick-c++-devel
BuildRequires: aspell-devel
@@ -91,6 +92,7 @@ dwuwymiarowej grafiki wektorowej.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p0
%{__rm} po/[email protected]
%{__sed} -i -e 's|en_US@piglatin||' configure.ac
diff --git a/inkscape-poppler-0.26.patch b/inkscape-poppler-0.26.patch
new file mode 100644
index 0000000..84b324a
--- /dev/null
+++ b/inkscape-poppler-0.26.patch
@@ -0,0 +1,89 @@
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2014-04-28
13:42:17.843140695 +0000
++++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-04-28
14:05:10.646106685 +0000
+@@ -861,7 +861,7 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ }
+ #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 @@
+ }
+ #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 @@
+ 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 @@
+ }
+ 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 @@
+ }
+ }
+ #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 @@
+ 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/inkscape.git/commitdiff/1eb6e335f6388cad5864d585feeff616f3424529
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
