wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-31 01:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

libreoffice: revbump for poppler-25.06.0_1

Browse source
This commit is contained in:
Mateusz Sylwestrzak 2025-06-21 19:50:47 +02:00 • committed by Duncan Overbruck
parent 3d5c7d7e3c
commit 217096fcf7
2 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
srcpkgs/libreoffice/patches/011-fix_build_with_poppler_25.05.patch Normal file
View file

@ -0,0 +1,39 @@
From 0ee2636304ac049f21415c67e92040f7d6c14d35 Mon Sep 17 00:00:00 2001
From: Xisco Fauli <xiscofauli@libreoffice.org>
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 <xiscofauli@libreoffice.org>
---
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

4
srcpkgs/libreoffice/template
View file

@ -1,9 +1,9 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=25.2.4.3
revision=1
metapackage=yes
revision=2
build_helper="gir"
metapackage=yes
make_build_target="build"
# Use order in configure.ac
_xdeps="zlib-devel libjpeg-turbo-devel clucene-devel expat-devel xmlsec1-devel