[spatialite] 01/02: Add patch to switch from lw_vasprintf() to sqlite3_vmprintf(). (closes: #807556)

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository spatialite.

commit 31d652b8a31d8e3dedda53a0ff4e92119b0d4ddb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 10 12:14:32 2015 +0100

    Add patch to switch from lw_vasprintf() to sqlite3_vmprintf(). (closes: #807556)
---
 debian/changelog                     |  7 ++++++
 debian/patches/liblwgeom-2.2.0.patch | 49 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1148109..f654604 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spatialite (4.3.0a-3) UNRELEASED; urgency=medium
+
+  * Add patch to switch from lw_vasprintf() to sqlite3_vmprintf().
+    (closes: #807556)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 10 Dec 2015 12:13:43 +0100
+
 spatialite (4.3.0a-2) unstable; urgency=medium
 
   * Require at least liblwgeom-dev 2.2.0 for postgis mini-transition.
diff --git a/debian/patches/liblwgeom-2.2.0.patch b/debian/patches/liblwgeom-2.2.0.patch
new file mode 100644
index 0000000..c10465c
--- /dev/null
+++ b/debian/patches/liblwgeom-2.2.0.patch
@@ -0,0 +1,49 @@
+Description: Switch from lw_vasprintf() to sqlite3_vmprintf().
+ lw_vasprintf() was removed in liblwgeom 2.2.0.
+Author: Alessandro Furieri <a.furieri at lqt.it>
+Origin: https://www.gaia-gis.it/fossil/libspatialite/fdiff?v1=48918773ced633bc&v2=342a605d691bddc6&sbs=1
+        https://www.gaia-gis.it/fossil/libspatialite/fdiff?v1=bae06cd7cce4c2c9&v2=6000f2931ddaf06d&sbs=1
+Bug-Debian: https://bugs.debian.org/807556
+
+--- a/src/gaiageo/gg_lwgeom.c
++++ b/src/gaiageo/gg_lwgeom.c
+@@ -90,29 +90,31 @@ splite_lwgeom_version (void)
+ static void
+ lwgaia_noticereporter (const char *fmt, va_list ap)
+ {
+-    char *msg;
+-    if (!lw_vasprintf (&msg, fmt, ap))
++    char *msg = sqlite3_vmprintf (fmt, ap);
++    if (msg == NULL)
+       {
+ 	  va_end (ap);
+ 	  return;
+       }
+-    spatialite_e ("LWGEOM notice: %s\n", msg);
++    if (strlen (msg) > 1)
++        spatialite_e ("LWGEOM notice: %s\n", msg);
+     gaiaSetLwGeomWarningMsg (msg);
+-    free (msg);
++    sqlite3_free (msg);
+ }
+ 
+ static void
+ lwgaia_errorreporter (const char *fmt, va_list ap)
+ {
+-    char *msg;
+-    if (!lw_vasprintf (&msg, fmt, ap))
++    char *msg = sqlite3_vmprintf (fmt, ap);
++    if (msg == NULL)
+       {
+ 	  va_end (ap);
+ 	  return;
+       }
+-    spatialite_e ("LWGEOM error: %s\n", msg);
++    if (strlen (msg) > 1)
++        spatialite_e ("LWGEOM error: %s\n", msg);
+     gaiaSetLwGeomErrorMsg (msg);
+-    free (msg);
++    sqlite3_free (msg);
+ }
+ 
+ #ifndef POSTGIS_2_1
diff --git a/debian/patches/series b/debian/patches/series
index 1d6781b..6ea1ebb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 occurrence-typo.patch
+liblwgeom-2.2.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite.git