debian/changelog

-spatialite (5.0.0~beta0-1~exp2) UNRELEASED; urgency=medium
+spatialite (5.0.0~beta0-1~exp2) experimental; urgency=medium
 
   * Bump Standards-Version to 4.3.0, no changes.
   * Add Build-Depends-Package field to symbols file.
+  * Add upstream patch to fix virtualknn test hang.
+    (closes: #920995)
 
- -- Bas Couwenberg <sebastic@debian.org>  Sun, 05 Aug 2018 21:00:31 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 15 Feb 2019 18:18:34 +0100
 
 spatialite (5.0.0~beta0-1~exp1) experimental; urgency=medium
 

debian/patches/series

 spelling-errors.patch
+virtualknn.patch

debian/patches/virtualknn.patch

+Description: fixing a bug hanging VirtualKNN tests
+Author: sandro
+Origin: https://www.gaia-gis.it/fossil/libspatialite/info/90180e065dfdd8fa
+Bug: https://www.gaia-gis.it/fossil/libspatialite/info/2cad2f4b9df468fa
+Bug-Debian: https://bugs.debian.org/920995
+
+--- a/src/spatialite/virtualknn.c
++++ b/src/spatialite/virtualknn.c
+@@ -240,6 +240,7 @@ vknn_empty_context (VKnnContextPtr ctx)
+     ctx->rtree_miny = -DBL_MAX;
+     ctx->rtree_maxx = DBL_MAX;
+     ctx->rtree_maxy = DBL_MAX;
++    ctx->level = 0;
+     ctx->current_level = 0;
+     ctx->max_items = 0;
+     ctx->knn_array = NULL;
+--- a/test/check_virtualknn.c
++++ b/test/check_virtualknn.c
+@@ -484,6 +484,14 @@ main (int argc, char *argv[])
+ 	  sqlite3_close (db_handle);
+ 	  return -4;
+       }
++/* adding a second geometry column */
++    ret = add_second_geom (db_handle);
++    if (!ret)
++      {
++	  fprintf (stderr, "Add Second Geometry: unexpected failure !!!\n");
++	  sqlite3_close (db_handle);
++	  return -5;
++      }
+ 
+ /* Creating the VirtualKNN table */
+     ret = create_knn (db_handle);
+@@ -491,7 +499,7 @@ main (int argc, char *argv[])
+       {
+ 	  fprintf (stderr, "CREATE VIRTUAL TABLE knn: expected failure !!!\n");
+ 	  sqlite3_close (db_handle);
+-	  return -5;
++	  return -6;
+       }
+ 
+ /* Testing KNN - #1 */
+@@ -500,7 +508,7 @@ main (int argc, char *argv[])
+       {
+ 	  fprintf (stderr, "Check KNN #1: unexpected failure\n");
+ 	  sqlite3_close (db_handle);
+-	  return -6;
++	  return -7;
+       }
+ 
+ /* Testing KNN - #2 */
+@@ -509,7 +517,7 @@ main (int argc, char *argv[])
+       {
+ 	  fprintf (stderr, "Check KNN #2: unexpected failure\n");
+ 	  sqlite3_close (db_handle);
+-	  return -7;
++	  return -8;
+       }
+ 
+ /* Testing KNN - #3 */
+@@ -518,7 +526,7 @@ main (int argc, char *argv[])
+       {
+ 	  fprintf (stderr, "Check KNN #3: unexpected success\n");
+ 	  sqlite3_close (db_handle);
+-	  return -8;
++	  return -9;
+       }
+ 
+ /* creating a first SpatialView */
+@@ -527,7 +535,7 @@ main (int argc, char *argv[])
+       {
+ 	  fprintf (stderr, "Create Spatial View #1: unexpected failure !!!\n");
+ 	  sqlite3_close (db_handle);
+-	  return -9;
++	  return -10;
+       }
+ 
+ /* Testing KNN - #4 */
+@@ -536,7 +544,7 @@ main (int argc, char *argv[])
+       {
+ 	  fprintf (stderr, "Check KNN #4: unexpected failure\n");
+ 	  sqlite3_close (db_handle);
+-	  return -10;
++	  return -11;
+       }
+ 
+ /* Testing KNN - #5 */
+@@ -545,15 +553,6 @@ main (int argc, char *argv[])
+       {
+ 	  fprintf (stderr, "Check KNN #5: unexpected failure\n");
+ 	  sqlite3_close (db_handle);
+-	  return -11;
+-      }
+-
+-/* adding a second geometry column */
+-    ret = add_second_geom (db_handle);
+-    if (!ret)
+-      {
+-	  fprintf (stderr, "Add Second Geometry: unexpected failure !!!\n");
+-	  sqlite3_close (db_handle);
+ 	  return -12;
+       }
+