Make it buildable with poppler 0.82

3 files changed, 29 insertions, 9 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 06a63c7d48d..92682cfaf97 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.197 2019/11/07 12:38:06 wiz Exp $
+# $NetBSD: Makefile,v 1.198 2019/11/23 09:23:21 martin Exp $
 
 DISTNAME=	inkscape-0.92.4
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	https://media.inkscape.org/dl/resources/file/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 54571dbc223..988cfbb0ddc 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2019/05/13 16:17:51 adam Exp $
+$NetBSD: distinfo,v 1.70 2019/11/23 09:23:21 martin Exp $
 
 SHA1 (inkscape-0.92.4.tar.bz2) = 5dfabeab9f6925bf098b5eeba2fe2c82e36927cc
 RMD160 (inkscape-0.92.4.tar.bz2) = 18a998ed050030a6c89621f47e2e11b69d9f151b
@@ -13,7 +13,7 @@ SHA1 (patch-src_CMakeLists.txt) = ccd5eeca81891f83c5eaf8cb80d33f001beaf55c
 SHA1 (patch-src_extension_internal_emf-inout.cpp) = 4fe6c24007b54d55d11502876e759f62a290922e
 SHA1 (patch-src_extension_internal_emf-print.cpp) = 5da493a452afa4b11bbb204c430fc3e63332c927
 SHA1 (patch-src_extension_internal_metafile-print.cpp) = 798a2f15986cd81d13bf576b1641a810d4d40573
-SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 3bdeda1bccad64f10c20c62a2b99dbcb779f081f
+SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 94e7d8d755a1eafd47b688560498a71efe4ff9e5
 SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = f0ba86dca2fa52eec64aee8d0d92739422ae86ca
 SHA1 (patch-src_extension_internal_wmf-inout.cpp) = b49b504d1cf9388d2ad7e1c91c339e7c3d5ffdf5
 SHA1 (patch-src_extension_internal_wmf-print.cpp) = b658d7a0697aaed55671507fe88ce93619ef1070
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 3e37e8441cf..3b8c1b378db 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,11 +1,12 @@
-$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.11 2019/05/13 16:17:51 adam Exp $
+$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.12 2019/11/23 09:23:22 martin Exp $
 
 Object.h is included in pdf-parser.h -- see patch for pdf-parser.h.
 Fix building with poppler 0.76.x.
+Work around constness bugs (addChar should take a const arg).
 
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2019-01-15 04:29:27.000000000 +0000
-+++ src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -41,7 +41,6 @@ extern "C" {
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2019-01-15 05:29:27.000000000 +0100
++++ src/extension/internal/pdfinput/pdf-parser.cpp	2019-11-23 10:14:30.693904450 +0100
+@@ -41,7 +41,6 @@
  #include "goo/GooString.h"
  #include "GlobalParams.h"
  #include "CharTypes.h"
@@ -13,7 +14,7 @@ Fix building with poppler 0.76.x.
  #include "Array.h"
  #include "Dict.h"
  #include "Stream.h"
-@@ -426,7 +425,7 @@ void PdfParser::parse(Object *obj, GBool
+@@ -426,7 +425,7 @@
  	error(errInternal, -1, "Weird page contents");
      	return;
    }
@@ -22,3 +23,22 @@ Fix building with poppler 0.76.x.
    go(topLevel);
    delete parser;
    parser = NULL;
+@@ -2414,7 +2413,7 @@
+   int wMode;
+   double riseX, riseY;
+   CharCode code;
+-  Unicode *u = NULL;
++  const Unicode *u = NULL;
+   double x, y, dx, dy, tdx, tdy;
+   double originX, originY, tOriginX, tOriginY;
+   double oldCTM[6], newCTM[6];
+@@ -2537,7 +2536,8 @@
+       originY *= state->getFontSize();
+       state->textTransformDelta(originX, originY, &tOriginX, &tOriginY);
+       builder->addChar(state, state->getCurX() + riseX, state->getCurY() + riseY,
+-                       dx, dy, tOriginX, tOriginY, code, n, u, uLen);
++                       dx, dy, tOriginX, tOriginY, code, n,
++		       const_cast<Unicode*>(u), uLen);
+       state->shift(tdx, tdy);
+       p += n;
+       len -= n;