xpopple: Update to git revision 9fae34b25c6e8e5d4e95bcc67531963c1c80cc33

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Apr 22 17:16:57 2024 +0200
Changeset:	417e0e0211c073aec89433c20fc49703c85581f4

Modified Files:
	xpopple/Makefile
	xpopple/distinfo
	xpopple/patches/patch-configure.ac
	xpopple/patches/patch-xpdf_XPDFViewer.cc

Log Message:
xpopple: Update to git revision 9fae34b25c6e8e5d4e95bcc67531963c1c80cc33

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=417e0e0211c073aec89433c20fc49703c85581f4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xpopple/Makefile                         |  9 ++++++---
 xpopple/distinfo                         |  4 ++--
 xpopple/patches/patch-configure.ac       | 12 ------------
 xpopple/patches/patch-xpdf_XPDFViewer.cc | 29 +++++++++++++++++++++++++++--
 4 files changed, 35 insertions(+), 19 deletions(-)

diffs:
diff --git a/xpopple/Makefile b/xpopple/Makefile
index f2659e5bf9..48b30df118 100644
--- a/xpopple/Makefile
+++ b/xpopple/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	xpopple-3.04.0
 CATEGORIES=	print
 GIT_REPO=	http://offog.org/git/xpopple.git
 GIT_BRANCH=	master
-GIT_REVISION=	2229941bfaa12dd23ea482e6ba356f57a2686cb7
+GIT_REVISION=	9fae34b25c6e8e5d4e95bcc67531963c1c80cc33
 
 MAINTAINER=	micha%NetBSD.org@localhost
 HOMEPAGE=	https://offog.org/code/xpopple/
@@ -14,7 +14,10 @@ LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 CONFLICTS=	xpdf-[0-9]*
 CONFLICTS+=	xpdf4-[0-9]*
 
-USE_LANGUAGES=		c c++17
+USE_LANGUAGES=		c c++
+USE_CXX_FEATURES+=	c++17
+FORCE_CXX_STD=		c++17
+
 USE_TOOLS=		autoconf automake autoreconf pkg-config
 
 GNU_CONFIGURE=		yes
@@ -47,7 +50,7 @@ post-install:
 
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.19
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=24.03.0
 .include "../../print/poppler/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/xpopple/distinfo b/xpopple/distinfo
index 482bb8d707..ec70f268ca 100644
--- a/xpopple/distinfo
+++ b/xpopple/distinfo
@@ -3,5 +3,5 @@ $NetBSD$
 BLAKE2s (xpopple-0.0.0.tar.gz) = 69217a3079908094e11121d042354a7c1f55b6482ca1a51e1b250dfd1ed0eef9
 SHA512 (xpopple-0.0.0.tar.gz) = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
 Size (xpopple-0.0.0.tar.gz) = 0 bytes
-SHA1 (patch-configure.ac) = 184ed19038c072674a9a9e7d8b286a7aa85b7e4e
-SHA1 (patch-xpdf_XPDFViewer.cc) = 0d44bc52b5408885b982d2b376dc0342b030854d
+SHA1 (patch-configure.ac) = 1d19b970d55a2c8ac5ebb53189aade38fa55811d
+SHA1 (patch-xpdf_XPDFViewer.cc) = ca5921db6c0bb297409dce24141437acb4a40972
diff --git a/xpopple/patches/patch-configure.ac b/xpopple/patches/patch-configure.ac
index 7e0cf1830c..000ce9fe75 100644
--- a/xpopple/patches/patch-configure.ac
+++ b/xpopple/patches/patch-configure.ac
@@ -1,21 +1,9 @@
 $NetBSD$
 
-With poppler 22.04.0:
-error: 'class Links' has no member named 'getNumLinks'; did you mean 'getLinks'?
-
 Add check for libXpm.
 
 --- configure.ac.orig	2022-09-28 11:53:00.000000000 +0000
 +++ configure.ac
-@@ -57,7 +57,7 @@ PKG_CHECK_EXISTS([poppler >= 22.03.0], [
-   AC_DEFINE([PDFDOC_PASSWORDS_OPTIONAL])
-   AC_DEFINE([PDFDOC_SAVEAS_GOOSTRING])
- ])
--PKG_CHECK_EXISTS([poppler >= 22.05.0], [
-+PKG_CHECK_EXISTS([poppler >= 22.04.0], [
-   AC_DEFINE([LINKS_GETLINKS])
- ])
- 
 @@ -69,6 +69,12 @@ PKG_CHECK_MODULES([XT], [xt x11])
  CPPFLAGS="$CPPFLAGS $XT_CFLAGS"
  LIBS="$LIBS $XT_LIBS"
diff --git a/xpopple/patches/patch-xpdf_XPDFViewer.cc b/xpopple/patches/patch-xpdf_XPDFViewer.cc
index d0e60adf81..02d6115192 100644
--- a/xpopple/patches/patch-xpdf_XPDFViewer.cc
+++ b/xpopple/patches/patch-xpdf_XPDFViewer.cc
@@ -1,10 +1,35 @@
 $NetBSD$
 
 Include XPM icon. Required for HAVE_X11_XPM_H.
+Include "PDFDoc.h" early to avoid namespace clash with X11 macro "None":
 
---- xpdf/XPDFViewer.cc.orig	2022-09-28 11:53:00.000000000 +0000
+/usr/pkgsrc/work/wip/xpopple/work/.buildlink/include/X11/X.h:115:30: error: expected identifier before numeric constant
+  115 | #define None                 0L /* universal null resource or null atom */
+      |                              ^~
+/usr/pkgsrc/work/wip/xpopple/work/.buildlink/include/poppler/XRef.h:104:5: note: in expansion of macro 'None'
+  104 |     None, /* No compression */
+      |     ^~~~
+
+--- xpdf/XPDFViewer.cc.orig	2024-04-22 14:53:38.000000000 +0000
 +++ xpdf/XPDFViewer.cc
-@@ -103,6 +103,9 @@
+@@ -11,6 +11,8 @@
+ 
+ #include <poppler-config.h>
+ 
++#include "PDFDoc.h"
++
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
+@@ -33,7 +35,6 @@
+ #include "Error.h"
+ #include "GlobalParams.h"
+ #include "XPDFParams.h"
+-#include "PDFDoc.h"
+ #include "Link.h"
+ #include "ErrorCodes.h"
+ #include "Outline.h"
+@@ -103,6 +104,9 @@
  // GUI includes
  //------------------------------------------------------------------------