From 217096fcf7373709bf4881a7594c6aeb288cfd2b Mon Sep 17 00:00:00 2001 From: Mateusz Sylwestrzak Date: Sat, 21 Jun 2025 19:50:47 +0200 Subject: [PATCH] libreoffice: revbump for poppler-25.06.0_1 --- .../011-fix_build_with_poppler_25.05.patch | 39 +++++++++++++++++++ srcpkgs/libreoffice/template | 4 +- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/libreoffice/patches/011-fix_build_with_poppler_25.05.patch diff --git a/srcpkgs/libreoffice/patches/011-fix_build_with_poppler_25.05.patch b/srcpkgs/libreoffice/patches/011-fix_build_with_poppler_25.05.patch new file mode 100644 index 00000000000..ac6263a1041 --- /dev/null +++ b/srcpkgs/libreoffice/patches/011-fix_build_with_poppler_25.05.patch @@ -0,0 +1,39 @@ +From 0ee2636304ac049f21415c67e92040f7d6c14d35 Mon Sep 17 00:00:00 2001 +From: Xisco Fauli +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 +--- + 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 pRgbStr(new MemStream(pBitmapData, 0, ++ nBitmapWidth * nBitmapHeight * 3, Object::null())); ++ std::unique_ptr pAlphaStr(new MemStream(reinterpret_cast(pSplashBitmap->getAlphaPtr()), ++ 0, nBitmapWidth * nBitmapHeight, Object::null())); ++ auto aDecode = Object::null(); ++#else + std::unique_ptr pRgbStr(new MemStream(pBitmapData, 0, + nBitmapWidth * nBitmapHeight * 3, Object(objNull))); + std::unique_ptr pAlphaStr(new MemStream(reinterpret_cast(pSplashBitmap->getAlphaPtr()), + 0, nBitmapWidth * nBitmapHeight, Object(objNull))); + auto aDecode = Object(objNull); ++#endif + #if POPPLER_CHECK_VERSION(24, 10, 0) + std::unique_ptr pRgbIdentityColorMap(new GfxImageColorMap(8, &aDecode, + std::make_unique())); +-- +cgit v1.2.3 diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 62ac0fa71ef..1f5f14e2801 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -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