gentoo auto-resync : 14:01:2025 - 06:41:37

3 files changed, 42 insertions, 2 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c69bbeeed3ca..fd6aa06f6828 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,6 +1,7 @@
 AUX libreoffice-24.2-qtdetect.patch 989 BLAKE2B 01e1c1493293363206cd43ded09b69becd02b0b93c2fcb5fd4387a54424b9fa552ebfa128290a1b0551e6b6fe5de8f57025a2ebf5c75da2ea01bd66f5910f9d6 SHA512 dc00b2afe98f7bf30637c4102e336d6781f76cd7eb6c339c0b369ec2aa50544bc266fd42540fea037c1fcd07ae7e6d1b6503be620db9127084ffe6528f8db4b1
 AUX libreoffice-24.2-unused-qt6network.patch 3348 BLAKE2B 9ec1c83e9405128fcf493e6382e822cb577548e68ec46d0971825dec08cefe7ab18fdaf5d028ce747aaec5cdb57f3d2267b96cff997d90990435cda3ae98d47f SHA512 2eb04c76377526c67e28d20bfcdc682a52c7afa754a2e5a0f6df146917050dd9565bd4ae767347db58bb95afa5436baceea33b3e9b1e6c5b96517eb4cf22e1cb
 AUX libreoffice-24.2.7.2-no-std-basic_string-int.patch 5372 BLAKE2B 2ec346b903738cd27ff1207d71b57ffcc48891d80dd7c6ef8f38d35516619569b59849ef4065aeb9a976af9929e47366ffa90d1fa50abc195f6c16785790c7b6 SHA512 d0533ec22550cb69a4536edaed71243c294babbc032f4f3ba616aa7d600f372d103559cb50e90429a584c6375a771d15a5485d4f170ce869e4bd0c8621341321
+AUX libreoffice-24.2.7.2-poppler-24.12.patch 1644 BLAKE2B 16aa7985a89bdc91875337127d4bda81377f05f10f3e476ab02d30f55e9ae8de679682e302313811379be66f72a8d509ee205fc694eda40979fd4a34ac481ef3 SHA512 9b845747e9fc6547a2a2af1a94a3ca81f18d569bc01e565d25c30bba9a2de4e972cfd67f5c3b45dc9801137d1d99d381a675db9d81932953fcbeb52f73d4ef12
 AUX libreoffice-24.8-unused-qt5network.patch 3095 BLAKE2B 32c696893de2543c27bd390bcf05506855cad57dd3c568c544f6514ab1e46887625d83ce2f311c436b175332db174b2bcb090837fdc361e4bd4e1f9377f4895f SHA512 47148c0ef291e84bff564ddb0f462d7b88bb07f6a79dbed4cbe4fdaf7168b38a814f9efa2b37604665894c130526054a767975b81b97daf1e2744559dd31f9c5
 AUX libreoffice-24.8-unused-qt6network.patch 3227 BLAKE2B f2fca932af55e949854e3624c281b81b124612edf4fc1d9949e2f494ddd51650eb8aaec78ee07c6895c351ab34e5ad214fffde6b63e03e343d93d69e06ab13cb SHA512 d187359add55a7c6336f9afaccbf2fc51120a45d1bbc29e1bdeac060b46c41c2ebd028efe95f080abf0aabfdae8a7165a35cec94ab18d373444ff2bed0af63d8
 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
@@ -35,7 +36,7 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234
 DIST libreoffice-help-24.2.7.2.tar.xz 167015000 BLAKE2B 4db61acc5dff6e86d3b94081b210c95cff2bc12c5e6a22623fe765a635d52c26f19c23f36041079c61707839fd0378f62402d1ebcfb7ea43436d303c2ce75e63 SHA512 cda8912ed46515fad0044ba8e6339cacfcee259f3ef0f84d3cc7a8fbd416754ee97eecbe7791ed0eaf6ae33cc4ade88122e0968fc4e68417dad4b2da02c25b32
 DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8
-EBUILD libreoffice-24.2.7.2.ebuild 20799 BLAKE2B 92a767f35867891ba854e5c0cb05a0c6f2d30a8d8395639f14b416adb636cffc1fd0bdeecc231e82ce6bb3f81c84bded9901207f8829a4b8237b7ec45e5978bf SHA512 39ac18f21cf0f55d237472a07e4821a06191de237729e9ca8ccaf2f603cb476ec9de820f951f2a1cd1888275fd371e7e7a613cd16843db23316ea67a60ad85d1
+EBUILD libreoffice-24.2.7.2.ebuild 20853 BLAKE2B 71afdc1cdf38175977cfea3ca74aafd1c5202c0b999ba4737d22b0bd08cab1606ab33eca0fb595c3ab340450f18b2be835feb758dd0046938fb349d85dbbe424 SHA512 1e8fa50c35b265be2c59920baf8b9ecf9666a5f42eabc15e16fd9730bdc29cd741e5e62bf414fbfdf1e4f7b17e31cb445d4c29784551ea50e668fb619156cc91
 EBUILD libreoffice-24.2.9999.ebuild 20250 BLAKE2B 827afd3e918712057ec89b563396e17f98d6ed1965f8b07fec0dbb9eeb9876e2413d65d27847f4bbf2582bb2a1e6bfa1323dd8f37d3493712a340fe97eacf2ba SHA512 aa80af874a9be317e085f6578dede89d50bfb985c3e9735d72dd44778c75765cd4551489434fe3f7e7e23e7191c8f8119093c398dca673da667b19a8a1c6f3a3
 EBUILD libreoffice-9999.ebuild 19403 BLAKE2B f7fb99c5541a85834c29d439c7ece74cca0abcd6d770a0070b4d1f16e16f5ed79a743e85f04cc335be6a77299ae9a06184560f2ff0a38ca303547a6789c35baf SHA512 5ff8008ef70a2947598a2da15c26e8fea7e4e22ea0c74553e70f3832d664a401c0874bf104968df17c58c0774405e30f345e85a4b6b03bbbaf48d99e03f4c1b3
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
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: