Unverified Commit 9ff7074c authored by Ivan Mincik's avatar Ivan Mincik Committed by GitHub
Browse files

libspatialite: added patch to wrap call to xmlNanoHTTPCleanup() (#347724)

parents b5ce3d74 1f09ed79

pkgs/development/libraries/libspatialite/default.nix

+8 −1
Original line number Diff line number Diff line
@@ -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

pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch

0 → 100644
+26 −0
Original line number Diff line number Diff line 
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 */
 
 No newline at end of file