commit: f050572a5b1fd98188fe58d8de37a9c1ce7e7598 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 13 22:03:09 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jan 13 22:03:09 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f050572a
app-office/calligra: Fix build w/ poppler-26.01 Closes: https://bugs.gentoo.org/968731 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/calligra/calligra-25.12.1.ebuild | 1 + .../files/calligra-25.12.1-poppler-26.01.patch | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/app-office/calligra/calligra-25.12.1.ebuild b/app-office/calligra/calligra-25.12.1.ebuild index 71a23add1d5a..5ef7a3acb8d1 100644 --- a/app-office/calligra/calligra-25.12.1.ebuild +++ b/app-office/calligra/calligra-25.12.1.ebuild @@ -98,6 +98,7 @@ BDEPEND=" PATCHES=( "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch # downstream "${FILESDIR}"/${PN}-25.08.2-cmake4.patch # pending MR + "${FILESDIR}"/${P}-poppler-26.01.patch # in 25.12.2 ) src_configure() { diff --git a/app-office/calligra/files/calligra-25.12.1-poppler-26.01.patch b/app-office/calligra/files/calligra-25.12.1-poppler-26.01.patch new file mode 100644 index 000000000000..5fcf509b34f0 --- /dev/null +++ b/app-office/calligra/files/calligra-25.12.1-poppler-26.01.patch @@ -0,0 +1,31 @@ +From ba2fd66d04d1db3cf4a07fcfb7e42cd2ed5c943d Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <[email protected]> +Date: Sun, 11 Jan 2026 23:51:40 +0000 +Subject: [PATCH] Fix build with poppler 26.01 + +(cherry picked from commit 3b79e0a4c3bfcae02f8403a098b2d008e3bb8a6b) + +Co-authored-by: Antonio Rojas <[email protected]> +--- + filters/karbon/pdf/SvgOutputDev.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 436243da7bd..178631e02af 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -492,7 +492,11 @@ void SvgOutputDev::drawImage(GfxState *state, + Q_UNUSED(interpolate) + Q_UNUSED(inlineImg) + ImageStream *imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); ++#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(26, 1, 0) + imgStr->reset(); ++#else ++ imgStr->rewind(); ++#endif + + unsigned int *dest = nullptr; + unsigned char *buffer = new unsigned char[width * height * 4]; +-- +GitLab +
