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

Hi,

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

ok?

Ciao,
	Kili

Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
===================================================================
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx	7 Jan 2026 19:47:54 -0000
@@ -0,0 +1,32 @@
+Fix build with poppler-26.01.0.
+
+Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -232,7 +232,7 @@ static void writeJpeg_( OutputBuffer& o_rOutputBuf, St
+     str = ((DCTStream *)str)->getRawStream();
+ #endif
+ #if POPPLER_CHECK_VERSION(25, 2, 0)
+-    if (!str->reset())
++    if (!str->rewind())
+         return;
+ #else
+     str->reset();
+@@ -273,7 +273,7 @@ static void writePbm_(OutputBuffer& o_rOutputBuf, Stre
+ 
+     // initialize stream
+ #if POPPLER_CHECK_VERSION(25, 2, 0)
+-    if (!str->reset())
++    if (!str->rewind())
+         return;
+ #else
+     str->reset();
+@@ -335,7 +335,7 @@ static void writePpm_( OutputBuffer&     o_rOutputBuf,
+                         colorMap->getNumPixelComps(),
+                         colorMap->getBits()));
+ #if POPPLER_CHECK_VERSION(25, 2, 0)
+-    if (!imgStr->reset())
++    if (!imgStr->rewind())
+         return;
+ #else
+     imgStr->reset();
Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pnghelper_cxx
===================================================================
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pnghelper_cxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pnghelper_cxx
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pnghelper_cxx	7 Jan 2026 19:47:54 -0000
@@ -0,0 +1,50 @@
+Fix build with poppler-26.01.0.
+
+Index: sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+--- sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx.orig
++++ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+@@ -215,7 +215,7 @@ void PngHelper::createPng( OutputBuffer&     o_rOutput
+     aScanlines.reserve( nLineSize * height + height );
+ 
+ #if POPPLER_CHECK_VERSION(25, 2, 0)
+-    if (!str->reset())
++    if (!str->rewind())
+         return;
+ #else
+     str->reset();
+@@ -258,7 +258,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
+                         colorMap->getNumPixelComps(),
+                         colorMap->getBits()));
+ #if POPPLER_CHECK_VERSION(25, 2, 0)
+-    if (!imgStr->reset())
++    if (!imgStr->rewind())
+         return;
+ #else
+     imgStr->reset();
+@@ -300,7 +300,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
+                         maskColorMap->getBits()));
+ 
+ #if POPPLER_CHECK_VERSION(25, 2, 0)
+-    if (!imgStrMask->reset())
++    if (!imgStrMask->rewind())
+         return;
+ #else
+     imgStrMask->reset();
+@@ -354,7 +354,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
+                         colorMap->getNumPixelComps(),
+                         colorMap->getBits()));
+ #if POPPLER_CHECK_VERSION(25, 2, 0)
+-    if (!imgStr->reset())
++    if (!imgStr->rewind())
+         return;
+ #else
+     imgStr->reset();
+@@ -393,7 +393,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
+         new ImageStream(maskStr, maskWidth, 1, 1));
+ 
+ #if POPPLER_CHECK_VERSION(25, 2, 0)
+-    if (!imgStrMask->reset())
++    if (!imgStrMask->rewind())
+         return;
+ #else
+     imgStrMask->reset();