...
 
Commits (11)

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -3,22 +3,25 @@
# [from 'jni/' directory]
# ndk-build clean
# ndk-build
# OR
# ndk-build clean ; ndk-build
# -------------------
# As of 2016-02-28
# As of 2017-01-18
# -------------------
# changes:
# - geos-3.5.0
# - liblwgeom
# - geos-3.6.1
# - proj4-3.9.3
# - rttopo 1.1.0-dev
# - json-c-0.12
# - spatialite [4.4.0-20160228]
# - spatialite [4.4.0-20170118]
# -------------------
LOCAL_PATH := $(call my-dir)
JSQLITE_PATH := javasqlite-20120209
SPATIALITE_PATH := libspatialite-4.4.0
GEOS_PATH := geos-3.5.0
GEOS_PATH := geos-3.6.1
JSONC_PATH := json-c-0.12
LWGEOM_PATH := postgis-2.2.svn/liblwgeom
PROJ4_PATH := proj-4.9.1
RTTOPO_PATH := librttopo-20161220
PROJ4_PATH := proj-4.9.3
SQLITE_PATH := sqlite-amalgamation-3081002
ICONV_PATH := libiconv-1.13.1
XML2_PATH := libxml2-2.9.1
......@@ -26,10 +29,10 @@ LZMA_PATH := xz-5.2.1
include $(LOCAL_PATH)/iconv-1.13.1.mk
include $(LOCAL_PATH)/sqlite-3081002.mk
include $(LOCAL_PATH)/proj4-4.9.1.mk
include $(LOCAL_PATH)/geos-3.5.0.mk
include $(LOCAL_PATH)/proj4-4.9.3.mk
include $(LOCAL_PATH)/geos-3.6.1.mk
include $(LOCAL_PATH)/json-c-0.12.mk
include $(LOCAL_PATH)/liblwgeom-2.2.0.mk
include $(LOCAL_PATH)/librttopo-1.1.0.mk
include $(LOCAL_PATH)/libxml2-2.9.1.mk
include $(LOCAL_PATH)/lzma-xz-5.2.1.mk
include $(LOCAL_PATH)/spatialite-4.4.0.mk
......
......@@ -3,7 +3,9 @@ ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-zip foreign
EXTRA_DIST = makefile.vc nmake.opt \
makefile64.vc nmake64.opt \
makefile_mod.vc nmake_mod.opt \
makefile_mod64.vc nmake_mod64.opt \
Android_3.0.2.mk Android_4.3.0.mk \
spatialite-4.3.0.mk Android_4.4.0.mk spatialite-4.4.0.mk \
mainpage.doxy README.coverage spatialite-sql-latest.html \
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -368,7 +368,9 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-zip foreign
EXTRA_DIST = makefile.vc nmake.opt \
makefile64.vc nmake64.opt \
makefile_mod.vc nmake_mod.opt \
makefile_mod64.vc nmake_mod64.opt \
Android_3.0.2.mk Android_4.3.0.mk \
spatialite-4.3.0.mk Android_4.4.0.mk spatialite-4.4.0.mk \
mainpage.doxy README.coverage spatialite-sql-latest.html \
......@@ -637,7 +639,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
......@@ -663,7 +665,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
......@@ -680,7 +682,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -690,7 +692,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
This diff is collapsed.
#! /bin/sh
#!/bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
......@@ -342,6 +343,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
......@@ -14,14 +14,17 @@
/* Should be defined in order to enable LIBXML2 support. */
#define ENABLE_LIBXML2 1
/* Should be defined in order to enable LWGEOM support. */
/* #undef ENABLE_LWGEOM */
/* Should be defined in order to enable RTTOPO support. */
/* #define ENABLE_RTTOPO */
/* Should be defined in order to enable GEOS_ADVANCED support. */
#define GEOS_ADVANCED 1
/* Should be defined in order to enable GEOS_TRUNK experimental support. */
/* #undef GEOS_TRUNK */
/* Should be defined in order to fully disable GEOS non-thread-safe API. */
/* #undef GEOS_ONLY_REENTRANT */
/* Should be defined in order to enable GEOS_REENTRANT (fully thread-safe). */
#define GEOS_REENTRANT 1
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
......@@ -190,7 +193,7 @@
#define PACKAGE_NAME "libspatialite"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "libspatialite 4.4.0-RC1"
#define PACKAGE_STRING "libspatialite 5.0.0-devel"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libspatialite"
......@@ -199,7 +202,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "4.4.0-RC1"
#define PACKAGE_VERSION "5.0.0-devel1"
/* Should be defined when linking liblwgeom from PostGIS 2.1 (or later). */
/* #undefine POSTGIS_2_1 */
......@@ -217,7 +220,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
#define VERSION "4.4.0-RC1"
#define VERSION "5.0.0-devel"
/* Must be =64 in order to enable huge-file support. */
#define _FILE_OFFSET_BITS 64
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT(libspatialite, 4.4.0-RC1, a.furieri@lqt.it)
AC_INIT(libspatialite, 5.0.0-beta0, a.furieri@lqt.it)
AC_LANG(C)
AC_CONFIG_MACRO_DIR([m4])
......@@ -129,6 +129,7 @@ AC_CONFIG_FILES([Makefile \
src/topology/Makefile \
src/srsinit/Makefile \
src/srsinit/epsg_update/Makefile \
src/stored_procedures/Makefile \
src/connection_cache/Makefile \
src/connection_cache/generator/Makefile \
src/virtualtext/Makefile \
......@@ -138,8 +139,11 @@ AC_CONFIG_FILES([Makefile \
test/sql_stmt_geos_tests/Makefile \
test/sql_stmt_geosadvanced_tests/Makefile \
test/sql_stmt_geopackage_tests/Makefile \
test/sql_stmt_gpkg_epsg_tests/Makefile \
test/sql_stmt_gpkg_epsg492_tests/Makefile \
test/sql_stmt_gpkg_epsg493_tests/Makefile \
test/sql_stmt_proj_tests/Makefile \
test/sql_stmt_proj492_tests/Makefile \
test/sql_stmt_proj493_tests/Makefile \
test/sql_stmt_mathsql_tests/Makefile \
test/sql_stmt_rtgeom_tests/Makefile \
test/sql_stmt_rttopo_tests/Makefile \
......@@ -153,6 +157,13 @@ AC_CONFIG_FILES([Makefile \
test/sql_stmt_gpkgnocache_tests/Makefile \
test/sql_stmt_voronoj1_tests/Makefile \
test/sql_stmt_voronoj2_tests/Makefile \
test/sql_stmt_sequence_tests/Makefile \
test/sql_stmt_routing_tests/Makefile \
test/sql_stmt_logfile_tests/Makefile \
test/sql_stmt_iconv_tests/Makefile \
test/sql_stmt_point_geom/Makefile \
test/sql_stmt_tiny_point/Makefile \
test/sql_stmt_postgres_tests/Makefile \
examples/Makefile \
Doxyfile \
spatialite.pc])
......@@ -356,7 +367,7 @@ if test x"$enable_geos" != "xno"; then
[], [enable_rttopo=no])
if test x"$enable_rttopo" != "xno"; then
AC_CHECK_HEADERS(librttopo.h,, [AC_MSG_ERROR([cannot find librttopo.h, bailing out])])
AC_SEARCH_LIBS(rtgeom_make_valid,rttopo,,AC_MSG_ERROR(['librttopo' is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-rttopo parameter.]))
AC_SEARCH_LIBS(rtt_AddLineNoFace,rttopo,,AC_MSG_ERROR(['librttopo' (>= v.1.1.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-rttopo parameter.]))
AC_DEFINE(ENABLE_RTTOPO)
fi
else
......
......@@ -2,7 +2,7 @@ Spatialite for Debian
---------------------
Spatialite uses the SQLite experimental extension mechanism described in
http://www.sqlite.org/cvstrac/wiki?p=LoadableExtensions
https://www.sqlite.org/loadext.html
to provide spatial extensions to the SQLite database in both WKT and WKB
formats as described by OGC. Note that the SQLite extension support could
be changed in future release, so be warned.
......
spatialite (5.0.0~beta0-1~exp1) experimental; urgency=medium
* New upstream beta release.
* Update copyright file, changes:
- Update copyright years for Alessandro Furieri
- Update license text for public-domain lex generated files
* Update URL to SQLite Loadable Extensions documentation.
* Require at least librttopo-dev 1.1.0~.
* Update spelling-errors.patch to fix 'retrieve' typo.
* Update symbols for 5.0.0~beta0.
* Drop autopkgtest to test installability.
* Add lintian override for testsuite-autopkgtest-missing.
-- Bas Couwenberg <sebastic@debian.org> Wed, 01 Aug 2018 10:21:51 +0200
spatialite (4.4.0~rc1-1~exp3) experimental; urgency=medium
* Change priority from extra to optional.
......
......@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9.20160114),
libgeos-dev (>= 3.5.0),
libproj-dev,
libreadline-dev,
librttopo-dev,
librttopo-dev (>= 1.1.0~),
libsqlite3-dev,
libxml2-dev,
pkg-config,
......
......@@ -5,7 +5,7 @@ Source: https://www.gaia-gis.it/fossil/libspatialite/
License: MPL-1.1 or GPL-2+ or LGPL-2.1+
Files: *
Copyright: 2008-2016, Alessandro Furieri <a.furieri@lqt.it>
Copyright: 2008-2017, Alessandro Furieri <a.furieri@lqt.it>
2011-2014, Brad Hards <bradh@frogmouth.net>
Comment: Contributor(s):
Ahmadou Dicko <dicko.ahmadou@gmail.com>
......@@ -67,7 +67,12 @@ Files: src/gaiageo/Ewkt.c
src/gaiageo/vanuatuWkt.h
Copyright: Unknown
License: public-domain
The author disclaims copyright to this source code.
The author disclaims copyright to this source code. In place of
a legal notice, here is a blessing:
.
May you do good and not evil.
May you find forgiveness for yourself and forgive others.
May you share freely, never taking more than you give.
Files: src/md5/md5.c
src/md5/md5.h
......
This diff is collapsed.
Description: Fix spelling errors.
* updgrade -> upgrade
* retrive -> retrieve
Author: Bas Couwenberg <sebastic@debian.org>
--- a/src/spatialite/table_cloner.c
+++ b/src/spatialite/table_cloner.c
@@ -2305,7 +2305,7 @@ gaiaAuxClonerExecute (const void *handle
@@ -2315,7 +2315,7 @@ gaiaAuxClonerExecute (const void *handle
if (!upgrade_output_table (cloner))
{
spatialite_e
......@@ -24,3 +25,64 @@ Author: Bas Couwenberg <sebastic@debian.org>
fprintf (out,
"please manually check the <b>%s</b> table.</td></tr>\n",
tmp_table);
--- a/src/gaiageo/gg_xml.c
+++ b/src/gaiageo/gg_xml.c
@@ -336,7 +336,7 @@ splite_xmlSchemaCacheFind (struct splite
xmlSchemaParserCtxtPtr * parser_ctxt,
xmlSchemaPtr * schema)
{
-/* attempting to retrive some XmlSchema from within the Cache */
+/* attempting to retrieve some XmlSchema from within the Cache */
int i;
time_t now;
struct splite_xmlSchema_cache_item *p;
--- a/src/spatialite/spatialite.c
+++ b/src/spatialite/spatialite.c
@@ -34541,7 +34541,7 @@ fnct_sp_stored_execute (sqlite3_context
invalid_stored_procedure:
message =
sqlite3_mprintf
- ("StoredProc exception - unable to retrive a Stored Procedure named \"%s\".",
+ ("StoredProc exception - unable to retrieve a Stored Procedure named \"%s\".",
name);
sqlite3_result_error (context, message, -1);
sqlite3_free (message);
--- a/src/spatialite/srid_aux.c
+++ b/src/spatialite/srid_aux.c
@@ -1739,7 +1739,7 @@ static void
getProjParamsFromSpatialReferenceSystemTable (sqlite3 * sqlite, int srid,
char **proj_params)
{
-/* retrives the PROJ params from SPATIAL_SYS_REF table, if possible */
+/* retrieves the PROJ params from SPATIAL_SYS_REF table, if possible */
char *sql;
char **results;
int rows;
@@ -1890,7 +1890,7 @@ getProjParamsFromGeopackageTable (sqlite
SPATIALITE_PRIVATE void
getProjParams (void *p_sqlite, int srid, char **proj_params)
{
-/* retrives the PROJ params from SPATIAL_SYS_REF table */
+/* retrieves the PROJ params from SPATIAL_SYS_REF table */
sqlite3 *sqlite = (sqlite3 *) p_sqlite;
*proj_params = NULL;
--- a/src/topology/gaia_auxtopo_table.c
+++ b/src/topology/gaia_auxtopo_table.c
@@ -4721,7 +4721,7 @@ auxtopo_retrieve_geometry_type (sqlite3
const char *table, const char *column,
int *ref_type)
{
-/* attempting to retrive the reference Geometry Type */
+/* attempting to retrieve the reference Geometry Type */
int ret;
int i;
char **results;
--- a/test/sql_stmt_iconv_tests/sp_executestored5.testcase
+++ b/test/sql_stmt_iconv_tests/sp_executestored5.testcase
@@ -4,4 +4,4 @@ SELECT StoredProc_Execute('not existing'
1 # rows (not including the header row)
1 # columns
StoredProc_Execute('not existing')
-StoredProc exception - unable to retrive a Stored Procedure named "not existing".
+StoredProc exception - unable to retrieve a Stored Procedure named "not existing".
# Not worth the effort
testsuite-autopkgtest-missing
# Test installability
Depends: @
Test-Command: /bin/true
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
......@@ -91,7 +91,7 @@ Please note: starting since 4.1.0 this is completely canged:
different threads; the internal-cache block must be allocated
by the same thread holding the connection
*/
cache = spatialite_alloc_connection ();
spatialite_init_ex (handle, cache, 0);
......@@ -287,8 +287,9 @@ for each column we'll then get:
GAIA_MULTILINESTRING)
{
#ifndef OMIT_GEOS /* GEOS is required */
gaiaGeomCollLength (geom,
&measure);
gaiaGeomCollLength_r (cache,
geom,
&measure);
printf (" length=%1.2f",
measure);
#else
......@@ -362,7 +363,7 @@ for each column we'll then get:
free (p_geotables[i]);
}
free (p_geotables);
spatialite_shutdown();
spatialite_shutdown ();
return 0;
abort:
......@@ -381,6 +382,6 @@ for each column we'll then get:
}
free (p_geotables);
}
spatialite_shutdown();
spatialite_shutdown ();
return -1;
}
......@@ -240,7 +240,7 @@ creating and checking a POINT Geometry
/* now we'll print the main attributes for this geometry */
printf ("step#1: %s\t\tDimension=%d IsValid=%d\n",
geom_type (gaiaGeometryType (geo_pt)),
gaiaDimension (geo_pt), gaiaIsValid (geo_pt));
gaiaDimension (geo_pt), gaiaIsValid_r (cache, geo_pt));
geometry_printout (geo_pt);
......@@ -265,7 +265,7 @@ now we'll set coordinates for each vertex
printf ("\nstep#2: %s\tDimension=%d IsValid=%d\n",
geom_type (gaiaGeometryType (geo_ln)),
gaiaDimension (geo_ln), gaiaIsValid (geo_ln));
gaiaDimension (geo_ln), gaiaIsValid_r (cache, geo_ln));
geometry_printout (geo_ln);
......@@ -325,7 +325,7 @@ specifying how vertices have to be allocated
printf ("\nstep#3: %s\tDimension=%d IsValid=%d\n",
geom_type (gaiaGeometryType (geo_pg)),
gaiaDimension (geo_pg), gaiaIsValid (geo_pg));
gaiaDimension (geo_pg), gaiaIsValid_r (cache, geo_pg));
geometry_printout (geo_pg);
......@@ -343,7 +343,7 @@ creating and checking a MULTIPOINT Geometry
gaiaAddPointToGeomColl (geo_mpt, 5.0, 25.0);
printf ("\nstep#4: %s\tDimension=%d IsValid=%d\n",
geom_type (gaiaGeometryType (geo_mpt)),
gaiaDimension (geo_mpt), gaiaIsValid (geo_mpt));
gaiaDimension (geo_mpt), gaiaIsValid_r (cache, geo_mpt));
geometry_printout (geo_mpt);
......@@ -365,7 +365,7 @@ creating and checking a MULTILINESTRING Geometry
printf ("\nstep#5: %s\tDimension=%d IsValid=%d\n",
geom_type (gaiaGeometryType (geo_mln)),
gaiaDimension (geo_mln), gaiaIsValid (geo_mln));
gaiaDimension (geo_mln), gaiaIsValid_r (cache, geo_mln));
geometry_printout (geo_mln);
......@@ -395,7 +395,7 @@ creating and checking a MULTIPOLYGON Geometry
printf ("\nstep#6: %s\tDimension=%d IsValid=%d\n",
geom_type (gaiaGeometryType (geo_mpg)),
gaiaDimension (geo_mpg), gaiaIsValid (geo_mpg));
gaiaDimension (geo_mpg), gaiaIsValid_r (cache, geo_mpg));
geometry_printout (geo_mpg);
......@@ -438,7 +438,7 @@ creating and checking a GEOMETRYCOLLECTION Geometry
printf ("\nstep#7: %s\tDimension=%d IsValid=%d\n",
geom_type (gaiaGeometryType (geo_coll)),
gaiaDimension (geo_coll), gaiaIsValid (geo_coll));
gaiaDimension (geo_coll), gaiaIsValid_r (cache, geo_coll));
geometry_printout (geo_coll);
......@@ -542,6 +542,6 @@ we have to destroy each object using temporary storage before exit
gaiaFreeGeomColl (geo_coll);
sqlite3_close (handle);
spatialite_cleanup_ex (cache);
spatialite_shutdown();
spatialite_shutdown ();
return 0;
}
......@@ -15,7 +15,8 @@ LIBOBJ = src\gaiaaux\gg_sqlaux.obj src\gaiaaux\gg_utf8.obj \
src\gaiageo\gg_wkb.obj src\gaiageo\gg_wkt.obj \
src\gaiageo\gg_extras.obj src\gaiageo\gg_xml.obj \
src\gaiageo\gg_voronoj.obj src\gaiageo\gg_matrix.obj \
src\gaiageo\gg_relations_ext.obj src/connection_cache/alloc_cache.obj \
src\gaiageo\gg_relations_ext.obj src\gaiageo\gg_rttopo.obj \
src/connection_cache/alloc_cache.obj src/connection_cache/gg_sequence.obj \
src\spatialite\mbrcache.obj src\shapefiles\shapefiles.obj \
src\spatialite\spatialite.obj src\spatialite\virtualdbf.obj \
src\spatialite\virtualfdo.obj src\spatialite\virtualnetwork.obj \
...