mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
sci-libs/gdal: Fix build w/ app-text/poppler-24.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
27
sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch
Normal file
27
sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch
Normal file
@@ -0,0 +1,27 @@
|
||||
From ada4fa75910dab127ee4b79256a676da6d4636c0 Mon Sep 17 00:00:00 2001
|
||||
From: Even Rouault <even.rouault@spatialys.com>
|
||||
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 <sstream>
|
||||
+
|
||||
/* 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. */
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user