mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-15 23:05:34 +01:00
libspatialite: Upgrade to 5.1
- Drop the libtool patch its already fixed in this version - Add a patch to support libxml2 2.13+ Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
3d0e3ddd7a
commit
5d3486da55
|
|
@ -0,0 +1,29 @@
|
||||||
|
From 406e841b3e011e1090f23dba12b12cdd9ec4707e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sat, 24 Aug 2024 15:19:35 -0700
|
||||||
|
Subject: [PATCH] wfs: Cover xmlNanoHTTPCleanup with LIBXML_HTTP_ENABLED
|
||||||
|
|
||||||
|
libxml2 has deprecated internal http support [1]
|
||||||
|
|
||||||
|
[1] https://www.gaia-gis.it/fossil/libspatialite/tktview?name=7c452740fe
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
src/wfs/wfs_in.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/wfs/wfs_in.c b/src/wfs/wfs_in.c
|
||||||
|
index 1cfe39d..41ad2ab 100644
|
||||||
|
--- a/src/wfs/wfs_in.c
|
||||||
|
+++ b/src/wfs/wfs_in.c
|
||||||
|
@@ -4638,7 +4638,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 */
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac
|
|
||||||
--- libspatialite-5.0.1/configure.ac 2021-03-08 08:57:18.748858216 +0100
|
|
||||||
+++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:18.751858215 +0100
|
|
||||||
@@ -96,7 +96,7 @@ AC_PROG_INSTALL
|
|
||||||
AC_PROG_LN_S
|
|
||||||
AC_PROG_MAKE_SET
|
|
||||||
AC_LIBTOOL_WIN32_DLL
|
|
||||||
-AC_PROG_LIBTOOL
|
|
||||||
+LT_INIT
|
|
||||||
|
|
||||||
# Checks for typedefs, structures, and compiler characteristics.
|
|
||||||
AC_C_CONST
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
|
|
||||||
diff -rupN libspatialite-5.0.1/spatialite.pc.in libspatialite-5.0.1-new/spatialite.pc.in
|
--- a/spatialite.pc.in
|
||||||
--- libspatialite-5.0.1/spatialite.pc.in 2021-02-07 16:53:46.000000000 +0100
|
+++ b/spatialite.pc.in
|
||||||
+++ libspatialite-5.0.1-new/spatialite.pc.in 2021-02-10 09:54:09.647552994 +0100
|
@@ -8,5 +8,7 @@ includedir=@includedir@
|
||||||
@@ -8,5 +8,6 @@ includedir=@includedir@
|
|
||||||
Name: spatialite
|
Name: spatialite
|
||||||
Description: Spatial SQL database engine based on SQLite
|
Description: Spatial SQL database engine based on SQLite
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
-Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ -lm
|
-Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm
|
||||||
+Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ -lm
|
+Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm
|
||||||
+Libs: -L${libdir} -lspatialite
|
+Libs: -L${libdir} -lspatialite
|
||||||
|
+
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e"
|
||||||
|
|
||||||
SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \
|
SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \
|
||||||
file://libspatialite_geos.patch \
|
file://libspatialite_geos.patch \
|
||||||
file://libspatialite_macros.patch \
|
|
||||||
file://libspatialite_pkgconfig.patch \
|
file://libspatialite_pkgconfig.patch \
|
||||||
|
file://0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch \
|
||||||
"
|
"
|
||||||
|
SRC_URI[sha256sum] = "43be2dd349daffe016dd1400c5d11285828c22fea35ca5109f21f3ed50605080"
|
||||||
SRC_URI[sha256sum] = "eecbc94311c78012d059ebc0fae86ea5ef6eecb13303e6e82b3753c1b3409e98"
|
|
||||||
|
|
||||||
inherit autotools-brokensep pkgconfig
|
inherit autotools-brokensep pkgconfig
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user