Bas Couwenberg pushed to branch master at Debian GIS Project / spatialite
Commits: 38481157 by Bas Couwenberg at 2025-08-14T17:05:12+02:00 Add patch to fix FTBFS with libxml2 2.15 (or without HTTP support). (closes: #1106621) - - - - - 3 changed files: - debian/changelog - + debian/patches/libxml2-nanohttp.patch - + debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -3,6 +3,8 @@ spatialite (5.1.0-4) UNRELEASED; urgency=medium * Bump Standards-Version to 4.7.2, no changes. * Mark libspatialite-dev as Multi-Arch no, SPATIALITE_TARGET_CPU differs. * Update lintian overrides. + * Add patch to fix FTBFS with libxml2 2.15 (or without HTTP support). + (closes: #1106621) -- Bas Couwenberg <[email protected]> Sun, 28 Jul 2024 20:03:53 +0200 ===================================== debian/patches/libxml2-nanohttp.patch ===================================== @@ -0,0 +1,50 @@ +Description: Fix FTFBS with libxml2 2.15 (or earlier without HTTP support). +Author: Bas Couwenberg <[email protected]> +Bug: https://www.gaia-gis.it/fossil/libspatialite/tktview/ac85f0fca35de00b9aaadb5078061791fc799d9c + +--- a/configure.ac ++++ b/configure.ac +@@ -61,6 +61,8 @@ AH_TEMPLATE([OMIT_FREEXL], + [Should be defined in order to disable FREEXL support.]) + AH_TEMPLATE([ENABLE_LIBXML2], + [Should be defined in order to enable LIBXML2 support.]) ++AH_TEMPLATE([ENABLE_LIBXML2_NANOHTTP], ++ [Should be defined in order to enable LIBXML2 HTTP support.]) + AH_TEMPLATE([ENABLE_MINIZIP], + [Should be defined in order to enable MiniZIP support.]) + AH_TEMPLATE([ENABLE_GEOPACKAGE], +@@ -441,6 +443,7 @@ if test x"$enable_libxml2" != "xno"; the + AC_SUBST(LIBXML2_CFLAGS) + AC_SUBST(LIBXML2_LIBS) + AC_DEFINE(ENABLE_LIBXML2) ++ AC_SEARCH_LIBS(xmlNanoHTTPCleanup,xml2,AC_DEFINE(ENABLE_LIBXML2_NANOHTTP),,) + fi + + #----------------------------------------------------------------------- +--- a/src/wfs/wfs_in.c ++++ b/src/wfs/wfs_in.c +@@ -76,7 +76,10 @@ Regione Toscana - Settore Sistema Inform + #ifdef ENABLE_LIBXML2 /* LIBXML2 enabled: supporting XML documents */ + + #include <libxml/parser.h> ++ ++#ifdef ENABLE_LIBXML2_NANOHTTP + #include <libxml/nanohttp.h> ++#endif + + #define MAX_GTYPES 28 + +@@ -4636,8 +4639,13 @@ get_wfs_schema_column_info (gaiaWFScolum + SPATIALITE_DECLARE void + reset_wfs_http_connection (void) + { ++#ifdef ENABLE_LIBXML2_NANOHTTP + /* Resets the libxml2 "nano HTTP": useful when changing the HTTP_PROXY settings */ + xmlNanoHTTPCleanup (); ++#else ++/* LIBXML2 doesn't have HTTP support: does absolutely nothing */ ++ return; ++#endif + } + + #else /* LIBXML2 isn't enabled */ ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +libxml2-nanohttp.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite/-/commit/38481157178415322d78a3a45dab18f0c1d45daa -- View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite/-/commit/38481157178415322d78a3a45dab18f0c1d45daa You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
