From: Matthias Kilian <kili@outback.escape.de>
Subject: fix editors/libreoffice with new poppler
To: robert@openbsd.org
Cc: ports@openbsd.org
Date: Wed, 10 Sep 2025 20:14:41 +0200

Fix build with poppler-25.09.1.

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	9 Sep 2025 21:17:18 -0000
@@ -0,0 +1,19 @@
+Fix build with poppler-25.09.1.
+
+Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -1249,11 +1249,11 @@ void PDFOutDev::setSkipImages( bool bSkipImages )
+ 
+ #if POPPLER_CHECK_VERSION(21, 3, 0)
+ poppler_bool PDFOutDev::tilingPatternFill(GfxState *state, Gfx *, Catalog *,
+-                                          GfxTilingPattern *tPat, const double *mat,
++                                          GfxTilingPattern *tPat, const std::array<double, 6> &mat,
+                                           int x0, int y0, int x1, int y1,
+                                           double xStep, double yStep)
+ {
+-    const double *pBbox = tPat->getBBox();
++    const std::array<double, 4> &pBbox = tPat->getBBox();
+     const int nPaintType = tPat->getPaintType();
+     Dict *pResDict = tPat->getResDict();
+     Object *aStr = tPat->getContentStream();
Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
===================================================================
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx	9 Sep 2025 21:17:18 -0000
@@ -0,0 +1,14 @@
+Fix build with poppler-25.09.1.
+
+Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -287,7 +287,7 @@ namespace pdfi
+ #if POPPLER_CHECK_VERSION(21, 3, 0)
+         poppler_bool useTilingPatternFill() override { return true; };
+         poppler_bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat,
+-                                       GfxTilingPattern *tPat, const double *mat,
++                                       GfxTilingPattern *tPat, const std::array<double, 6> &mat,
+                                        int x0, int y0, int x1, int y1,
+                                        double xStep, double yStep) override;
+ #endif