From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ADC731584AD for ; Tue, 06 May 2025 18:17:57 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8EFB434319C for ; Tue, 06 May 2025 18:17:57 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 82DE41103BD; Tue, 06 May 2025 18:17:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 794601103BD for ; Tue, 06 May 2025 18:17:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 181EF343115 for ; Tue, 06 May 2025 18:17:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABAA12668 for ; Tue, 06 May 2025 18:17:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1746555461.91838e7332ff02610f4980eeb86a29306f97755f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-25.2.3.2-poppler-25.05.patch app-office/libreoffice/libreoffice-25.2.3.2.ebuild X-VCS-Directories: app-office/libreoffice/files/ app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 91838e7332ff02610f4980eeb86a29306f97755f X-VCS-Branch: master Date: Tue, 06 May 2025 18:17:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa0ea8ac-6e89-4fcd-bd0f-4962526b9f08 X-Archives-Hash: fa8f9d73c1988087178e2906c9419fc8 commit: 91838e7332ff02610f4980eeb86a29306f97755f Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue May 6 15:05:40 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue May 6 18:17:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91838e73 app-office/libreoffice: Fix build w/ >=app-text/poppler-25.05 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libreoffice-25.2.3.2-poppler-25.05.patch | 40 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-25.2.3.2.ebuild | 3 ++ 2 files changed, 43 insertions(+) diff --git a/app-office/libreoffice/files/libreoffice-25.2.3.2-poppler-25.05.patch b/app-office/libreoffice/files/libreoffice-25.2.3.2-poppler-25.05.patch new file mode 100644 index 000000000000..91774898ff1d --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-25.2.3.2-poppler-25.05.patch @@ -0,0 +1,40 @@ +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/app-office/libreoffice/libreoffice-25.2.3.2.ebuild b/app-office/libreoffice/libreoffice-25.2.3.2.ebuild index 641ec420ad25..460f419d359a 100644 --- a/app-office/libreoffice/libreoffice-25.2.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.3.2.ebuild @@ -316,6 +316,9 @@ PATCHES=( # add qt6 backend as possible fallback for gtk-based desktop environments: # https://bugs.gentoo.org/950170 "${FILESDIR}/${PN}-25.2-vcl-backend-fallback.patch" + + # git master: + "${FILESDIR}/${P}-poppler-25.05.patch" ) _check_reqs() {