diff options
author | Bor Kraljič | 2009-12-02 20:17:53 +0100 |
---|---|---|
committer | Bor Kraljič | 2009-12-02 20:18:39 +0100 |
commit | 69ff01b3df42ddb8dc5421d3ace4ab3c150348f4 (patch) | |
tree | 41b360420b0bf9d1a37c5a7909805926f16b9841 | |
parent | 3b5f949695513ca2aa85d5117494b39a348f0646 (diff) |
inkscape: added patch to compile with poppler 0.12.2
-rw-r--r-- | graphics/inkscape/HISTORY | 5 | ||||
-rwxr-xr-x | graphics/inkscape/PRE_BUILD | 3 | ||||
-rw-r--r-- | graphics/inkscape/inkscape-poppler-0.12.2.patch | 89 |
3 files changed, 97 insertions, 0 deletions
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY index a7d8f5a891..bc862f2e84 100644 --- a/graphics/inkscape/HISTORY +++ b/graphics/inkscape/HISTORY @@ -1,3 +1,8 @@ +2009-12-02 Bor Kraljič <pyrobor@ver.si> + * inkscape-poppler-0.12.2.patch: patch to compile with poppler 0.12.2 + * PRE_BUILD: added, apply the patch; fixes bug #15505 + (upstream bug: https://bugs.launchpad.net/inkscape/+bug/487038) + 2009-11-21 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 0.47; fixed sig url * DEPENDS: added perl opt dep, gsl req dep; corrected poppler flags; diff --git a/graphics/inkscape/PRE_BUILD b/graphics/inkscape/PRE_BUILD new file mode 100755 index 0000000000..2613bdb6d0 --- /dev/null +++ b/graphics/inkscape/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +patch -Np1 < $SCRIPT_DIRECTORY/inkscape-poppler-0.12.2.patch diff --git a/graphics/inkscape/inkscape-poppler-0.12.2.patch b/graphics/inkscape/inkscape-poppler-0.12.2.patch new file mode 100644 index 0000000000..3c1f2a2a39 --- /dev/null +++ b/graphics/inkscape/inkscape-poppler-0.12.2.patch @@ -0,0 +1,89 @@ +--- inkscape-0.47/src/extension/internal/pdfinput/pdf-parser.cpp~ 2009-11-16 18:29:17.000000000 +0100 ++++ inkscape-0.47/src/extension/internal/pdfinput/pdf-parser.cpp 2009-11-24 19:09:47.000000000 +0100 +@@ -809,7 +809,7 @@ + blendingColorSpace = NULL; + isolated = knockout = gFalse; + if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { +- blendingColorSpace = GfxColorSpace::parse(&obj5); ++ blendingColorSpace = GfxColorSpace::parse(&obj5,(Gfx*)this); + } + obj5.free(); + if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) { +@@ -1009,9 +1009,9 @@ + state->setFillPattern(NULL); + res->lookupColorSpace(args[0].getName(), &obj); + if (obj.isNull()) { +- colorSpace = GfxColorSpace::parse(&args[0]); ++ colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this); + } else { +- colorSpace = GfxColorSpace::parse(&obj); ++ colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this); + } + obj.free(); + if (colorSpace) { +@@ -1032,9 +1032,9 @@ + state->setStrokePattern(NULL); + res->lookupColorSpace(args[0].getName(), &obj); + if (obj.isNull()) { +- colorSpace = GfxColorSpace::parse(&args[0]); ++ colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this); + } else { +- colorSpace = GfxColorSpace::parse(&obj); ++ colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this); + } + obj.free(); + if (colorSpace) { +@@ -1101,7 +1101,7 @@ + builder->updateStyle(state); + } + if (args[numArgs-1].isName() && +- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { ++ (pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) { + state->setFillPattern(pattern); + builder->updateStyle(state); + } +@@ -1145,7 +1145,7 @@ + builder->updateStyle(state); + } + if (args[numArgs-1].isName() && +- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { ++ (pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) { + state->setStrokePattern(pattern); + builder->updateStyle(state); + } +@@ -1543,7 +1543,7 @@ + double *matrix = NULL; + GBool savedState = gFalse; + +- if (!(shading = res->lookupShading(args[0].getName()))) { ++ if (!(shading = res->lookupShading(args[0].getName(),(Gfx*)this))) { + return; + } + +@@ -2507,7 +2507,7 @@ + } + } + if (!obj1.isNull()) { +- colorSpace = GfxColorSpace::parse(&obj1); ++ colorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this); + } else if (csMode == streamCSDeviceGray) { + colorSpace = new GfxDeviceGrayColorSpace(); + } else if (csMode == streamCSDeviceRGB) { +@@ -2592,7 +2592,7 @@ + obj2.free(); + } + } +- maskColorSpace = GfxColorSpace::parse(&obj1); ++ maskColorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this); + obj1.free(); + if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { + goto err1; +@@ -2767,7 +2767,7 @@ + if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { + transpGroup = gTrue; + if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { +- blendingColorSpace = GfxColorSpace::parse(&obj3); ++ blendingColorSpace = GfxColorSpace::parse(&obj3,(Gfx*)this); + } + obj3.free(); + if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) { |