From 3f7741ecd668ebd85f6cce339a5b705601d1037c Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 30 Apr 2014 06:15:20 +0000 Subject: Fix build with poppler-0.26.0. Bump PKGREVISION. --- graphics/inkscape/Makefile | 4 +- graphics/inkscape/distinfo | 4 +- ...-src_extension_internal_pdfinput_pdf-parser.cpp | 93 +++++++++++++++++++++- 3 files changed, 95 insertions(+), 6 deletions(-) (limited to 'graphics/inkscape') diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 95d24da8859..fb0c446f757 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.103 2014/04/29 07:57:14 wiz Exp $ +# $NetBSD: Makefile,v 1.104 2014/04/30 06:15:20 wiz Exp $ DISTNAME= inkscape-0.48.4 -PKGREVISION= 21 +PKGREVISION= 22 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo index 58d2a0da563..d3fe1d0d98d 100644 --- a/graphics/inkscape/distinfo +++ b/graphics/inkscape/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.50 2014/04/17 06:20:27 wiz Exp $ +$NetBSD: distinfo,v 1.51 2014/04/30 06:15:20 wiz Exp $ SHA1 (inkscape-0.48.4.tar.bz2) = 5f26f6ad191d1e7c2a9fb69a438722beb172224c RMD160 (inkscape-0.48.4.tar.bz2) = b089ced7694a9803fac8588d93e7e6239c71d3e8 @@ -23,7 +23,7 @@ SHA1 (patch-src_color-profile.cpp) = 14932b25ed333925518d5140b3691a29e155cd9a SHA1 (patch-src_display_nr-filter-gaussian.cpp) = 344109eb4360560bfe8481b25588ef37e5140135 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) = 02742a022a8a55852d7f0a39969153bf7f24f17e +SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 783251007ef69f4c3af1f8840f2d6ba88d9b97db SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = 9e9e76049b9fdcc5192e225b4b477a104902894b SHA1 (patch-src_gc-core.h) = e23bba26094aa2203568fa5f2b98412994e87f19 SHA1 (patch-src_gc.cpp) = 4395d00ffbcecb9f1d4947823312a2f176437840 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 6805d2cdb3c..53f5ce7762c 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,8 +1,10 @@ -$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.1 2012/12/30 10:31:14 adam Exp $ +$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.2 2014/04/30 06:15:20 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-30 09:44:48.000000000 +0000 +Fix build with poppler-0.26.0. + +--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2012-12-13 17:00:46.000000000 +0000 +++ src/extension/internal/pdfinput/pdf-parser.cpp @@ -38,7 +38,6 @@ extern "C" { #include "goo/GooHash.h" @@ -12,3 +14,90 @@ Object.h is included in pdf-parser.h -- see patch for pdf-parser.h. #include "Array.h" #include "Dict.h" #include "Stream.h" +@@ -861,7 +860,7 @@ void PdfParser::opSetExtGState(Object ar + isolated = knockout = gFalse; + if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) +- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); ++ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, state); + #else + blendingColorSpace = GfxColorSpace::parse(&obj5); + #endif +@@ -1085,9 +1084,9 @@ void PdfParser::opSetFillColorSpace(Obje + 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, state); + } else { +- colorSpace = GfxColorSpace::parse(&obj, NULL); ++ colorSpace = GfxColorSpace::parse(&obj, NULL, state); + } + #else + if (obj.isNull()) { +@@ -1120,9 +1119,9 @@ void PdfParser::opSetStrokeColorSpace(Ob + 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, state); + } else { +- colorSpace = GfxColorSpace::parse(&obj, NULL); ++ colorSpace = GfxColorSpace::parse(&obj, NULL, state); + } + #else + if (obj.isNull()) { +@@ -1213,7 +1212,7 @@ void PdfParser::opSetFillColorN(Object a + } + #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, state))) { + state->setFillPattern(pattern); + builder->updateStyle(state); + } +@@ -1273,7 +1272,7 @@ void PdfParser::opSetStrokeColorN(Object + } + #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, state))) { + state->setStrokePattern(pattern); + builder->updateStyle(state); + } +@@ -1711,7 +1710,7 @@ void PdfParser::opShFill(Object args[], + 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, state))) { + return; + } + #else +@@ -2727,7 +2726,7 @@ void PdfParser::doImage(Object *ref, Str + } + if (!obj1.isNull()) { + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) +- colorSpace = GfxColorSpace::parse(&obj1, NULL); ++ colorSpace = GfxColorSpace::parse(&obj1, NULL, state); + #else + colorSpace = GfxColorSpace::parse(&obj1); + #endif +@@ -2816,7 +2815,7 @@ void PdfParser::doImage(Object *ref, Str + } + } + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) +- maskColorSpace = GfxColorSpace::parse(&obj1, NULL); ++ maskColorSpace = GfxColorSpace::parse(&obj1, NULL, state); + #else + maskColorSpace = GfxColorSpace::parse(&obj1); + #endif +@@ -3007,7 +3006,7 @@ void PdfParser::doForm(Object *str) { + transpGroup = gTrue; + if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { + #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) +- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); ++ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, state); + #else + blendingColorSpace = GfxColorSpace::parse(&obj3); + #endif -- cgit v1.2.3