gentoo auto-resync : 22:11:2023 - 05:13:16

4 files changed, 53 insertions, 1 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 43cde81ca3ee..4a63a7d51604 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,5 +1,7 @@
 AUX gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch 528 BLAKE2B c393c21cb29687a52fbbc2283021c60ee5d2accba1c558763a6f8ed6e102aef813f0e75650adb37bc1492d9f65d9125f8d0cb361666379dba9c5adf748413770 SHA512 3849e73d5871eb62a6cec2a14f1ad480a6fb1e75f8fbfe2b9574944c2f00c43eb3429e9183db4aa4ddd5388b18488a0e5381fd5142e9983e68c3e71e70c87d27
 AUX gdal-3.7.0-zlib-OF.patch 2272 BLAKE2B 81364de12d222689f7c681cf131cc2483b536043bf7907db70ce07c50871c9594a9a17853e28749484ab7c78f4d8168962c1024a7eefb3ce1ca783cb5501a655 SHA512 e46f2fd83ac6a56206567f5668ca4d644827440aa32938b87dc0b3beacc107fb5573fc228949e02d88a06f29d651699d6f0481ecba6666b0888dca76e196d547
+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
 DIST gdal-3.6.4.tar.xz 8648032 BLAKE2B d6abdbcc87029bf230dae5586f06cbd329e5e43be37d8f5e9a72c67c93a6769458cc9c693b498e3f697b1ee1b68c9f9dbf7545ff9819fceb8fdde81b8d4ac882 SHA512 a8f69158d44ea456c44cfcb8937892697a28d2e4a43333c28db8fb9e81c51436a6edcb7a392b8c7ef63cd7453be6350a938bc4ba910720d9d5d9a1f32c57c558
 DIST gdal-3.7.0.tar.xz 8604724 BLAKE2B 400cc17fc636c637f7c40e93aed8e2db7bfbbe73741da4135cfeec8dbcda24ce0c8035214edf038afc29a916012da86a78d789729540f870231dfa6aa27e424a SHA512 4a3262d75ffbb58ec0821cd266843e28ca64c34383fb2bfaf30c984bf01c6d012381892a31a2ebc7c27a58b058fb44389cd45b05b619579b6178feb192f37bc6
 DIST gdal-3.7.1.tar.xz 8614512 BLAKE2B c137ca19809170948b5b7bf852193d922d167fed554eef0cf43f326098b7b7faa40427fddbe14b051af31bbc53a91555ce562f88d04f37f81e0753265383c42a SHA512 c72483a28af8f5512757a9f319c70a12e5d5cd5e30cb2ace160e7cbad6099544526a7136875582b6e76ce10968ef1bd67a78e4df65d64bc4e8feeb7684146ca6
@@ -17,5 +19,5 @@ EBUILD gdal-3.7.0.ebuild 7533 BLAKE2B 4aedd13745dc930179452ef78c1eaf1c2a2e7f4403
 EBUILD gdal-3.7.1.ebuild 7537 BLAKE2B d1fa3dcc29e007421fa5d507a5dbfae014e692a4ee23425c521dae7cea95dd763ce768508c8276f4f391206752329d4abd01068b89f6be4954b753f448b937ae SHA512 7d6857eaa0eaea290d1f8eb8110de9e35dbffad9d0c358e49659b71693c2fef30b3448d8beebad33bf3343dc829fbc6a47fb6e19a88aff21c1f10d360ad3d5e5
 EBUILD gdal-3.7.2.ebuild 7537 BLAKE2B d1fa3dcc29e007421fa5d507a5dbfae014e692a4ee23425c521dae7cea95dd763ce768508c8276f4f391206752329d4abd01068b89f6be4954b753f448b937ae SHA512 7d6857eaa0eaea290d1f8eb8110de9e35dbffad9d0c358e49659b71693c2fef30b3448d8beebad33bf3343dc829fbc6a47fb6e19a88aff21c1f10d360ad3d5e5
 EBUILD gdal-3.7.3.ebuild 7535 BLAKE2B 0e8198082a313be650bdeb7a33cfd46b3c350f18f5ab2fe1441b885799ab8d6a591c751b45ca68189c499827aa06b4ef678e62a268fb5af6356b2987a295ffb9 SHA512 22cbde1b73f1d35a4b264038e6c4f15898f6ad409e3defc1d5d71f5cf36594ec8259369d2d886286620666ef28cd6255b2fb3c4dada1bc1ec12288edf09bef84
