From: Matthias Kilian <kili@outback.escape.de>
Subject: editors/libreoffice: fix for new poppler
To: robert@openbsd.org
Cc: ports@openbsd.org
Date: Wed, 8 Apr 2026 21:21:51 +0200

Hi,

fix build with poppler-26.04.0.

ok?

Ciao,
	Kili

Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
===================================================================
RCS file: /cvs/ports/editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx,v
diff -u -p -r1.21 patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
--- patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx	12 Feb 2026 21:25:53 -0000	1.21
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx	6 Apr 2026 20:51:44 -0000
@@ -1,6 +1,6 @@
-Fix build with poppler-26.02.0.
+Fix build with poppler-26.02.0 and 26.04.0.
 
-From upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07.
+First one from upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07.
 
 Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
 --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
@@ -61,7 +61,18 @@ Index: sdext/source/pdfimport/xpdfwrappe
      printf( "drawChar %f %f %f %f %f %f %f %f %f ",
              normalize(aPositionX),
              normalize(aPositionY),
-@@ -1348,7 +1364,11 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *st
+@@ -1098,7 +1114,9 @@ void PDFOutDev::drawChar(GfxState *state, double x, do
+     printf( "\n" );
+ }
+ 
+-#if POPPLER_CHECK_VERSION(0, 64, 0)
++#if POPPLER_CHECK_VERSION(26, 4, 0)
++void PDFOutDev::drawString(GfxState*, const std::string & /*s*/)
++#elif POPPLER_CHECK_VERSION(0, 64, 0)
+ void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
+ #else
+ void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
+@@ -1348,7 +1366,11 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *st
  
      const int nDPI = 72; // GfxState seems to have 72.0 as magic for some reason
      auto pSplashGfxState = new GfxState(nDPI, nDPI, &aBox, 0, false);
Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
===================================================================
RCS file: /cvs/ports/editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx,v
diff -u -p -r1.12 patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
--- patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx	12 Feb 2026 21:25:53 -0000	1.12
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx	6 Apr 2026 20:51:56 -0000
@@ -1,6 +1,6 @@
-Fix build with poppler-26.02.0.
+Fix build with poppler-26.02.0 and 26.04.0.
 
-From upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07.
+First one from upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07.
 
 Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
 --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig
@@ -60,3 +60,14 @@ Index: sdext/source/pdfimport/xpdfwrappe
          virtual void setDefaultCTM(const double *ctm) override;
  #else
          virtual void setDefaultCTM(double *ctm) override;
+@@ -241,7 +260,9 @@ namespace pdfi
+                               double originX, double originY,
+                               CharCode code, int nBytes, Unicode *u, int uLen) override;
+ #endif
+-#if POPPLER_CHECK_VERSION(0, 64, 0)
++#if POPPLER_CHECK_VERSION(26, 4, 0)
++        virtual void drawString(GfxState *state, const std::string &s) override;
++#elif POPPLER_CHECK_VERSION(0, 64, 0)
+         virtual void drawString(GfxState *state, const GooString *s) override;
+ #else
+         virtual void drawString(GfxState *state, GooString *s) override;