Hi,

it looks like inkscape is the next victim of the poppler update...

Fix build with poppler-0.76, gypped from archlinux, to be committed
right after the poppler update.

While here, remove -DPOPPLER_NEW_OBJEC_API from CONFIGURE_ENV,
because it's set by configure since the last inkscape update.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/inkscape/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile    22 Jan 2019 06:40:13 -0000      1.73
+++ Makefile    4 May 2019 23:08:35 -0000
@@ -81,11 +81,8 @@ AUTOMAKE_VERSION =   1.11
 
 CONFIGURE_ARGS =       -without-gnome-vfs
 
-# the -DPOPPLER_NEW_OBJECT_API bit should be removed after the next
-# update of this port.
 CONFIGURE_ENV =        CPPFLAGS="-I${LOCALBASE}/include/ImageMagick \
-                       -I${LOCALBASE}/include -I${X11BASE}/include \
-                       -DPOPPLER_NEW_OBJECT_API" \
+                       -I${LOCALBASE}/include -I${X11BASE}/include" \
                LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 # As discussed on the ports mailing list, remove internationalised manual
Index: patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
===================================================================
RCS file: patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
diff -N patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp        4 May 
2019 23:08:35 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix build with poppler-0.76. From archlinux.
+
+Index: src/extension/internal/pdfinput/pdf-parser.cpp
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig
++++ src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
+       error(errInternal, -1, "Weird page contents");
+       return;
+   }
+-  parser = new Parser(xref, new Lexer(xref, obj), gFalse);
++  parser = new Parser(xref, obj, gFalse);
+   go(topLevel);
+   delete parser;
+   parser = NULL;

Reply via email to