Date: Sat, 02 May 2026 12:33:10 +0000 From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a905fc469b4c - main - editors/libreoffice: Fix build against newest Poppler Message-ID: <69f5ef06.38e64.630abc13@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a905fc469b4c920befb6f37284aed5151b527b99 commit a905fc469b4c920befb6f37284aed5151b527b99 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2026-04-17 12:22:54 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-05-02 12:32:39 +0000 editors/libreoffice: Fix build against newest Poppler Differential Revision: https://reviews.freebsd.org/D56472 --- ...h-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx | 13 +++++++++++++ ...h-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx new file mode 100644 index 000000000000..369bedbe3ecd --- /dev/null +++ b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx @@ -0,0 +1,13 @@ +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2026-04-17 11:12:42 UTC ++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -1114,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*/) diff --git a/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx new file mode 100644 index 000000000000..0b382cb9c5a0 --- /dev/null +++ b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx @@ -0,0 +1,13 @@ +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2026-04-17 11:34:08 UTC ++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -260,7 +260,9 @@ void setDefaultCTM(const std::array<double, 6> &pMat) + 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;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f5ef06.38e64.630abc13>