From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (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 0BE7315813A for ; Mon, 13 Jan 2025 17:12:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D421AE07F9; Mon, 13 Jan 2025 17:12:15 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A525CE07F9 for ; Mon, 13 Jan 2025 17:12:15 +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 AD7D2340943 for ; Mon, 13 Jan 2025 17:12:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CE941F0B for ; Mon, 13 Jan 2025 17:12:13 +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: <1736788312.29d0899d90adbac2f777a6c1ea9e8651c4f50f96.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch sci-libs/gdal/gdal-3.9.1-r1.ebuild X-VCS-Directories: sci-libs/gdal/files/ sci-libs/gdal/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 29d0899d90adbac2f777a6c1ea9e8651c4f50f96 X-VCS-Branch: master Date: Mon, 13 Jan 2025 17:12:13 +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: 7837af49-dc6b-4171-8e1f-cca0ed9086d7 X-Archives-Hash: 117c3ae592d988fc5e7227830ef3cc7f commit: 29d0899d90adbac2f777a6c1ea9e8651c4f50f96 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 12 21:50:57 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 13 17:11:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d0899d sci-libs/gdal: Fix build w/ app-text/poppler-24.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch | 27 ++++++++++++++++++++++ sci-libs/gdal/gdal-3.9.1-r1.ebuild | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch b/sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch new file mode 100644 index 000000000000..9634de6e3941 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch @@ -0,0 +1,27 @@ +From ada4fa75910dab127ee4b79256a676da6d4636c0 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Mon, 9 Dec 2024 18:18:31 +0100 +Subject: [PATCH] PDF: fix build issue on CondaForge build infrastructure (gcc + 13.3) + +Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051 +--- + frmts/pdf/pdfsdk_headers.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h +index 00cc4067fe5b..d2a3a449d124 100644 +--- a/frmts/pdf/pdfsdk_headers.h ++++ b/frmts/pdf/pdfsdk_headers.h +@@ -19,6 +19,11 @@ + + #ifdef HAVE_POPPLER + ++// The "#define private public" hacks we do below do not play well with the ++// sstream header. ++// Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051 ++#include ++ + /* Horrible hack because there's a conflict between struct FlateDecode of */ + /* include/poppler/Stream.h and the FlateDecode() function of */ + /* pdfium/core/include/fpdfapi/fpdf_parser.h. */ diff --git a/sci-libs/gdal/gdal-3.9.1-r1.ebuild b/sci-libs/gdal/gdal-3.9.1-r1.ebuild index ceed348d315a..aed89b4d8a58 100644 --- a/sci-libs/gdal/gdal-3.9.1-r1.ebuild +++ b/sci-libs/gdal/gdal-3.9.1-r1.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 @@ -102,6 +102,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch + "${FILESDIR}"/${P}-poppler-24.12.patch ) pkg_setup() {