Hello community,
here is the log from the commit of package inkscape for openSUSE:Factory
checked in at Fri Dec 18 14:26:57 CET 2009.
--------
--- GNOME/inkscape/inkscape.changes 2009-12-01 19:02:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/inkscape/inkscape.changes 2009-12-16 15:09:16.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Dec 16 15:06:57 CET 2009 - vuntz@opensuse.org
+
+- Add inkscape-poppler-0.12.2.patch to fix build with recent
+ poppler. This patch comes from Fedora, but was not committed
+ upstream. See lp#487038 for the discussion, and another patch.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
inkscape-poppler-0.12.2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ inkscape.spec ++++++
--- /var/tmp/diff_new_pack.l1wTsu/_old 2009-12-18 14:26:21.000000000 +0100
+++ /var/tmp/diff_new_pack.l1wTsu/_new 2009-12-18 14:26:21.000000000 +0100
@@ -19,7 +19,7 @@
Name: inkscape
Version: 0.47
-Release: 1
+Release: 2
License: GPLv2 ; LGPLv2.1
Summary: Vector Illustration Program
Url: http://www.inkscape.org/
@@ -30,6 +30,8 @@
Source2: inkscape-split-extensions-extra.sh
#PATCH-FIX-OPENSUSE inkscape-packages.patch sbrabec@suse.cz -- Suggest packages instead of compilation from source.
Patch1: inkscape-packages.patch
+# PATCH-FIX-UPSTREAM inkscape-poppler-0.12.2.patch lp#487038 vuntz@opensuse.org -- Fix compilation with recent poppler
+Patch2: inkscape-poppler-0.12.2.patch
# PATCH-FIX-OPENSUSE inkscape-remove-datetime.patch vuntz@novell.com -- Do not put date/time in the compiled binary (needed for build-compare)
Patch18: inkscape-remove-datetime.patch
BuildRequires: boost-devel
@@ -156,6 +158,7 @@
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
%patch18 -p1
%build
++++++ inkscape-poppler-0.12.2.patch ++++++
Fix Rawhide build (more recent poppler)
Lubomir Rintel
Index: inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp
===================================================================
--- inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp (revision 22620)
+++ inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp (working copy)
@@ -56,6 +56,13 @@
#define M_PI 3.14159265358979323846
#endif
+#include
+#if POPPLER_CHECK_VERSION(0,12,2)
+#define PGFX ,NULL
+#else
+#define PGFX
+#endif
+
//------------------------------------------------------------------------
// constants
//------------------------------------------------------------------------
@@ -809,7 +816,7 @@
blendingColorSpace = NULL;
isolated = knockout = gFalse;
if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) {
- blendingColorSpace = GfxColorSpace::parse(&obj5);
+ blendingColorSpace = GfxColorSpace::parse(&obj5 PGFX);
}
obj5.free();
if (obj4.dictLookup(const_cast("I"), &obj5)->isBool()) {
@@ -1009,9 +1016,9 @@
state->setFillPattern(NULL);
res->lookupColorSpace(args[0].getName(), &obj);
if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0]);
+ colorSpace = GfxColorSpace::parse(&args[0] PGFX);
} else {
- colorSpace = GfxColorSpace::parse(&obj);
+ colorSpace = GfxColorSpace::parse(&obj PGFX);
}
obj.free();
if (colorSpace) {
@@ -1032,9 +1039,9 @@
state->setStrokePattern(NULL);
res->lookupColorSpace(args[0].getName(), &obj);
if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0]);
+ colorSpace = GfxColorSpace::parse(&args[0] PGFX);
} else {
- colorSpace = GfxColorSpace::parse(&obj);
+ colorSpace = GfxColorSpace::parse(&obj PGFX);
}
obj.free();
if (colorSpace) {
@@ -1101,7 +1108,7 @@
builder->updateStyle(state);
}
if (args[numArgs-1].isName() &&
- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+ (pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
state->setFillPattern(pattern);
builder->updateStyle(state);
}
@@ -1145,7 +1152,7 @@
builder->updateStyle(state);
}
if (args[numArgs-1].isName() &&
- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
+ (pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
state->setStrokePattern(pattern);
builder->updateStyle(state);
}
@@ -1543,7 +1550,7 @@
double *matrix = NULL;
GBool savedState = gFalse;
- if (!(shading = res->lookupShading(args[0].getName()))) {
+ if (!(shading = res->lookupShading(args[0].getName() PGFX))) {
return;
}
@@ -2507,7 +2514,7 @@
}
}
if (!obj1.isNull()) {
- colorSpace = GfxColorSpace::parse(&obj1);
+ colorSpace = GfxColorSpace::parse(&obj1 PGFX);
} else if (csMode == streamCSDeviceGray) {
colorSpace = new GfxDeviceGrayColorSpace();
} else if (csMode == streamCSDeviceRGB) {
@@ -2592,7 +2599,7 @@
obj2.free();
}
}
- maskColorSpace = GfxColorSpace::parse(&obj1);
+ maskColorSpace = GfxColorSpace::parse(&obj1 PGFX);
obj1.free();
if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
goto err1;
@@ -2767,7 +2774,7 @@
if (obj1.dictLookup(const_cast("S"), &obj2)->isName(const_cast("Transparency"))) {
transpGroup = gTrue;
if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) {
- blendingColorSpace = GfxColorSpace::parse(&obj3);
+ blendingColorSpace = GfxColorSpace::parse(&obj3 PGFX);
}
obj3.free();
if (obj1.dictLookup(const_cast("I"), &obj3)->isBool()) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org