Hi,
sprinkle some consts to let inkscape build with poppler-0.82.0
To be committed after the poppler update. (It *should* be fine with
older poppler versions, but i'm still unfamilar with C++)
ok?
Ciao,
Kili
Index: patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
===================================================================
RCS file:
/cvs/ports/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp,v
retrieving revision 1.15
diff -u -p -r1.15 patch-src_extension_internal_pdfinput_pdf-parser_cpp
--- patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp 6 May
2019 21:22:16 -0000 1.15
+++ patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp 7 Nov
2019 22:41:05 -0000
@@ -2,6 +2,8 @@ $OpenBSD: patch-src_extension_internal_p
Fix build with poppler-0.76. From archlinux.
+And with poppler-0.82.0.
+
Index: src/extension/internal/pdfinput/pdf-parser.cpp
--- src/extension/internal/pdfinput/pdf-parser.cpp.orig
+++ src/extension/internal/pdfinput/pdf-parser.cpp
@@ -14,3 +16,12 @@ Index: src/extension/internal/pdfinput/p
go(topLevel);
delete parser;
parser = NULL;
+@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) {
+ 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];
Index: patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
===================================================================
RCS file: patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
diff -N patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_extension_internal_pdfinput_svg-builder_cpp 7 Nov
2019 22:41:05 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix build against poppler-0.82.0.
+
+Index: src/extension/internal/pdfinput/svg-builder.cpp
+--- src/extension/internal/pdfinput/svg-builder.cpp.orig
++++ src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *state) {
+ void SvgBuilder::addChar(GfxState *state, double x, double y,
+ double dx, double dy,
+ double originX, double originY,
+- CharCode /*code*/, int /*nBytes*/, Unicode *u, int
uLen) {
++ CharCode /*code*/, int /*nBytes*/, const Unicode *u,
int uLen) {
+
+
+ bool is_space = ( uLen == 1 && u[0] == 32 );
Index: patches/patch-src_extension_internal_pdfinput_svg-builder_h
===================================================================
RCS file: patches/patch-src_extension_internal_pdfinput_svg-builder_h
diff -N patches/patch-src_extension_internal_pdfinput_svg-builder_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_extension_internal_pdfinput_svg-builder_h 7 Nov 2019
22:41:05 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix build against poppler-0.82.0.
+
+Index: src/extension/internal/pdfinput/svg-builder.h
+--- src/extension/internal/pdfinput/svg-builder.h.orig
++++ src/extension/internal/pdfinput/svg-builder.h
+@@ -141,7 +141,7 @@ class SvgBuilder { (public)
+ void addChar(GfxState *state, double x, double y,
+ double dx, double dy,
+ double originX, double originY,
+- CharCode code, int nBytes, Unicode *u, int uLen);
++ CharCode code, int nBytes, const Unicode *u, int uLen);
+ void beginTextObject(GfxState *state);
+ void endTextObject(GfxState *state);
+
