commit: 91838e7332ff02610f4980eeb86a29306f97755f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue May 6 15:05:40 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue May 6 18:17:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91838e73
app-office/libreoffice: Fix build w/ >=app-text/poppler-25.05 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/libreoffice-25.2.3.2-poppler-25.05.patch | 40 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-25.2.3.2.ebuild | 3 ++ 2 files changed, 43 insertions(+) diff --git a/app-office/libreoffice/files/libreoffice-25.2.3.2-poppler-25.05.patch b/app-office/libreoffice/files/libreoffice-25.2.3.2-poppler-25.05.patch new file mode 100644 index 000000000000..91774898ff1d --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-25.2.3.2-poppler-25.05.patch @@ -0,0 +1,40 @@ +From 0ee2636304ac049f21415c67e92040f7d6c14d35 Mon Sep 17 00:00:00 2001 +From: Xisco Fauli <[email protected]> +Date: Mon, 5 May 2025 10:03:10 +0200 +Subject: poppler: uggrade to 25.05 + +Change-Id: Icd2b318cc01bedc5baeb4445a463a136ed6d7c48 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184953 +Tested-by: Jenkins +Reviewed-by: Xisco Fauli <[email protected]> +--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++ + 3 files changed, 17 insertions(+), 9 deletions(-) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index dcc1932f7ad7..604ba3b7db2c 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -1320,11 +1320,19 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *state, Gfx *, Catalog *, + } + } + ++#if POPPLER_CHECK_VERSION(25, 5, 0) ++ std::unique_ptr<MemStream> pRgbStr(new MemStream(pBitmapData, 0, ++ nBitmapWidth * nBitmapHeight * 3, Object::null())); ++ std::unique_ptr<MemStream> pAlphaStr(new MemStream(reinterpret_cast<char *>(pSplashBitmap->getAlphaPtr()), ++ 0, nBitmapWidth * nBitmapHeight, Object::null())); ++ auto aDecode = Object::null(); ++#else + std::unique_ptr<MemStream> pRgbStr(new MemStream(pBitmapData, 0, + nBitmapWidth * nBitmapHeight * 3, Object(objNull))); + std::unique_ptr<MemStream> pAlphaStr(new MemStream(reinterpret_cast<char *>(pSplashBitmap->getAlphaPtr()), + 0, nBitmapWidth * nBitmapHeight, Object(objNull))); + auto aDecode = Object(objNull); ++#endif + #if POPPLER_CHECK_VERSION(24, 10, 0) + std::unique_ptr<GfxImageColorMap> pRgbIdentityColorMap(new GfxImageColorMap(8, &aDecode, + std::make_unique<GfxDeviceRGBColorSpace>())); +-- +cgit v1.2.3 + diff --git a/app-office/libreoffice/libreoffice-25.2.3.2.ebuild b/app-office/libreoffice/libreoffice-25.2.3.2.ebuild index 641ec420ad25..460f419d359a 100644 --- a/app-office/libreoffice/libreoffice-25.2.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.3.2.ebuild @@ -316,6 +316,9 @@ PATCHES=( # add qt6 backend as possible fallback for gtk-based desktop environments: # https://bugs.gentoo.org/950170 "${FILESDIR}/${PN}-25.2-vcl-backend-fallback.patch" + + # git master: + "${FILESDIR}/${P}-poppler-25.05.patch" ) _check_reqs() {
