Skip to content
Commits on Source (11)
......@@ -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
# 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
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libspatialite 4.4.0-RC1.
# Generated by GNU Autoconf 2.69 for libspatialite 5.0.0-beta0.
#
# Report bugs to <a.furieri@lqt.it>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libspatialite'
PACKAGE_TARNAME='libspatialite'
PACKAGE_VERSION='4.4.0-RC1'
PACKAGE_STRING='libspatialite 4.4.0-RC1'
PACKAGE_VERSION='5.0.0-beta0'
PACKAGE_STRING='libspatialite 5.0.0-beta0'
PACKAGE_BUGREPORT='a.furieri@lqt.it'
PACKAGE_URL=''
 
......@@ -1369,7 +1369,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libspatialite 4.4.0-RC1 to adapt to many kinds of systems.
\`configure' configures libspatialite 5.0.0-beta0 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1439,7 +1439,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libspatialite 4.4.0-RC1:";;
short | recursive ) echo "Configuration of libspatialite 5.0.0-beta0:";;
esac
cat <<\_ACEOF
 
......@@ -1581,7 +1581,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libspatialite configure 4.4.0-RC1
libspatialite configure 5.0.0-beta0
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2171,7 +2171,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by libspatialite $as_me 4.4.0-RC1, which was
It was created by libspatialite $as_me 5.0.0-beta0, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -3042,7 +3042,7 @@ fi
 
# Define the identity of the package.
PACKAGE='libspatialite'
VERSION='4.4.0-RC1'
VERSION='5.0.0-beta0'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -17414,7 +17414,7 @@ else
fi
 
 
ac_config_files="$ac_config_files Makefile src/Makefile src/headers/Makefile src/gaiaaux/Makefile src/gaiaexif/Makefile src/gaiageo/Makefile src/gaiageo/flex/Makefile src/gaiageo/lemon/Makefile src/gaiageo/lemon/lemon_src/Makefile src/geopackage/Makefile src/spatialite/Makefile src/shapefiles/Makefile src/dxf/Makefile src/md5/Makefile src/control_points/Makefile src/cutter/Makefile src/topology/Makefile src/srsinit/Makefile src/srsinit/epsg_update/Makefile src/connection_cache/Makefile src/connection_cache/generator/Makefile src/virtualtext/Makefile src/wfs/Makefile test/Makefile test/sql_stmt_tests/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_proj_tests/Makefile test/sql_stmt_mathsql_tests/Makefile test/sql_stmt_rtgeom_tests/Makefile test/sql_stmt_rttopo_tests/Makefile test/sql_stmt_libxml2_tests/Makefile test/sql_stmt_security_tests/Makefile test/sql_stmt_xmlsec_tests/Makefile test/sql_stmt_freexl_tests/Makefile test/sql_stmt_cache_tests/Makefile test/sql_stmt_gpkgcache_tests/Makefile test/sql_stmt_nocache_tests/Makefile test/sql_stmt_gpkgnocache_tests/Makefile test/sql_stmt_voronoj1_tests/Makefile test/sql_stmt_voronoj2_tests/Makefile examples/Makefile Doxyfile spatialite.pc"
ac_config_files="$ac_config_files Makefile src/Makefile src/headers/Makefile src/gaiaaux/Makefile src/gaiaexif/Makefile src/gaiageo/Makefile src/gaiageo/flex/Makefile src/gaiageo/lemon/Makefile src/gaiageo/lemon/lemon_src/Makefile src/geopackage/Makefile src/spatialite/Makefile src/shapefiles/Makefile src/dxf/Makefile src/md5/Makefile src/control_points/Makefile src/cutter/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 src/wfs/Makefile test/Makefile test/sql_stmt_tests/Makefile test/sql_stmt_geos_tests/Makefile test/sql_stmt_geosadvanced_tests/Makefile test/sql_stmt_geopackage_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 test/sql_stmt_libxml2_tests/Makefile test/sql_stmt_security_tests/Makefile test/sql_stmt_xmlsec_tests/Makefile test/sql_stmt_freexl_tests/Makefile test/sql_stmt_cache_tests/Makefile test/sql_stmt_gpkgcache_tests/Makefile test/sql_stmt_nocache_tests/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"
 
 
# exporting the TARGET_CPU string
......@@ -18453,9 +18453,9 @@ fi
 
done
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing rtgeom_make_valid" >&5
$as_echo_n "checking for library containing rtgeom_make_valid... " >&6; }
if ${ac_cv_search_rtgeom_make_valid+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing rtt_AddLineNoFace" >&5
$as_echo_n "checking for library containing rtt_AddLineNoFace... " >&6; }
if ${ac_cv_search_rtt_AddLineNoFace+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
......@@ -18468,11 +18468,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char rtgeom_make_valid ();
char rtt_AddLineNoFace ();
int
main ()
{
return rtgeom_make_valid ();
return rtt_AddLineNoFace ();
;
return 0;
}
......@@ -18485,30 +18485,30 @@ for ac_lib in '' rttopo; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_rtgeom_make_valid=$ac_res
ac_cv_search_rtt_AddLineNoFace=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_rtgeom_make_valid+:} false; then :
if ${ac_cv_search_rtt_AddLineNoFace+:} false; then :
break
fi
done
if ${ac_cv_search_rtgeom_make_valid+:} false; then :
if ${ac_cv_search_rtt_AddLineNoFace+:} false; then :
 
else
ac_cv_search_rtgeom_make_valid=no
ac_cv_search_rtt_AddLineNoFace=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_rtgeom_make_valid" >&5
$as_echo "$ac_cv_search_rtgeom_make_valid" >&6; }
ac_res=$ac_cv_search_rtgeom_make_valid
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_rtt_AddLineNoFace" >&5
$as_echo "$ac_cv_search_rtt_AddLineNoFace" >&6; }
ac_res=$ac_cv_search_rtt_AddLineNoFace
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
else
as_fn_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." "$LINENO" 5
as_fn_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." "$LINENO" 5
fi
 
$as_echo "#define ENABLE_RTTOPO 1" >>confdefs.h
......@@ -19408,7 +19408,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libspatialite $as_me 4.4.0-RC1, which was
This file was extended by libspatialite $as_me 5.0.0-beta0, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -19474,7 +19474,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libspatialite config.status 4.4.0-RC1
libspatialite config.status 5.0.0-beta0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......@@ -20004,6 +20004,7 @@ do
"src/topology/Makefile") CONFIG_FILES="$CONFIG_FILES src/topology/Makefile" ;;
"src/srsinit/Makefile") CONFIG_FILES="$CONFIG_FILES src/srsinit/Makefile" ;;
"src/srsinit/epsg_update/Makefile") CONFIG_FILES="$CONFIG_FILES src/srsinit/epsg_update/Makefile" ;;
"src/stored_procedures/Makefile") CONFIG_FILES="$CONFIG_FILES src/stored_procedures/Makefile" ;;
"src/connection_cache/Makefile") CONFIG_FILES="$CONFIG_FILES src/connection_cache/Makefile" ;;
"src/connection_cache/generator/Makefile") CONFIG_FILES="$CONFIG_FILES src/connection_cache/generator/Makefile" ;;
"src/virtualtext/Makefile") CONFIG_FILES="$CONFIG_FILES src/virtualtext/Makefile" ;;
......@@ -20013,8 +20014,11 @@ do
"test/sql_stmt_geos_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_geos_tests/Makefile" ;;
"test/sql_stmt_geosadvanced_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_geosadvanced_tests/Makefile" ;;
"test/sql_stmt_geopackage_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_geopackage_tests/Makefile" ;;
"test/sql_stmt_gpkg_epsg_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_gpkg_epsg_tests/Makefile" ;;
"test/sql_stmt_gpkg_epsg492_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_gpkg_epsg492_tests/Makefile" ;;
"test/sql_stmt_gpkg_epsg493_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_gpkg_epsg493_tests/Makefile" ;;
"test/sql_stmt_proj_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_proj_tests/Makefile" ;;
"test/sql_stmt_proj492_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_proj492_tests/Makefile" ;;
"test/sql_stmt_proj493_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_proj493_tests/Makefile" ;;
"test/sql_stmt_mathsql_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_mathsql_tests/Makefile" ;;
"test/sql_stmt_rtgeom_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_rtgeom_tests/Makefile" ;;
"test/sql_stmt_rttopo_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_rttopo_tests/Makefile" ;;
......@@ -20028,6 +20032,13 @@ do
"test/sql_stmt_gpkgnocache_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_gpkgnocache_tests/Makefile" ;;
"test/sql_stmt_voronoj1_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_voronoj1_tests/Makefile" ;;
"test/sql_stmt_voronoj2_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_voronoj2_tests/Makefile" ;;
"test/sql_stmt_sequence_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_sequence_tests/Makefile" ;;
"test/sql_stmt_routing_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_routing_tests/Makefile" ;;
"test/sql_stmt_logfile_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_logfile_tests/Makefile" ;;
"test/sql_stmt_iconv_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_iconv_tests/Makefile" ;;
"test/sql_stmt_point_geom/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_point_geom/Makefile" ;;
"test/sql_stmt_tiny_point/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_tiny_point/Makefile" ;;
"test/sql_stmt_postgres_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_postgres_tests/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
"spatialite.pc") CONFIG_FILES="$CONFIG_FILES spatialite.pc" ;;
......
......@@ -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
......
......@@ -160,6 +160,7 @@ libspatialite.so.7 libspatialite7 #MINVER#
callback_deleteFacesById@Base 4.4.0~rc0
callback_deleteNodesById@Base 4.4.0~rc0
callback_freeTopology@Base 4.4.0~rc0
callback_getAllEdges@Base 5.0.0~beta0
callback_getEdgeByFace@Base 4.4.0~rc0
callback_getEdgeById@Base 4.4.0~rc0
callback_getEdgeByNode@Base 4.4.0~rc0
......@@ -200,16 +201,21 @@ libspatialite.so.7 libspatialite7 #MINVER#
create_wfs_schema@Base 4.1.0
destroy_wfs_catalog@Base 4.1.0
destroy_wfs_schema@Base 4.1.0
disable_tiny_point@Base 5.0.0~beta0
dump_dbf@Base 3.0.2~20120302
dump_dbf_ex2@Base 5.0.0~beta0
dump_dbf_ex@Base 4.2.1~
dump_geojson@Base 3.0.2~20120302
dump_geojson_ex@Base 4.2.1~
dump_kml@Base 3.0.2~20120302
dump_kml_ex@Base 4.2.1~
dump_shapefile@Base 3.0.2~20120302
dump_shapefile_ex@Base 5.0.0~beta0
elementary_geometries@Base 3.0.2~20120302
elementary_geometries_ex2@Base 4.3.0~rc0
elementary_geometries_ex3@Base 5.0.0~beta0
elementary_geometries_ex@Base 4.2.1~
enable_tiny_point@Base 5.0.0~beta0
ewktParse@Base 3.0.0
ewktParseAlloc@Base 3.0.0
ewktParseFree@Base 3.0.0
......@@ -229,6 +235,7 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaAddIsoNode@Base 4.4.0~rc0
gaiaAddLinestringToGeomColl@Base 2.4.0
gaiaAddLink@Base 4.4.0~rc0
gaiaAddMeasure@Base 5.0.0~beta0
gaiaAddPointToGeomColl@Base 2.4.0
gaiaAddPointToGeomCollXYM@Base 2.4.0
gaiaAddPointToGeomCollXYZ@Base 2.4.0
......@@ -265,6 +272,7 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaAppendPointZMToDynamicLine@Base 3.0.0
gaiaAppendPointZToDynamicLine@Base 3.0.0
gaiaAppendToOutBuffer@Base 3.0.0
gaiaAsEncodedPolyLine@Base 5.0.0~beta0
gaiaAsX3D@Base 4.4.0~rc0
gaiaAzimuth@Base 4.4.0~rc0
gaiaBoundary@Base 2.4.0
......@@ -274,10 +282,15 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaBuildMbr@Base 2.4.0
gaiaCastGeomCollToXY@Base 2.4.0
gaiaCastGeomCollToXYM@Base 2.4.0
gaiaCastGeomCollToXYMnoData@Base 5.0.0~beta0
gaiaCastGeomCollToXYZ@Base 2.4.0
gaiaCastGeomCollToXYZM@Base 2.4.0
gaiaCastGeomCollToXYZMnoData@Base 5.0.0~beta0
gaiaCastGeomCollToXYZnoData@Base 5.0.0~beta0
gaiaChangeEdgeGeom@Base 4.4.0~rc0
gaiaChangeLinkGeom@Base 4.4.0~rc0
gaiaCheckClockwise@Base 5.0.0~beta0
gaiaCheckCounterClockwise@Base 5.0.0~beta0
gaiaCleanSqlString@Base 2.4.0
gaiaClockwise@Base 2.4.0
gaiaCloneDbfEntity@Base 2.4.0
......@@ -304,8 +317,10 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaConvexHull@Base 2.4.0
gaiaConvexHull_r@Base 4.2.0
gaiaCopyLinestringCoords@Base 2.4.0
gaiaCopyLinestringCoordsEx@Base 5.0.0~beta0
gaiaCopyLinestringCoordsReverse@Base 4.0.0
gaiaCopyRingCoords@Base 2.4.0
gaiaCopyRingCoordsEx@Base 5.0.0~beta0
gaiaCopyRingCoordsReverse@Base 4.0.0
gaiaCreateControlPoints@Base 4.3.0~rc0
gaiaCreateDxfParser@Base 4.1.0
......@@ -314,6 +329,7 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaCreateMetaCatalogTables@Base 4.2.0
gaiaCreatePolygon@Base 2.4.0
gaiaCreatePolynomialCoeffs@Base 4.3.0~rc0
gaiaCreateSequence@Base 5.0.0~beta0
gaiaCreateUTF8Converter@Base 2.4.0
gaiaCriticalPointFromGEOSmsg@Base 4.2.0
gaiaCriticalPointFromGEOSmsg_r@Base 4.2.0
......@@ -329,6 +345,8 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaDissolvePoints@Base 3.0.0
gaiaDissolveSegments@Base 3.0.0
gaiaDoubleQuotedSql@Base 3.0.2~20120302
gaiaDrapeLine@Base 5.0.0~beta0
gaiaDrapeLineExceptions@Base 5.0.0~beta0
gaiaDropTable@Base 4.0.0
gaiaDropTableEx2@Base 4.3.0~rc0
gaiaDropTableEx3@Base 4.4.0~rc0
......@@ -358,6 +376,7 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaEllipsoidAzimuth@Base 4.4.0~rc0
gaiaEncodeURL@Base 4.3.0~rc0
gaiaEndianArch@Base 2.4.0
gaiaEnsureClosedRings@Base 5.0.0~beta0
gaiaEwkbGetLinestring@Base 4.0.0
gaiaEwkbGetMultiGeometry@Base 4.0.0
gaiaEwkbGetPoint@Base 4.0.0
......@@ -395,6 +414,7 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaFileExtFromPath@Base 4.3.0~rc0
gaiaFileNameFromPath@Base 4.3.0~rc0
gaiaFinalizeMD5Checksum@Base 4.1.0
gaiaFindSequence@Base 5.0.0~beta0
gaiaFlushDbfHeader@Base 3.0.0
gaiaFlushShpHeaders@Base 2.4.0
gaiaFree@Base 2.4.0
......@@ -427,10 +447,12 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaFromSpatiaLiteBlobMbr@Base 2.4.0
gaiaFromSpatiaLiteBlobWkb@Base 2.4.0
gaiaFromSpatiaLiteBlobWkbEx@Base 4.3.0~rc0
gaiaFromTWKB@Base 5.0.0~beta0
gaiaFromWkb@Base 2.4.0
gaiaFullFileNameFromPath@Base 4.3.0~rc0
gaiaGPKG2Spatialite@Base 4.2.0
gaiaGeoHash@Base 4.4.0~rc0
gaiaGeodesicArcLength@Base 5.0.0~beta0
gaiaGeodesicArea@Base 4.4.0~rc0
gaiaGeodesicDistance@Base 2.4.0
gaiaGeodesicTotalLength@Base 2.4.0
......@@ -472,6 +494,8 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaGeomCollPreparedTouches@Base 4.1.0
gaiaGeomCollPreparedWithin@Base 4.1.0
gaiaGeomCollRelate@Base 2.4.0
gaiaGeomCollRelateBoundaryNodeRule@Base 5.0.0~beta0
gaiaGeomCollRelateBoundaryNodeRule_r@Base 5.0.0~beta0
gaiaGeomCollRelate_r@Base 4.2.0
gaiaGeomCollSimplify@Base 2.4.0
gaiaGeomCollSimplifyPreserveTopology@Base 2.4.0
......@@ -511,6 +535,7 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaGetGeosErrorMsg_r@Base 4.2.0
gaiaGetGeosWarningMsg@Base 2.4.0
gaiaGetGeosWarningMsg_r@Base 4.2.0
gaiaGetGpkgRTreeFullExtent@Base 5.0.0~beta0
gaiaGetGpsCoords@Base 2.4.0
gaiaGetGpsLatLong@Base 2.4.0
gaiaGetLayerExtent@Base 4.1.0
......@@ -526,6 +551,7 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaGetNodeByPoint@Base 4.4.0~rc0
gaiaGetPointOnSurface@Base 2.4.0
gaiaGetPointOnSurface_r@Base 4.2.0
gaiaGetRTreeFullExtent@Base 5.0.0~beta0
gaiaGetRtTopoErrorMsg@Base 4.4.0~rc0
gaiaGetRtTopoWarningMsg@Base 4.4.0~rc0
gaiaGetSridFromGPB@Base 4.3.0~rc0
......@@ -549,7 +575,10 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaInsertIntoSqlLog@Base 4.0.0
gaiaInsertLinestringInGeomColl@Base 2.4.0
gaiaInsertPolygonInGeomColl@Base 2.4.0
gaiaInterpolatePoint@Base 5.0.0~beta0
gaiaIntersect@Base 2.4.0
gaiaIntersectionMatrixPatternMatch@Base 5.0.0~beta0
gaiaIntersectionMatrixPatternMatch_r@Base 5.0.0~beta0
gaiaIsClosed@Base 2.4.0
gaiaIsClosedGeom@Base 4.0.0
gaiaIsClosedGeom_r@Base 4.2.0
......@@ -587,8 +616,11 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaIsValidGPB@Base 4.3.0~rc0
gaiaIsValidReason@Base 4.2.0
gaiaIsValidReason_r@Base 4.2.0
gaiaIsValidTrajectory@Base 5.0.0~beta0
gaiaIsValidXmlBlob@Base 4.1.1
gaiaIsValid_r@Base 4.2.0
gaiaLastUsedSequence@Base 5.0.0~beta0
gaiaLineFromEncodedPolyline@Base 5.0.0~beta0
gaiaLineGetPoint@Base 2.4.0
gaiaLineInterpolateEquidistantPoints@Base 4.0.0
gaiaLineInterpolateEquidistantPoints_r@Base 4.2.0
......@@ -616,9 +648,13 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaMakeEllipticArc@Base 4.1.0
gaiaMakeLine@Base 3.0.0
gaiaMakePoint@Base 2.4.0
gaiaMakePointEx@Base 5.0.0~beta0
gaiaMakePointM@Base 3.0.2~20120302
gaiaMakePointMEx@Base 5.0.0~beta0
gaiaMakePointZ@Base 3.0.2~20120302
gaiaMakePointZEx@Base 5.0.0~beta0
gaiaMakePointZM@Base 3.0.2~20120302
gaiaMakePointZMEx@Base 5.0.0~beta0
gaiaMakePolygon@Base 4.2.0
gaiaMakeValid@Base 4.4.0~rc0
gaiaMakeValidDiscarded@Base 4.4.0~rc0
......@@ -662,8 +698,10 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaOffsetCurve_r@Base 4.2.0
gaiaOpenDbfRead@Base 2.4.0
gaiaOpenDbfWrite@Base 3.0.0
gaiaOpenDbfWriteEx@Base 5.0.0~beta0
gaiaOpenShpRead@Base 2.4.0
gaiaOpenShpWrite@Base 2.4.0
gaiaOpenShpWriteEx@Base 5.0.0~beta0
gaiaOutBareKml@Base 3.0.0
gaiaOutBufferInitialize@Base 3.0.0
gaiaOutBufferReset@Base 3.0.0
......@@ -721,10 +759,12 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaRemIsoNetNode@Base 4.4.0~rc0
gaiaRemIsoNode@Base 4.4.0~rc0
gaiaRemoveLink@Base 4.4.0~rc0
gaiaRemoveRepeatedPoints@Base 5.0.0~beta0
gaiaResetDbfEntity@Base 2.4.0
gaiaResetGeosMsg@Base 2.4.0
gaiaResetGeosMsg_r@Base 4.2.0
gaiaResetRtTopoMsg@Base 4.4.0~rc0
gaiaResetSequence@Base 5.0.0~beta0
gaiaReverseDynamicLine@Base 2.4.0
gaiaRingCentroid@Base 2.4.0
gaiaRingGetPoint@Base 2.4.0
......@@ -733,6 +773,7 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaSanitize@Base 2.4.0
gaiaScaleCoords@Base 2.4.0
gaiaSegmentize@Base 4.4.0~rc0
gaiaSequenceNext@Base 5.0.0~beta0
gaiaSetDoubleValue@Base 2.4.0
gaiaSetGeosAuxErrorMsg@Base 4.1.0
gaiaSetGeosAuxErrorMsg_r@Base 4.2.0
......@@ -783,37 +824,57 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaToGeos_r@Base 4.2.0
gaiaToHexWkb@Base 2.4.0
gaiaToSpatiaLiteBlobWkb@Base 2.4.0
gaiaToSpatiaLiteBlobWkbEx2@Base 5.0.0~beta0
gaiaToSpatiaLiteBlobWkbEx@Base 4.3.0~rc0
gaiaToTWKB@Base 5.0.0~beta0
gaiaToWkb@Base 2.4.0
gaiaTopoGeoSnapLinestringToSeed@Base 4.4.0~rc0
gaiaTopoGeoSnapPointToSeed@Base 4.4.0~rc0
gaiaTopoGeoUpdateSeeds@Base 4.4.0~rc0
gaiaTopoGeo_AddLineString@Base 4.4.0~rc0
gaiaTopoGeo_AddLineStringNoFace@Base 5.0.0~beta0
gaiaTopoGeo_AddPoint@Base 4.4.0~rc0
gaiaTopoGeo_AddPolygon@Base 4.4.0~rc0
gaiaTopoGeo_CreateTopoLayer@Base 4.4.0~rc0
gaiaTopoGeo_DisambiguateSegmentEdges@Base 5.0.0~beta0
gaiaTopoGeo_ExportTopoLayer@Base 4.4.0~rc0
gaiaTopoGeo_FromGeoTable@Base 4.4.0~rc0
gaiaTopoGeo_FromGeoTableExtended@Base 4.4.0~rc0
gaiaTopoGeo_FromGeoTableNoFace@Base 5.0.0~beta0
gaiaTopoGeo_FromGeoTableNoFaceExtended@Base 5.0.0~beta0
gaiaTopoGeo_InitTopoLayer@Base 4.4.0~rc0
gaiaTopoGeo_InsertFeatureFromTopoLayer@Base 4.4.0~rc0
gaiaTopoGeo_LineEdgesList@Base 5.0.0~beta0
gaiaTopoGeo_ModEdgeHeal@Base 5.0.0~beta0
gaiaTopoGeo_ModEdgeSplit@Base 5.0.0~beta0
gaiaTopoGeo_NewEdgeHeal@Base 5.0.0~beta0
gaiaTopoGeo_NewEdgesSplit@Base 5.0.0~beta0
gaiaTopoGeo_PolyFacesList@Base 5.0.0~beta0
gaiaTopoGeo_Polygonize@Base 5.0.0~beta0
gaiaTopoGeo_RemoveDanglingEdges@Base 4.4.0~rc0
gaiaTopoGeo_RemoveDanglingNodes@Base 4.4.0~rc0
gaiaTopoGeo_RemoveSmallFaces@Base 4.4.0~rc0
gaiaTopoGeo_RemoveTopoLayer@Base 4.4.0~rc0
gaiaTopoGeo_SnappedGeoTable@Base 5.0.0~beta0
gaiaTopoGeo_SubdivideLines@Base 4.4.0~rc0
gaiaTopoGeo_ToGeoTable@Base 4.4.0~rc0
gaiaTopoGeo_ToGeoTableGeneralize@Base 4.4.0~rc0
gaiaTopoNetUpdateSeeds@Base 4.4.0~rc0
gaiaTopoNet_DisambiguateSegmentLinks@Base 5.0.0~beta0
gaiaTopoNet_FromGeoTable@Base 4.4.0~rc0
gaiaTopoNet_LineLinksList@Base 5.0.0~beta0
gaiaTopoNet_ToGeoTable@Base 4.4.0~rc0
gaiaTopoNet_ToGeoTableGeneralize@Base 4.4.0~rc0
gaiaTopoSnap@Base 5.0.0~beta0
gaiaTopologyCreate@Base 4.4.0~rc0
gaiaTopologyDestroy@Base 4.4.0~rc0
gaiaTopologyDrop@Base 4.4.0~rc0
gaiaTopologyFromCache@Base 4.4.0~rc0
gaiaTopologyFromDBMS@Base 4.4.0~rc0
gaiaTrajectoryInterpolatePoint@Base 5.0.0~beta0
gaiaTransform@Base 2.4.0
gaiaTransformXY@Base 5.0.0~beta0
gaiaTransformXY_r@Base 5.0.0~beta0
gaiaTransform_r@Base 4.2.0
gaiaTriangularGrid@Base 4.0.0
gaiaTriangularGrid_r@Base 4.2.0
......@@ -861,6 +922,9 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaiaZRangePolygon@Base 2.4.0
gaiaZRangeRing@Base 2.4.0
gaia_already_initialized@Base 4.2.0
gaia_create_routing@Base 5.0.0~beta0
gaia_create_routing_get_last_error@Base 5.0.0~beta0
gaia_create_routing_nodes@Base 5.0.0~beta0
gaia_geos_error_msg@Base 2.4.0
gaia_geos_warning_msg@Base 2.4.0
gaia_geosaux_error_msg@Base 4.1.0
......@@ -873,6 +937,32 @@ libspatialite.so.7 libspatialite7 #MINVER#
gaia_matrix_is_valid@Base 4.3.0~rc0
gaia_matrix_multiply@Base 4.3.0~rc0
gaia_matrix_transform_geometry@Base 4.3.0~rc0
gaia_sql_proc_add_variable@Base 5.0.0~beta0
gaia_sql_proc_all_variables@Base 5.0.0~beta0
gaia_sql_proc_cooked_sql@Base 5.0.0~beta0
gaia_sql_proc_create_variables@Base 5.0.0~beta0
gaia_sql_proc_destroy_variables@Base 5.0.0~beta0
gaia_sql_proc_execute@Base 5.0.0~beta0
gaia_sql_proc_get_last_error@Base 5.0.0~beta0
gaia_sql_proc_import@Base 5.0.0~beta0
gaia_sql_proc_is_valid@Base 5.0.0~beta0
gaia_sql_proc_is_valid_var_value@Base 5.0.0~beta0
gaia_sql_proc_logfile@Base 5.0.0~beta0
gaia_sql_proc_parse@Base 5.0.0~beta0
gaia_sql_proc_raw_sql@Base 5.0.0~beta0
gaia_sql_proc_var_count@Base 5.0.0~beta0
gaia_sql_proc_variable@Base 5.0.0~beta0
gaia_stored_proc_create_tables@Base 5.0.0~beta0
gaia_stored_proc_delete@Base 5.0.0~beta0
gaia_stored_proc_fetch@Base 5.0.0~beta0
gaia_stored_proc_store@Base 5.0.0~beta0
gaia_stored_proc_update_sql@Base 5.0.0~beta0
gaia_stored_proc_update_title@Base 5.0.0~beta0
gaia_stored_var_delete@Base 5.0.0~beta0
gaia_stored_var_fetch@Base 5.0.0~beta0
gaia_stored_var_store@Base 5.0.0~beta0
gaia_stored_var_update_title@Base 5.0.0~beta0
gaia_stored_var_update_value@Base 5.0.0~beta0
geoJSONParse@Base 3.0.0
geoJSONParseAlloc@Base 3.0.0
geoJSONParseFree@Base 3.0.0
......@@ -903,6 +993,7 @@ libspatialite.so.7 libspatialite7 #MINVER#
gpkgSetHeader2DMbr@Base 4.3.0~rc0
insert_epsg_srid@Base 3.0.2~20120302
is_kml_constant@Base 3.0.2~20120302
is_tiny_point_enabled@Base 5.0.0~beta0
kmlParse@Base 3.0.0
kmlParseAlloc@Base 3.0.0
kmlParseFree@Base 3.0.0
......@@ -910,11 +1001,14 @@ libspatialite.so.7 libspatialite7 #MINVER#
load_XL@Base 3.0.2~20120302
load_dbf@Base 3.0.2~20120302
load_dbf_ex2@Base 4.2.1~
load_dbf_ex3@Base 5.0.0~beta0
load_dbf_ex@Base 4.0.0
load_from_wfs@Base 4.1.0
load_from_wfs_paged@Base 4.1.0
load_from_wfs_paged_ex@Base 5.0.0~beta0
load_shapefile@Base 3.0.2~20120302
load_shapefile_ex2@Base 4.2.1~
load_shapefile_ex3@Base 5.0.0~beta0
load_shapefile_ex@Base 4.0.0
lwn_AddIsoNetNode@Base 4.4.0~rc0
lwn_AddLink@Base 4.4.0~rc0
......
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,
......
......@@ -287,7 +287,8 @@ for each column we'll then get:
GAIA_MULTILINESTRING)
{
#ifndef OMIT_GEOS /* GEOS is required */
gaiaGeomCollLength (geom,
gaiaGeomCollLength_r (cache,
geom,
&measure);
printf (" length=%1.2f",
measure);
......
......@@ -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);
......
......@@ -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 \
......@@ -25,7 +26,8 @@ LIBOBJ = src\gaiaaux\gg_sqlaux.obj src\gaiaaux\gg_utf8.obj \
src\spatialite\virtualxpath.obj src\spatialite\virtualbbox.obj \
src\spatialite\spatialite_init.obj src\spatialite\se_helpers.obj \
src\spatialite\srid_aux.obj src\spatialite\table_cloner.obj \
src\spatialite\virtualelementary.obj \
src\spatialite\virtualelementary.obj src\spatialite\virtualrouting.obj \
src\spatialite\create_routing.obj \
src\wfs\wfs_in.obj src\srsinit\srs_init.obj \
src\dxf\dxf_parser.obj src\dxf\dxf_loader.obj src\dxf\dxf_writer.obj \
src\dxf\dxf_load_distinct.obj src\dxf\dxf_load_mixed.obj \
......@@ -53,14 +55,24 @@ LIBOBJ = src\gaiaaux\gg_sqlaux.obj src\gaiaaux\gg_utf8.obj \
src\srsinit\epsg_inlined_40.obj src\srsinit\epsg_inlined_41.obj \
src\srsinit\epsg_inlined_42.obj src\srsinit\epsg_inlined_43.obj \
src\srsinit\epsg_inlined_44.obj src\srsinit\epsg_inlined_45.obj \
src\srsinit\epsg_inlined_46.obj src\srsinit\epsg_inlined_extra.obj \
src\srsinit\epsg_inlined_prussian.obj \
src\srsinit\epsg_inlined_46.obj src\srsinit\epsg_inlined_47.obj \
src\srsinit\epsg_inlined_48.obj src\srsinit\epsg_inlined_49.obj \
src\srsinit\epsg_inlined_50.obj src\srsinit\epsg_inlined_51.obj \
src\srsinit\epsg_inlined_extra.obj src\srsinit\epsg_inlined_prussian.obj \
src\srsinit\epsg_inlined_wgs84_00.obj src\srsinit\epsg_inlined_wgs84_01.obj \
src\versioninfo\version.obj src\virtualtext\virtualtext.obj \
src\cutter\gaia_cutter.obj src\spatialite\virtualknn.obj
src\cutter\gaia_cutter.obj src\spatialite\virtualknn.obj \
src\topology\gaia_auxnet.obj src\topology\gaia_topostmts.obj \
src\topology\gaia_auxtopo.obj src\topology\lwn_network.obj \
src\topology\gaia_netstmts.obj src\topology\net_callbacks.obj \
src\topology\gaia_network.obj src\topology\topo_callbacks.obj \
src\topology\gaia_topology.obj \
src\stored_procedures\stored_procedures.obj
SPATIALITE_DLL = spatialite$(VERSION).dll
CFLAGS = /nologo -I.\src\headers -I. -IC:\OSGeo4W\include $(OPTFLAGS)
CFLAGS = /nologo -I.\src\headers -I.\src\topology \
-I. -IC:\OSGeo4W\include $(OPTFLAGS)
default: all
......@@ -91,9 +103,12 @@ clean:
del *.exp
del *.manifest
del *.lib
del src\connection_cache\*.obj
del src\cutter\*.obj
del src\gaiaaux\*.obj
del src\gaiaexif\*.obj
del src\gaiageo\*.obj
del src\shapefiles\*.obj
del src\spatialite\*.obj
del src\srsinit\*.obj
del src\versioninfo\*.obj
......@@ -101,6 +116,8 @@ clean:
del src\wfs\*.obj
del src\dxf\*.obj
del src\md5\*.obj
del src\topology\*.obj
del src\stored_procedures\*.obj
del *.pdb
install: all
......