fix #4805:

- drop internal spatialite and internal spatialindex - drop support for debian lenny (no system spatialindex/spatialite there)
qgis · Apr 23, 2012 · c56491b · c56491b
1 parent b82bc67
commit c56491b
Show file tree

Hide file tree

Showing 70 changed files with 91 additions and 310,347 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,21 +55,10 @@ ENDIF (WITH_POSTGRESQL)
 
 SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")
 
-SET (WITH_INTERNAL_SPATIALINDEX TRUE CACHE BOOL "Use internal build of Spatialindex")
-
 SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")
-
-IF (WITH_SPATIALITE)
-  SET (WITH_INTERNAL_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
-  SET (WITH_PYSPATIALITE TRUE CACHE BOOL "Determines whether PYSPATIALITE should be built")
-  IF(WITH_INTERNAL_SPATIALITE)
-    SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
-    SET(HAVE_SPATIALITE TRUE)
-    IF(WIN32 OR APPLE)
-      FIND_PACKAGE(Iconv REQUIRED)
-    ENDIF(WIN32 OR APPLE)
-  ENDIF (WITH_INTERNAL_SPATIALITE)
-ENDIF (WITH_SPATIALITE)
+IF(WITH_SPATIALITE)
+  SET (WITH_PYSPATIALITE FALSE CACHE BOOL "Determines whether PYSPATIALITE should be built")
+ENDIF(WITH_SPATIALITE)
 
 # try to configure and build python bindings by default
 SET (WITH_BINDINGS TRUE CACHE BOOL "Determines whether python bindings should be built")
@@ -180,21 +169,19 @@ IF (NOT WITH_INTERNAL_QWTPOLAR)
   FIND_PACKAGE(QwtPolar REQUIRED)
 ENDIF(NOT WITH_INTERNAL_QWTPOLAR)
 
-IF (NOT WITH_INTERNAL_SPATIALITE)
-  FIND_PACKAGE(Sqlite3)
-  IF (NOT SQLITE3_FOUND)
-    MESSAGE (SEND_ERROR "sqlite3 dependency was not found (try compiling with internal spatialite)!")
-  ENDIF (NOT SQLITE3_FOUND)
-ENDIF (NOT WITH_INTERNAL_SPATIALITE)
+FIND_PACKAGE(Sqlite3)
+IF (NOT SQLITE3_FOUND)
+  MESSAGE (SEND_ERROR "sqlite3 dependency was not found (try compiling with internal spatialite)!")
+ENDIF (NOT SQLITE3_FOUND)
 
 # optional
 IF (WITH_POSTGRESQL)
   FIND_PACKAGE(Postgres) # PostgreSQL provider, SPIT plugin
 ENDIF (WITH_POSTGRESQL)
 
-IF (WITH_SPATIALITE AND NOT WITH_INTERNAL_SPATIALITE)
+IF (WITH_SPATIALITE)
   FIND_PACKAGE(SPATIALITE)
-ENDIF (WITH_SPATIALITE AND NOT WITH_INTERNAL_SPATIALITE)
+ENDIF (WITH_SPATIALITE)
 
 IF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
   MESSAGE (SEND_ERROR "Some dependencies were not found!")

diff --git a/Doxyfile b/Doxyfile
@@ -598,7 +598,6 @@ INPUT                  = doc \
                          src/core/renderer \
                          src/core/symbology \
                          src/core/symbology-ng \
-                         src/core/spatialindex \
                          src/gui \
                          src/analysis/interpolation \
                          src/analysis/raster \

diff --git a/PROVENANCE b/PROVENANCE
@@ -68,60 +68,6 @@ licensed under the GPL or LGPL, version 2.
 == External Source Files ==
 The following files are included in the QGIS source tree from external
 sources. The source, license, and copyright are noted for each.
-=== src/core/spatialindex/include ===
-Copyright (C) Navel Ltd., LGPL
-* LineSegment.h
-* Point.h
-* PointerPool.h
-* PoolPointer.h
-* RTree.h
-* Region.h
-* SmartPointer.h
-* SpatialIndex.h
-* TemporaryFile.h
-* Tools.h
-=== src/core/spatialindex/storagemanager ===
-Copyright (C) Navel Ltd., LGPL
-* Buffer.cc
-* Buffer.h
-* DiskStorageManager.cc
-* DiskStorageManager.h
-* MemoryStorageManager.cc
-* MemoryStorageManager.h
-* RandomEvictionsBuffer.cc
-* RandomEvictionsBuffer.h
-=== src/core/spatialindex/rtree  ===
-Copyright (C) Navel Ltd., LGPL
-* BulkLoader.cc
-* BulkLoader.h
-* Index.cc
-* Index.h
-* Leaf.cc
-* Leaf.h
-* Node.cc
-* Node.h
-* PointerPoolNode.h
-* RTree.cc
-* RTree.h
-* Statistics.cc
-* Statistics.h
-
-=== src/core/spatialindex/tools ===
-Copyright (C) Navel Ltd., LGPL
-* ExternalSort.cc
-* ExternalSort.h
-* TemporaryFile.cc
-* Tools.cc
-
-=== src/plugins/grid_maker ===
-NOTE: These files have since been removed from SVN:
-* shapefile.h  Copyright (c) 1999, Frank Warmerdam, MIT or LGPL
-* utils.h 
-**Taken from txt2dbf 1.0.2 by Frank Koormann, see
-http://www.usf.uni-osnabrueck.de/~fkoorman/software/dbftools.en.html.  Licensed
-as "The program is free of charge as well as the source" but no license is
-mentioned 
-
 === src/core/quazip ===
 QuaZIP is the C++ wrapper for the Gilles Vollant's ZIP/UNZIP package
 using Trolltech's Qt library. 

diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in
@@ -599,7 +599,6 @@ INPUT                  = @CMAKE_SOURCE_DIR@/doc \
                          @CMAKE_SOURCE_DIR@/src/core/renderer \
                          @CMAKE_SOURCE_DIR@/src/core/symbology \
                          @CMAKE_SOURCE_DIR@/src/core/symbology-ng \
-                         @CMAKE_SOURCE_DIR@/src/core/spatialindex \
                          @CMAKE_SOURCE_DIR@/src/gui \
                          @CMAKE_SOURCE_DIR@/src/analysis/interpolation \
                          @CMAKE_SOURCE_DIR@/src/analysis/raster \

diff --git a/debian/compat.lenny b/debian/compat.lenny
diff --git a/debian/control.lenny b/debian/control.lenny
diff --git a/debian/copyright b/debian/copyright
@@ -176,28 +176,3 @@ License: BSD
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: src/core/spatialindex/include/LineSegment.h
- src/core/spatialindex/include/Point.h
- src/core/spatialindex/include/PointerPool.h
- src/core/spatialindex/include/PoolPointer.h
- src/core/spatialindex/include/RTree.h
- src/core/spatialindex/include/Region.h
- src/core/spatialindex/include/SmartPointer.h
- src/core/spatialindex/include/SpatialIndex.h
- src/core/spatialindex/include/TemporaryFile.h
- src/core/spatialindex/include/Tools.h
-Copyright: 2004, Navel Ltd.
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- On Debian systems, the complete text of the GNU Lesser General Public
- License can be found in the /usr/share/common-licenses/LGPL-2.1 file.
diff --git a/debian/qgis-plugin-grass-common.install.lenny b/debian/qgis-plugin-grass-common.install.lenny