| 1 |
maekke 10/01/31 12:32:23 |
| 2 |
|
| 3 |
Added: inkscape-0.47-poppler.patch |
| 4 |
Log: |
| 5 |
add patch from fedora to build with poppler-0.12.3 wrt bug #301250 |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-gfx/inkscape/files/inkscape-0.47-poppler.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/inkscape/files/inkscape-0.47-poppler.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/inkscape/files/inkscape-0.47-poppler.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: inkscape-0.47-poppler.patch |
| 15 |
=================================================================== |
| 16 |
Fix Rawhide build (more recent poppler) |
| 17 |
|
| 18 |
Lubomir Rintel <lkundrak@××.sk> |
| 19 |
|
| 20 |
|
| 21 |
Index: inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp |
| 22 |
=================================================================== |
| 23 |
--- inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp (revision 22620) |
| 24 |
+++ inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp (working copy) |
| 25 |
@@ -56,6 +56,13 @@ |
| 26 |
#define M_PI 3.14159265358979323846 |
| 27 |
#endif |
| 28 |
|
| 29 |
+#include <glib/poppler-features.h> |
| 30 |
+#if POPPLER_CHECK_VERSION(0,12,2) |
| 31 |
+#define PGFX ,NULL |
| 32 |
+#else |
| 33 |
+#define PGFX |
| 34 |
+#endif |
| 35 |
+ |
| 36 |
//------------------------------------------------------------------------ |
| 37 |
// constants |
| 38 |
//------------------------------------------------------------------------ |
| 39 |
@@ -809,7 +816,7 @@ |
| 40 |
blendingColorSpace = NULL; |
| 41 |
isolated = knockout = gFalse; |
| 42 |
if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { |
| 43 |
- blendingColorSpace = GfxColorSpace::parse(&obj5); |
| 44 |
+ blendingColorSpace = GfxColorSpace::parse(&obj5 PGFX); |
| 45 |
} |
| 46 |
obj5.free(); |
| 47 |
if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) { |
| 48 |
@@ -1009,9 +1016,9 @@ |
| 49 |
state->setFillPattern(NULL); |
| 50 |
res->lookupColorSpace(args[0].getName(), &obj); |
| 51 |
if (obj.isNull()) { |
| 52 |
- colorSpace = GfxColorSpace::parse(&args[0]); |
| 53 |
+ colorSpace = GfxColorSpace::parse(&args[0] PGFX); |
| 54 |
} else { |
| 55 |
- colorSpace = GfxColorSpace::parse(&obj); |
| 56 |
+ colorSpace = GfxColorSpace::parse(&obj PGFX); |
| 57 |
} |
| 58 |
obj.free(); |
| 59 |
if (colorSpace) { |
| 60 |
@@ -1032,9 +1039,9 @@ |
| 61 |
state->setStrokePattern(NULL); |
| 62 |
res->lookupColorSpace(args[0].getName(), &obj); |
| 63 |
if (obj.isNull()) { |
| 64 |
- colorSpace = GfxColorSpace::parse(&args[0]); |
| 65 |
+ colorSpace = GfxColorSpace::parse(&args[0] PGFX); |
| 66 |
} else { |
| 67 |
- colorSpace = GfxColorSpace::parse(&obj); |
| 68 |
+ colorSpace = GfxColorSpace::parse(&obj PGFX); |
| 69 |
} |
| 70 |
obj.free(); |
| 71 |
if (colorSpace) { |
| 72 |
@@ -1101,7 +1108,7 @@ |
| 73 |
builder->updateStyle(state); |
| 74 |
} |
| 75 |
if (args[numArgs-1].isName() && |
| 76 |
- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { |
| 77 |
+ (pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) { |
| 78 |
state->setFillPattern(pattern); |
| 79 |
builder->updateStyle(state); |
| 80 |
} |
| 81 |
@@ -1145,7 +1152,7 @@ |
| 82 |
builder->updateStyle(state); |
| 83 |
} |
| 84 |
if (args[numArgs-1].isName() && |
| 85 |
- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { |
| 86 |
+ (pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) { |
| 87 |
state->setStrokePattern(pattern); |
| 88 |
builder->updateStyle(state); |
| 89 |
} |
| 90 |
@@ -1543,7 +1550,7 @@ |
| 91 |
double *matrix = NULL; |
| 92 |
GBool savedState = gFalse; |
| 93 |
|
| 94 |
- if (!(shading = res->lookupShading(args[0].getName()))) { |
| 95 |
+ if (!(shading = res->lookupShading(args[0].getName() PGFX))) { |
| 96 |
return; |
| 97 |
} |
| 98 |
|
| 99 |
@@ -2507,7 +2514,7 @@ |
| 100 |
} |
| 101 |
} |
| 102 |
if (!obj1.isNull()) { |
| 103 |
- colorSpace = GfxColorSpace::parse(&obj1); |
| 104 |
+ colorSpace = GfxColorSpace::parse(&obj1 PGFX); |
| 105 |
} else if (csMode == streamCSDeviceGray) { |
| 106 |
colorSpace = new GfxDeviceGrayColorSpace(); |
| 107 |
} else if (csMode == streamCSDeviceRGB) { |
| 108 |
@@ -2592,7 +2599,7 @@ |
| 109 |
obj2.free(); |
| 110 |
} |
| 111 |
} |
| 112 |
- maskColorSpace = GfxColorSpace::parse(&obj1); |
| 113 |
+ maskColorSpace = GfxColorSpace::parse(&obj1 PGFX); |
| 114 |
obj1.free(); |
| 115 |
if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { |
| 116 |
goto err1; |
| 117 |
@@ -2767,7 +2774,7 @@ |
| 118 |
if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { |
| 119 |
transpGroup = gTrue; |
| 120 |
if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { |
| 121 |
- blendingColorSpace = GfxColorSpace::parse(&obj3); |
| 122 |
+ blendingColorSpace = GfxColorSpace::parse(&obj3 PGFX); |
| 123 |
} |
| 124 |
obj3.free(); |
| 125 |
if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) { |
Archives