xpopple: Update to git commit f110e3e00731011dfb6487e33c23f93ed77397c4

[Michael Baeuerle (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Feb 9 14:27:23 2026 +0100
Changeset:	10a16293bf60a1eea1e379eadd3a52b4df6475cd

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

Log Message:
xpopple: Update to git commit f110e3e00731011dfb6487e33c23f93ed77397c4

Add COMMIT_MSG file.

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

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

diffstat:
 xpopple/COMMIT_MSG                       |  2 ++
 xpopple/Makefile                         |  3 +--
 xpopple/distinfo                         |  4 ++--
 xpopple/patches/patch-configure.ac       |  4 ++--
 xpopple/patches/patch-xpdf_XPDFViewer.cc | 37 ++++++--------------------------
 5 files changed, 13 insertions(+), 37 deletions(-)

diffs:
diff --git a/xpopple/COMMIT_MSG b/xpopple/COMMIT_MSG
new file mode 100644
index 0000000000..d9a4c33526
--- /dev/null
+++ b/xpopple/COMMIT_MSG
@@ -0,0 +1,2 @@
+Development snapshot.
+Not intended for import.
diff --git a/xpopple/Makefile b/xpopple/Makefile
index 6e69cf6249..7c5cae459c 100644
--- a/xpopple/Makefile
+++ b/xpopple/Makefile
@@ -3,8 +3,7 @@
 DISTNAME=	xpopple-3.04.0
 CATEGORIES=	print
 GIT_REPO=	http://offog.org/git/xpopple.git
-GIT_BRANCH=	master
-GIT_REVISION=	0aa7a917fd5999521f8117fe3384dbcb3c8828ad
+GIT_REVISION=	f110e3e00731011dfb6487e33c23f93ed77397c4
 
 MAINTAINER=	micha%NetBSD.org@localhost
 HOMEPAGE=	https://offog.org/code/xpopple/
diff --git a/xpopple/distinfo b/xpopple/distinfo
index dcb6e7e682..e68b843dce 100644
--- a/xpopple/distinfo
+++ b/xpopple/distinfo
@@ -1,4 +1,4 @@
 $NetBSD$
 
-SHA1 (patch-configure.ac) = 1d19b970d55a2c8ac5ebb53189aade38fa55811d
-SHA1 (patch-xpdf_XPDFViewer.cc) = ca5921db6c0bb297409dce24141437acb4a40972
+SHA1 (patch-configure.ac) = 651cb9d1b9dd68c24e4fb18986588b996bb19568
+SHA1 (patch-xpdf_XPDFViewer.cc) = 9de36d76f71558d5a8bd9c329500c2ae1c1360e4
diff --git a/xpopple/patches/patch-configure.ac b/xpopple/patches/patch-configure.ac
index 000ce9fe75..bc06798dd2 100644
--- a/xpopple/patches/patch-configure.ac
+++ b/xpopple/patches/patch-configure.ac
@@ -2,9 +2,9 @@ $NetBSD$
 
 Add check for libXpm.
 
---- configure.ac.orig	2022-09-28 11:53:00.000000000 +0000
+--- configure.ac.orig	2026-02-09 10:22:46.000000000 +0000
 +++ configure.ac
-@@ -69,6 +69,12 @@ PKG_CHECK_MODULES([XT], [xt x11])
+@@ -109,6 +109,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 02d6115192..8e51004ce4 100644
--- a/xpopple/patches/patch-xpdf_XPDFViewer.cc
+++ b/xpopple/patches/patch-xpdf_XPDFViewer.cc
@@ -1,41 +1,16 @@
 $NetBSD$
 
 Include XPM icon. Required for HAVE_X11_XPM_H.
-Include "PDFDoc.h" early to avoid namespace clash with X11 macro "None":
 
-/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.orig	2026-02-09 10:22:46.000000000 +0000
 +++ xpdf/XPDFViewer.cc
-@@ -11,6 +11,8 @@
- 
- #include <poppler-config.h>
+@@ -103,6 +103,9 @@
+ #endif
  
-+#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
  //------------------------------------------------------------------------
- 
 +#ifdef HAVE_X11_XPM_H
 +#include "xpdfIcon.xpm"
 +#endif
- #include "leftArrow.xbm"
- #include "leftArrowDis.xbm"
- #include "dblLeftArrow.xbm"
+ // GUI includes
+ //------------------------------------------------------------------------
+