diff options
Diffstat (limited to 'sci-libs/gdal')
| -rw-r--r-- | sci-libs/gdal/Manifest | 3 | ||||
| -rw-r--r-- | sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch | 27 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-3.9.1-r1.ebuild | 3 |
3 files changed, 31 insertions, 2 deletions
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index e9c9039eb6da..eecf2ebe85b6 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -4,6 +4,7 @@ AUX gdal-3.8.0-java21.patch 911 BLAKE2B 69c2862b90b7c53d34200172fb17279608fbe225 AUX gdal-3.8.0-libxml2-2.12-1.patch 923 BLAKE2B e75eb8edb5507450ded3bca618a03a283ba49791df416b0a7732f859d93124704e8508fcd11271bbbeef299d05d3ad2df9e03bd805580445407cb6b8c003a98e SHA512 cace97fb0a690b9ef40a2038a8a40070257682e87ff5f90ebf57d3bbb444257a5f06e58403c8607f3f5b0195a6c756146f7d84f4bf7d34a7a0ac94ad07aa08bb AUX gdal-3.8.0-libxml2-2.12-2.patch 1118 BLAKE2B 5c0abcfcfbb0ca2a96156abb4c7daaf4860fa30d553228172eb8def8b2f95e93bae9217974fba9621dcf9921e906a5ada9b710b1c0b29e7e580191a0a56a76e2 SHA512 acefa260368a85ab3d3c1436d3fdb60accf13424104c07f1100c9b84a45d99cde1b6baec09f01bd83316bce864e9347b89bfe0310ebe8e0f96c81858bed698ba AUX gdal-3.8.5-poppler-24.05.0.patch 1007 BLAKE2B b0bed1a9b145226581e9047c0d810ea1101e6f83c9ee2c533dfff771d3ad57599738492994652bb39e6d0d79158efe953b530799f6861b45385a1e14c54badca SHA512 2fcb7ea4f09978b6c3542eef3ed1cf34eb86c4412bef129c3822e6b03d8ae240fedcdf90c6f490f5eb4bc173cb06af36cdba253a63924e63736aeef22071a4ab +AUX gdal-3.9.1-poppler-24.12.patch 1020 BLAKE2B 34b60c612415fd4a8c1f001479ce4aee8282ab3364317fdc537808d52aa7a99c3aa1dcf142c3e7eba8f566fb61af5818d34a1d194961f1168cc2ba5c0e225ddf SHA512 fd8754288ba9844efb81410037c02aa64d6241f9bfb58d4547bded259773a51636cc30c37f223a5503a2adf0fb9beca249f593323ead2cc8eb9b52825438ad88 DIST gdal-3.8.0.tar.xz 8853728 BLAKE2B 646aa91283e7228a054221d120bddb456c8b898f9155edd289f2b2e0bf8706fa3045a98d26e4cf5ba5dba6d8c1c7f0a7f4aaaded9457481a65910c2d313c8f9d SHA512 42b3a381190922e546ae83355f56532b92d519b1eac357a9c116ee19b67b67362f282e248e2d82c14ae04cae04dce175bb652f481879442ffa5b58f764a088dd DIST gdal-3.8.5.tar.xz 8871404 BLAKE2B 2c5f9b3fa1c3d5d7879c2aa1c95f82c6360b35a259443a8ad68ff8f471f4efa8d2fd7935c57317ee5e94789244067706967f9c5df413bccd2556b5790d51d349 SHA512 4cdf1c45ea110cf6ba6ffe5b890ebd8f82654899ed6224ede6c59864f28626c758b5ea15f26c1840a4d3f70abaf9c1255754c565ef2fe5e5b39e0499ace63521 DIST gdal-3.9.0.tar.xz 9081116 BLAKE2B 5b1453b889768359d36c6da435b27f6d31bb1ba95cecfd05d525d63258100705778d2675219711d0c2ab0e2392dd0eabffa1af3ffd055ebfc14840aaa1e768c0 SHA512 05e50a3898b4c71351125c59b0058eb8213858ef14f213b251dee44638522e7e87ed660d028677803a74728543531b0f438e53a543e6529bb8cdc391e9a09b02 @@ -15,6 +16,6 @@ DIST gdalautotest-3.9.1.tar.gz 16681261 BLAKE2B c6eecb5bdd3d9b9730f49ba88dc9d5c1 EBUILD gdal-3.8.0-r1.ebuild 7637 BLAKE2B 880de2388b10f4de0a049ccee96fe53b857afbfd998e22479b64ed68dce3439c524315b06818dfc863c2258d3557e70fa63404008a443acc5e645400b11d7c14 SHA512 08c344e5faf22d9e2212850c4ac9018172e587cfe09bfc614086bdfcc6ee3e5561167eedc479e8ddcfab6e415f5da96fecd6ce3cf707955d109c94f7440ba3d1 EBUILD gdal-3.8.5.ebuild 7592 BLAKE2B b84884742702cf708847a403e8069ed46916cd038a35013fddf94043994904001bfe6577e738e708b341759495ad9fd8e3c5726440498b08e9a3001d6152317a SHA512 86d8586f309023be222c0aa56a6a6dd7aa3851cd0ca8b4b3b7b40ea6cf388e8cb5dd1b70d945c22c06899461b275320a8a5ec1b1f785c849906a2094d1b3c786 EBUILD gdal-3.9.0.ebuild 7570 BLAKE2B 62464361be497f14052f94cfff55ac357d0822b3fd95e461e8ced40516352a7333ec0fd4671238646775e593f2f64454d3416f01dfb0dd13944593983269279a SHA512 bf53744c3266dac39540c5e2a261e1b16ad92ca71877fb16bc7de0d83523151f6c2d02081967182fa3aea75d3981d41d9a0697852351f56362e1e87e9226f0fc -EBUILD gdal-3.9.1-r1.ebuild 7630 BLAKE2B 4bc755890e5a4767191b08bde1e657774055d059ce96e99bb7ad139206d2ccb91b9215e8e7c4ba2dfd1d6a2622382e2a654d60e8baf5ebec253c02e06b494d90 SHA512 e15e5008d8c0858b4e5a0df70239456fd8dc6b2565ba3c420d3a002bb70fe90d5a29cabb1f4a034048c66be26f49aaadb53ce55ce37463ca38e58f8207de05bb +EBUILD gdal-3.9.1-r1.ebuild 7670 BLAKE2B dc70476a63d4bdc0b006dfdea2a4a99cdd1c17d0dac5ba65aed3a26e4977f6a4e6cbd697547ff55bede9f91aa7e975da3c2569f9b2117e9611a3c2cdbe273737 SHA512 d22370fb4978c54604ba475e660b3b4d5766d59153dcc7bf082675a33239caad00d9dbeefaf5d3fdcf41a8b9586e236fb7ea77e0ea010ffaf4be6d84ac72a8fa EBUILD gdal-3.9.1.ebuild 7574 BLAKE2B 986054296a096755065582c067f0ded9c2161fa83c081624c6859a7e2cb7a995ffb50f622c89a36c36ba91c5542281e4c1dc18c48e3ccfb1e6b5ac6cd407da41 SHA512 1d74a6d9ead2365c65856dbb45f6f2af3df4aa7c02df28e07c1389131c37510ab6e44c7b2a7f1b78e64e49bfa5046fe5ef9131ca7d11be684f9ecc76ede09d4b MISC metadata.xml 1401 BLAKE2B f76e292c72b879bf98dd9e009bdc3aabd5d1ca134d2f867a38faafa755db99b39d217b12105a184ca2ad4943704b8f1df6d129605f59485dc74114e88bfcbbed SHA512 54342a758b5d8c0b7dac325565cb7ace9ac32a6a27b621bea232ade813f9bc6b002049fb0293b7b838dd9f0ec10719ccf8f11197227acfbeddc77b4f87dc4a12 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 <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. */ 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() { |