Skip to content
Snippets Groups Projects
Commit fcf22c0b authored by Krassy Boykinov's avatar Krassy Boykinov Committed by Natanael Copa
Browse files

community/libreoffice: rebuild against poppler-25.01.0

* add patch to build with latest poppler
parent 3d190e59
No related branches found
No related tags found
2 merge requests!79570community/firefox-esr: upgrade to 128.7.0,!71840poppler{,-qt5}: security upgrade to 25.01.0
From db12ee77c17ea9ed477c310bd1e58f00d519f653 Mon Sep 17 00:00:00 2001
From: Michael Stahl <michael.stahl@allotropia.de>
Date: Tue, 7 Jan 2025 18:42:29 +0100
Subject: sdext: adapt xpdfwrapper to poppler 24.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Ia47edf2ac821e3ef5c40f7582253f894eac74060
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179902
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit aa94faf493945e854a888e809a9c5cc8d6d0b978)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179945
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
---
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 57164f27cb42..6748431e53d2 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -1090,7 +1090,12 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
int bitsPerComponent = 1;
StreamColorSpaceMode csMode = streamCSNone;
+#if POPPLER_CHECK_VERSION(24, 12, 0)
+ bool hasAlpha;
+ str->getImageParams( &bitsPerComponent, &csMode, &hasAlpha );
+#else
str->getImageParams( &bitsPerComponent, &csMode );
+#endif
if( bitsPerComponent == 1 && (csMode == streamCSNone || csMode == streamCSDeviceGray) )
{
GfxRGB oneColor = { dblToCol( 1.0 ), dblToCol( 1.0 ), dblToCol( 1.0 ) };
@@ -1305,10 +1310,17 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *state, Gfx *, Catalog *,
std::unique_ptr<MemStream> pAlphaStr(new MemStream(reinterpret_cast<char *>(pSplashBitmap->getAlphaPtr()),
0, nBitmapWidth * nBitmapHeight, Object(objNull)));
auto aDecode = Object(objNull);
+#if POPPLER_CHECK_VERSION(24, 10, 0)
+ std::unique_ptr<GfxImageColorMap> pRgbIdentityColorMap(new GfxImageColorMap(8, &aDecode,
+ std::make_unique<GfxDeviceRGBColorSpace>()));
+ std::unique_ptr<GfxImageColorMap> pGrayIdentityColorMap(new GfxImageColorMap(8, &aDecode,
+ std::make_unique<GfxDeviceGrayColorSpace>()));
+#else
std::unique_ptr<GfxImageColorMap> pRgbIdentityColorMap(new GfxImageColorMap(8, &aDecode,
new GfxDeviceRGBColorSpace()));
std::unique_ptr<GfxImageColorMap> pGrayIdentityColorMap(new GfxImageColorMap(8, &aDecode,
new GfxDeviceGrayColorSpace()));
+#endif
OutputBuffer aBuf; initBuf(aBuf);
writePng_(aBuf, pRgbStr.get(), nBitmapWidth, nBitmapHeight, pRgbIdentityColorMap.get(),
--
cgit v1.2.3
......@@ -6,7 +6,7 @@ pkgname=libreoffice
# supported for 6 months and fresh works perfectly okay for that, while being
# more up to date and needing fewer dependency workarounds.
pkgver=24.8.4.2
pkgrel=0
pkgrel=1
pkgdesc="LibreOffice - Meta package for the full office suite"
url="https://www.libreoffice.org/"
# armhf disabled due to requiring armv6k as minimum arm architecture
......@@ -179,6 +179,8 @@ source="https://download.documentfoundation.org/libreoffice/src/$_v/libreoffice-
$_addsrcurl/zxcvbn-c-2.5.tar.gz
https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
0001-poppler-xpdfwrapper.patch
linux-musl.patch
musl-stacksize.patch
musl-libintl.patch
......@@ -662,6 +664,7 @@ c58a70eb87988cac96ad9d1435cdf80942e496b8ab0527d7ca97cdcb97371410f34f3f8dc1366943
d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8 zxcvbn-c-2.5.tar.gz
854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c 185d60944ea767075d27247c3162b3bc-unowinreg.dll
6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
bfb078c544b4f3fa10b8f9a6c652eb62f349cd2a8b6638a7d263e3f3b616a50d1bc939563dc6d7b75c27ac1d9d41268be3716e3657dc9fbd43f89e79eb7b25e0 0001-poppler-xpdfwrapper.patch
5bb780c1a5f57131a7df712be3d1a57d12c26516c52efc9ef8413f2e74f7caaee9b901a7e793a68706364e084ac2cbe0a59feac9e9921775b1012cf12162193b linux-musl.patch
3364062dac89722d6ec738a254e2296f4f6e0426e689e16be59fa1bcc504aea4a183859f82277f1409c25965b08655d1e643cef4dff03d96aba1fa4bfc2feb06 musl-stacksize.patch
d99d074e89e2713a3b6a56fa60d9d989ca6eefc8884ccbf88cb16c7b09da6dde4ba4ebc6a4d8408b61a08088df7cb1bcda60738f91e5569179fc45d7e9b901a3 musl-libintl.patch
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment