Merge pull request #5493 from gacarrillor/bye_pyspatialite

Bye pyspatialite
qgis · Oct 29, 2017 · 39816cf8432b28684e3bca8973ab9ae78b04e922 · 39816cf
2 parents cfba4c4 + 6415fad
commit 39816cf8432b28684e3bca8973ab9ae78b04e922
diff --git a/debian/copyright b/debian/copyright
@@ -125,10 +125,6 @@ License: public-domain
  is used when saving/restoring a QGIS project.
  This file is in the public domain
 
-Files: python/ext-libs/pyspatialite/*
-Copyright: 2004-2010, Gerhard Häring <gh@ghaering.de>
-License: Zlib
-
 Files: python/plugins/processing/modeler/ModelerArrowItem.py
  src/app/qgssettingstree.cpp
  src/app/qgssettingstree.h

diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -99,7 +99,7 @@ set PYTHONPATH=
 if exist "%PF86%\CMake\bin" path %PATH%;c:\cygwin\bin;%PF86%\CMake\bin
 if exist "%PROGRAMFILES%\CMake\bin" path %PATH%;c:\cygwin\bin;%PROGRAMFILES%\CMake\bin
 
-PROMPT qgis%VERSION%$g 
+PROMPT qgis%VERSION%$g
 
 set BUILDCONF=RelWithDebInfo
 
@@ -185,7 +185,6 @@ cmake -G Ninja ^
 	-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
 	-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
 	-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
-	-D WITH_PYSPATIALITE=TRUE ^
 	-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
 	-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
 	-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -92,7 +92,7 @@ set GRASS_VERSIONS=%GRASS72_VERSION%
 set PYTHONPATH=
 path %PATH%;c:\cygwin\bin;%PF86%\CMake\bin
 
-PROMPT qgis%VERSION%$g 
+PROMPT qgis%VERSION%$g
 
 set BUILDCONF=Release
 
@@ -178,7 +178,6 @@ cmake -G Ninja ^
 	-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
 	-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
 	-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
-	-D WITH_PYSPATIALITE=TRUE ^
 	-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
 	-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
 	-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^

diff --git a/python/ext-libs/CMakeLists.txt b/python/ext-libs/CMakeLists.txt
@@ -3,11 +3,6 @@
 SET (QGIS_PYTHON_DIR ${QGIS_DATA_DIR}/python)
 SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
 
-SET (WITH_PYSPATIALITE FALSE CACHE BOOL "Determines whether PYSPATIALITE should be built")
-IF (WITH_PYSPATIALITE)
-  ADD_SUBDIRECTORY(pyspatialite)
-ENDIF (WITH_PYSPATIALITE)
-
 MACRO(EXT_PYLIB lib enable_by_default)
   STRING(TOUPPER ${lib} ulib)
   SET (WITH_INTERNAL_${ulib} ${enable_by_default} CACHE BOOL "Determines whether python ${lib} should be included")

diff --git a/python/ext-libs/pyspatialite/CMakeLists.txt b/python/ext-libs/pyspatialite/CMakeLists.txt
diff --git a/python/ext-libs/pyspatialite/LICENSE b/python/ext-libs/pyspatialite/LICENSE
diff --git a/python/ext-libs/pyspatialite/lib/__init__.py b/python/ext-libs/pyspatialite/lib/__init__.py
diff --git a/python/ext-libs/pyspatialite/lib/dbapi2.py b/python/ext-libs/pyspatialite/lib/dbapi2.py
diff --git a/python/ext-libs/pyspatialite/lib/dump.py b/python/ext-libs/pyspatialite/lib/dump.py