From: Matthias Kilian <kili@outback.escape.de>
Subject: geo/gdal: fix build with poppler-26.01.0
To: landry@openbsd.org
Cc: ports@openbsd.org
Date: Thu, 8 Jan 2026 21:04:18 +0100

Hi,

this diff fixes the build of gdal with poppler-26.01.0 (plain
s/reset/rewind/).

ok?

Ciao,
	Kili

Index: patches/patch-frmts_pdf_pdfio_cpp
===================================================================
RCS file: patches/patch-frmts_pdf_pdfio_cpp
diff -N patches/patch-frmts_pdf_pdfio_cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-frmts_pdf_pdfio_cpp	7 Jan 2026 19:46:17 -0000
@@ -0,0 +1,26 @@
+Fix build with poppler-26.01.0.
+
+Index: frmts/pdf/pdfio.cpp
+--- frmts/pdf/pdfio.cpp.orig
++++ frmts/pdf/pdfio.cpp
+@@ -252,7 +252,7 @@ int VSIPDFFileStream::lookChar()
+ 
+ #if POPPLER_MAJOR_VERSION > 25 ||                                              \
+     (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2)
+-bool VSIPDFFileStream::reset()
++bool VSIPDFFileStream::rewind()
+ #else
+ void VSIPDFFileStream::reset()
+ #endif
+@@ -274,9 +274,9 @@ void VSIPDFFileStream::reset()
+ 
+ #if POPPLER_MAJOR_VERSION > 25 ||                                              \
+     (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 3)
+-bool VSIPDFFileStream::unfilteredReset()
++bool VSIPDFFileStream::unfilteredRewind()
+ {
+-    return reset();
++    return rewind();
+ }
+ #else
+ void VSIPDFFileStream::unfilteredReset()
Index: patches/patch-frmts_pdf_pdfio_h
===================================================================
RCS file: patches/patch-frmts_pdf_pdfio_h
diff -N patches/patch-frmts_pdf_pdfio_h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-frmts_pdf_pdfio_h	7 Jan 2026 19:46:17 -0000
@@ -0,0 +1,32 @@
+Fix build with poppler-26.01.0.
+
+Index: frmts/pdf/pdfio.h
+--- frmts/pdf/pdfio.h.orig
++++ frmts/pdf/pdfio.h
+@@ -57,7 +57,7 @@ class VSIPDFFileStream final : public BaseStream
+ 
+ #if POPPLER_MAJOR_VERSION > 25 ||                                              \
+     (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2)
+-    bool reset() override;
++    bool rewind() override;
+ #else
+     void reset() override;
+ #endif
+@@ -66,7 +66,7 @@ class VSIPDFFileStream final : public BaseStream
+     {
+ #if POPPLER_MAJOR_VERSION > 25 ||                                              \
+     (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2)
+-        CPL_IGNORE_RET_VAL(str->reset());
++        CPL_IGNORE_RET_VAL(str->rewind());
+ #else
+         str->reset();
+ #endif
+@@ -74,7 +74,7 @@ class VSIPDFFileStream final : public BaseStream
+ 
+ #if POPPLER_MAJOR_VERSION > 25 ||                                              \
+     (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 3)
+-    bool unfilteredReset() override;
++    bool unfilteredRewind() override;
+ #else
+     void unfilteredReset() override;
+ #endif
Index: patches/patch-frmts_pdf_pdfobject_cpp
===================================================================
RCS file: patches/patch-frmts_pdf_pdfobject_cpp
diff -N patches/patch-frmts_pdf_pdfobject_cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-frmts_pdf_pdfobject_cpp	7 Jan 2026 19:46:17 -0000
@@ -0,0 +1,23 @@
+Fix build with poppler-26.01.0.
+
+Index: frmts/pdf/pdfobject.cpp
+--- frmts/pdf/pdfobject.cpp.orig
++++ frmts/pdf/pdfobject.cpp
+@@ -1411,7 +1411,7 @@ int64_t GDALPDFStreamPoppler::GetLength(int64_t nMaxSi
+ 
+ #if POPPLER_MAJOR_VERSION > 25 ||                                              \
+     (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2)
+-    if (!m_poStream->reset())
++    if (!m_poStream->rewind())
+         return 0;
+ #else
+     m_poStream->reset();
+@@ -1490,7 +1490,7 @@ int64_t GDALPDFStreamPoppler::GetRawLength()
+     auto undecodeStream = m_poStream->getUndecodedStream();
+ #if POPPLER_MAJOR_VERSION > 25 ||                                              \
+     (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2)
+-    if (!undecodeStream->reset())
++    if (!undecodeStream->rewind())
+         return 0;
+ #else
+     undecodeStream->reset();