diff options
author | wiz <wiz@pkgsrc.org> | 2015-01-08 16:34:29 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2015-01-08 16:34:29 +0000 |
commit | 468142248be7103ae5f4e595b81e5e6b90d3ee44 (patch) | |
tree | 020f5b3a303e8a1a439eb6382c50d3f2b371560a /graphics | |
parent | 0bdc39ff915e308ecaf041c5979702ffe9b0cda1 (diff) | |
download | pkgsrc-468142248be7103ae5f4e595b81e5e6b90d3ee44.tar.gz |
Fix build with poppler-0.29+ based on
https://bugs.launchpad.net/inkscape/+bug/1399811
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/inkscape/distinfo | 4 | ||||
-rw-r--r-- | graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp | 87 |
2 files changed, 86 insertions, 5 deletions
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo index 8ab4fb021ce..5ee7b1252db 100644 --- a/graphics/inkscape/distinfo +++ b/graphics/inkscape/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.53 2014/07/29 07:03:27 adam Exp $ +$NetBSD: distinfo,v 1.54 2015/01/08 16:34:29 wiz Exp $ SHA1 (inkscape-0.48.5.tar.bz2) = 83ddb0c96069638f712a869039989bfd7d79c6a8 RMD160 (inkscape-0.48.5.tar.bz2) = c05e861dd458245193373f40790035339aac3e01 @@ -17,7 +17,7 @@ SHA1 (patch-ap) = 134a47053020547703906140ff744e875ca1284f SHA1 (patch-aq) = dd307f598741cd5f0ff35eb06dff7c685752a979 SHA1 (patch-src_dom_io_domstream.cpp) = 6b525b8e730e4497afdf1da0ae27f0dc69bfad40 SHA1 (patch-src_dom_io_domstream.h) = 9325fc9d211eb3349628a736283ed0c475399a8b -SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = cdf23f9d98c1c2096bf99b05b23b1d8184fc007c +SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 92e7ddbade362f768a8ecc8e082b4e666643ba86 SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = 9e9e76049b9fdcc5192e225b4b477a104902894b SHA1 (patch-src_io_inkjar.cpp) = 060d59225cfe7b66db5e9f41e76860df9ce12d01 SHA1 (patch-src_trace_siox.cpp) = daeff4626dace6997f64ab9c96b0bfb304e724c8 diff --git a/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp index c49afb02949..c35b925d267 100644 --- a/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp +++ b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp @@ -1,14 +1,95 @@ -$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.3 2014/07/29 07:03:27 adam Exp $ +$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.4 2015/01/08 16:34:29 wiz Exp $ Object.h is included in pdf-parser.h -- see patch for pdf-parser.h. ---- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2012-12-13 17:00:46.000000000 +0000 +Fix build with poppler-0.29+ based on https://bugs.launchpad.net/inkscape/+bug/1399811 + +--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2014-06-09 13:24:41.000000000 +0000 +++ src/extension/internal/pdfinput/pdf-parser.cpp -@@ -38,7 +38,6 @@ extern "C" { +@@ -38,7 +38,7 @@ extern "C" { #include "goo/GooHash.h" #include "GlobalParams.h" #include "CharTypes.h" -#include "Object.h" ++#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1 #include "Array.h" #include "Dict.h" #include "Stream.h" +@@ -860,7 +859,9 @@ void PdfParser::opSetExtGState(Object ar + blendingColorSpace = NULL; + isolated = knockout = gFalse; + if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL); ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) + blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL); + #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); +@@ -1085,7 +1086,13 @@ void PdfParser::opSetFillColorSpace(Obje + + state->setFillPattern(NULL); + res->lookupColorSpace(args[0].getName(), &obj); +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ if (obj.isNull()) { ++ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); ++ } else { ++ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); ++ } ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) + if (obj.isNull()) { + colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); + } else { +@@ -1126,7 +1133,13 @@ void PdfParser::opSetStrokeColorSpace(Ob + + state->setStrokePattern(NULL); + res->lookupColorSpace(args[0].getName(), &obj); +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ if (obj.isNull()) { ++ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); ++ } else { ++ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); ++ } ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) + if (obj.isNull()) { + colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); + } else { +@@ -2756,8 +2769,10 @@ void PdfParser::doImage(Object *ref, Str + } + } + if (!obj1.isNull()) { +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) +- colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); + #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + colorSpace = GfxColorSpace::parse(&obj1, NULL); + #else +@@ -2847,8 +2862,10 @@ void PdfParser::doImage(Object *ref, Str + obj2.free(); + } + } +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) +- GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); + #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + maskColorSpace = GfxColorSpace::parse(&obj1, NULL); + #else +@@ -3040,7 +3057,9 @@ void PdfParser::doForm(Object *str) { + if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { + transpGroup = gTrue; + if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { +-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) ++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) ++ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL); ++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) + blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL); + #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) + blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); |