-EBUILD gdal-3.8.0.ebuild 7539 BLAKE2B e5db60a4d712ceddd35b521ac671dc743ec6460174286d3cabd4da05c37716c40224b094bdec849ec8a2a51f7fc733430fbad8bf1b2d91946657ed114cf81016 SHA512 244f498cb0d388ac1a0d205395a7893d6acc328dc8f1322fb5d24e2195e83d25b83d62f2997ea63d26b00d7d0577d3030222a3365d88bd218e72ea4364bf7639
+EBUILD gdal-3.8.0.ebuild 7597 BLAKE2B 7982ed48f9e42245ada14fe72e02055e97bf53c3ca28d1149cd5f62a3d48fe00246926b52ab5ef553db2240c27f5ddcea0775b03d6dcdecc5570a207583d4280 SHA512 682beafc0256346a9e46be7c3c9adc02033bff457d25477833c1bd24285986daafdaac447e542fb0840d4b4650cfb86488fc06126ebb083e040d7b1c0d499b34
 MISC metadata.xml 1348 BLAKE2B 6666f26bc5f48bbfe1971736c6737420fefa7949cd6e1b74c649ae53cb51b756ebba42bb934930af83de254bebc4e4268f60a04ed2fb1aa8835b9abbdb3968b2 SHA512 b5b90368a48679c780dbe89b73ddee9e2c74639bf1a2c9f39dd4a3cdbb005878cd2197271f2ddc23d9611feaf79c0239b32d655d8a29592ad6d87a402970b726
diff --git a/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch
new file mode 100644
index 000000000000..606dc3e05089
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch
@@ -0,0 +1,22 @@
+From cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sat, 18 Nov 2023 15:38:46 +0100
+Subject: [PATCH] Fix build error with libxml2 2.12
+
+---
+ port/cpl_xml_validate.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/port/cpl_xml_validate.cpp b/port/cpl_xml_validate.cpp
+index 7eb49ff40c90..29070d957b65 100644
+--- a/port/cpl_xml_validate.cpp
++++ b/port/cpl_xml_validate.cpp
+@@ -914,7 +914,7 @@ static void CPLLibXMLWarningErrorCallback(void *ctx, const char *msg, ...)
+ 
+     if (strstr(pszStr, "since this namespace was already imported") == nullptr)
+     {
+-        xmlErrorPtr pErrorPtr = xmlGetLastError();
++        const xmlError *pErrorPtr = xmlGetLastError();
+         const char *pszFilename = static_cast<char *>(ctx);
+         char *pszStrDup = CPLStrdup(pszStr);
+         int nLen = static_cast<int>(strlen(pszStrDup));
diff --git a/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch
new file mode 100644
index 000000000000..410b79e2ec15
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch
@@ -0,0 +1,27 @@
+From ec33f6d6dfe944f59dc5454d01b4d000d9479c02 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sat, 18 Nov 2023 16:33:25 +0100
+Subject: [PATCH] Fix build error with libxml2 2.12 (cont'd)
+
+---
+ gcore/gdaljp2metadatagenerator.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/gcore/gdaljp2metadatagenerator.cpp b/gcore/gdaljp2metadatagenerator.cpp
+index b6caa2db9def..751fa3d5e9dd 100644
+--- a/gcore/gdaljp2metadatagenerator.cpp
++++ b/gcore/gdaljp2metadatagenerator.cpp
+@@ -357,7 +357,12 @@ static CPLString GDALGMLJP2EvalExpr(const CPLString &osTemplate,
+ /************************************************************************/
+ 
+ static void GDALGMLJP2XPathErrorHandler(void * /* userData */,
+-                                        xmlErrorPtr error)
++#if LIBXML_VERSION >= 21200
++                                        const xmlError *error
++#else
++                                        xmlErrorPtr error
++#endif
++)
+ {
+     if (error->domain == XML_FROM_XPATH && error->str1 != nullptr &&
+         error->int1 < static_cast<int>(strlen(error->str1)))
diff --git a/sci-libs/gdal/gdal-3.8.0.ebuild b/sci-libs/gdal/gdal-3.8.0.ebuild
index 8c8c20bcd12e..97cfa8eb4057 100644
--- a/sci-libs/gdal/gdal-3.8.0.ebuild
+++ b/sci-libs/gdal/gdal-3.8.0.ebuild
@@ -101,6 +101,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch
 	"${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch
+	"${FILESDIR}"/${P}-libxml2-2.12-{1,2}.patch # bug 917564
 )
 
 pkg_setup() {