libspatialite: added patch to wrap call to xmlNanoHTTPCleanup()

This commit is contained in:
Bruno Rodrigues 2024-10-11 08:22:01 +02:00
parent a6a742b8ed
commit 1f09ed79a4
2 changed files with 34 additions and 1 deletions

View File

@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
hash = "sha256-Q74t00na/+AW3RQAxdEShYKMIv6jXKUQnyHz7VBgUIA=";
};
patches = [
# Drop use of deprecated libxml2 HTTP API.
# From: https://www.gaia-gis.it/fossil/libspatialite/info/7c452740fe
# see also: https://github.com/NixOS/nixpkgs/issues/347085
./xmlNanoHTTPCleanup.patch
];
nativeBuildInputs = [
pkg-config
validatePkgConfig
@ -35,7 +42,7 @@ stdenv.mkDerivation rec {
freexl
geos
librttopo
(libxml2.override { enableHttp = true; })
libxml2
minizip
proj
sqlite

View File

@ -0,0 +1,26 @@
diff --git a/src/wfs/wfs_in.c b/src/wfs/wfs_in.c
index fe07a0d..7f2557d 100644
--- a/src/wfs/wfs_in.c
+++ b/src/wfs/wfs_in.c
@@ -76,7 +76,10 @@ Regione Toscana - Settore Sistema Informativo Territoriale ed Ambientale
#ifdef ENABLE_LIBXML2 /* LIBXML2 enabled: supporting XML documents */
#include <libxml/parser.h>
-#include <libxml/nanohttp.h>
+
+#ifdef LIBXML_HTTP_ENABLED
+ #include <libxml/nanohttp.h>
+#endif
#define MAX_GTYPES 28
@@ -4637,7 +4640,9 @@ SPATIALITE_DECLARE void
reset_wfs_http_connection (void)
{
/* Resets the libxml2 "nano HTTP": useful when changing the HTTP_PROXY settings */
+#ifdef LIBXML_HTTP_ENABLED
xmlNanoHTTPCleanup ();
+#endif
}
#else /* LIBXML2 isn't enabled */