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 791E7158176 for ; Mon, 06 Oct 2025 18:36:47 +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) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 640BC3413EA for ; Mon, 06 Oct 2025 18:36:47 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 60DA8110374; Mon, 06 Oct 2025 18:36:43 +0000 (UTC) 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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 5424C110374 for ; Mon, 06 Oct 2025 18:36:43 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 085E5340DAD for ; Mon, 06 Oct 2025 18:36:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 041DD3AC7 for ; Mon, 06 Oct 2025 18:36:41 +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: <1759775793.bf9a55a0b2aa54536d72952938f14161b90fb4f1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/files/, sci-libs/gdal/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/gdal/files/gdal-3.11.4-poppler-25.10.patch sci-libs/gdal/gdal-3.11.4.ebuild X-VCS-Directories: sci-libs/gdal/ sci-libs/gdal/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bf9a55a0b2aa54536d72952938f14161b90fb4f1 X-VCS-Branch: master Date: Mon, 06 Oct 2025 18:36:41 +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: 2c9acb22-153f-40a8-8195-ddcbcdbbc2bc X-Archives-Hash: 9bdf7f5df448079f8ddad320018199e4 commit: bf9a55a0b2aa54536d72952938f14161b90fb4f1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 6 17:20:39 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 6 18:36:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9a55a0 sci-libs/gdal: Fix build w/ app-text/poppler-25.10.0 Signed-off-by: Andreas Sturmlechner gentoo.org> .../gdal/files/gdal-3.11.4-poppler-25.10.patch | 42 ++++++++++++++++++++++ sci-libs/gdal/gdal-3.11.4.ebuild | 4 +++ 2 files changed, 46 insertions(+) diff --git a/sci-libs/gdal/files/gdal-3.11.4-poppler-25.10.patch b/sci-libs/gdal/files/gdal-3.11.4-poppler-25.10.patch new file mode 100644 index 000000000000..6e46949209ca --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.11.4-poppler-25.10.patch @@ -0,0 +1,42 @@ +From a716a6cd5ffd779b30950f046fce91878fc97b9d Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sun, 5 Oct 2025 00:50:51 +0200 +Subject: [PATCH] Add compatibility with Poppler 25.10 (support for older + versions kept) + +Fixes #13173 +--- + frmts/pdf/pdfobject.cpp | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp +index d8ded01d3e4b..2c5c44ba04d9 100644 +--- a/frmts/pdf/pdfobject.cpp ++++ b/frmts/pdf/pdfobject.cpp +@@ -1437,7 +1437,12 @@ int64_t GDALPDFStreamPoppler::GetLength(int64_t nMaxSize) + + static char *GooStringToCharStart(GooString &gstr) + { +- auto nLength = gstr.getLength(); ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 10) ++ const auto nLength = gstr.size(); ++#else ++ const auto nLength = gstr.getLength(); ++#endif + if (nLength) + { + char *pszContent = static_cast(VSI_MALLOC_VERBOSE(nLength + 1)); +@@ -1514,7 +1519,12 @@ char *GDALPDFStreamPoppler::GetRawBytes() + "GDALPDFStreamPoppler::GetRawBytes(): %s", e.what()); + return nullptr; + } ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 10) ++ m_nRawLength = gstr.size(); ++#else + m_nRawLength = gstr.getLength(); ++#endif + return GooStringToCharStart(gstr); + } + diff --git a/sci-libs/gdal/gdal-3.11.4.ebuild b/sci-libs/gdal/gdal-3.11.4.ebuild index 877e5f395937..d347a71a7942 100644 --- a/sci-libs/gdal/gdal-3.11.4.ebuild +++ b/sci-libs/gdal/gdal-3.11.4.ebuild @@ -141,6 +141,10 @@ EPYTEST_RERUNS=5 EPYTEST_XDIST=1 # distutils_enable_tests unconditionally touches BDEPEND +PATCHES=( + "${FILESDIR}"/${P}-poppler-25.10.patch +) + pkg_setup() { use java && java-pkg-opt-2_pkg_setup }