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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 509ED158099 for ; Tue, 21 Nov 2023 22:36:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F89A2BC037; Tue, 21 Nov 2023 22:36:20 +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 917142BC037 for ; Tue, 21 Nov 2023 22:36:19 +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 A2C21335D97 for ; Tue, 21 Nov 2023 22:36:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B292013B1 for ; Tue, 21 Nov 2023 22:36:15 +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: <1700605197.34ed053b36d0d8f3985ff95d1052bbe9effffed3.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.8.0-libxml2-2.12-1.patch sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch sci-libs/gdal/gdal-3.8.0.ebuild X-VCS-Directories: sci-libs/gdal/files/ sci-libs/gdal/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 34ed053b36d0d8f3985ff95d1052bbe9effffed3 X-VCS-Branch: master Date: Tue, 21 Nov 2023 22:36:15 +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: 3a65672f-6eb3-4668-bd04-ac0c7e227e99 X-Archives-Hash: 7a5454edd832da46b983da054ca921fc commit: 34ed053b36d0d8f3985ff95d1052bbe9effffed3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 21 20:22:07 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Nov 21 22:19:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ed053b sci-libs/gdal: Fix build with dev-libs/libxml2-2.12.0 Closes: https://bugs.gentoo.org/917564 Signed-off-by: Andreas Sturmlechner gentoo.org> .../gdal/files/gdal-3.8.0-libxml2-2.12-1.patch | 22 ++++++++++++++++++ .../gdal/files/gdal-3.8.0-libxml2-2.12-2.patch | 27 ++++++++++++++++++++++ sci-libs/gdal/gdal-3.8.0.ebuild | 1 + 3 files changed, 50 insertions(+) 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 +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(ctx); + char *pszStrDup = CPLStrdup(pszStr); + int nLen = static_cast(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 +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(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() {