[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     a1039f892288d6ae6c9a41013efba264779e7b28
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 21:46:05 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 17:11:52 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1039f89

app-office/libreoffice: Fix build w/ app-text/poppler-24.12

Closes: https://bugs.gentoo.org/943695
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libreoffice-24.2.7.2-poppler-24.12.patch | 38 ++++++++++++++++++++++
 app-office/libreoffice/libreoffice-24.2.7.2.ebuild |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/app-office/libreoffice/files/libreoffice-24.2.7.2-poppler-24.12.patch b/app-office/libreoffice/files/libreoffice-24.2.7.2-poppler-24.12.patch
new file mode 100644
index 000000000000..d829ad76d0f7
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-24.2.7.2-poppler-24.12.patch
@@ -0,0 +1,38 @@
+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 ) };
+-- 
+cgit v1.2.3

diff --git a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
index 294217f3d6a8..1d23a5c8bf96 100644
--- a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -322,6 +322,7 @@ PATCHES=(
 
 	# 24.8 branch
 	"${FILESDIR}/${P}-no-std-basic_string-int.patch" # bug #923950
+	"${FILESDIR}/${P}-poppler-24.12.patch" # bug #943695
 
 	# git master
 	# bug #917618, thx to Debian: