Skip to content

Commit 39816cf

Browse files
authored
Merge pull request #5493 from gacarrillor/bye_pyspatialite
Bye pyspatialite
2 parents cfba4c4 + 6415fad commit 39816cf

30 files changed

+29
-6051
lines changed

debian/copyright

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,6 @@ License: public-domain
125125
is used when saving/restoring a QGIS project.
126126
This file is in the public domain
127127

128-
Files: python/ext-libs/pyspatialite/*
129-
Copyright: 2004-2010, Gerhard Häring <gh@ghaering.de>
130-
License: Zlib
131-
132128
Files: python/plugins/processing/modeler/ModelerArrowItem.py
133129
src/app/qgssettingstree.cpp
134130
src/app/qgssettingstree.h

ms-windows/osgeo4w/package-nightly.cmd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ set PYTHONPATH=
9999
if exist "%PF86%\CMake\bin" path %PATH%;c:\cygwin\bin;%PF86%\CMake\bin
100100
if exist "%PROGRAMFILES%\CMake\bin" path %PATH%;c:\cygwin\bin;%PROGRAMFILES%\CMake\bin
101101

102-
PROMPT qgis%VERSION%$g
102+
PROMPT qgis%VERSION%$g
103103

104104
set BUILDCONF=RelWithDebInfo
105105

@@ -185,7 +185,6 @@ cmake -G Ninja ^
185185
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
186186
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
187187
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
188-
-D WITH_PYSPATIALITE=TRUE ^
189188
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
190189
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
191190
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^

ms-windows/osgeo4w/package.cmd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ set GRASS_VERSIONS=%GRASS72_VERSION%
9292
set PYTHONPATH=
9393
path %PATH%;c:\cygwin\bin;%PF86%\CMake\bin
9494

95-
PROMPT qgis%VERSION%$g
95+
PROMPT qgis%VERSION%$g
9696

9797
set BUILDCONF=Release
9898

@@ -178,7 +178,6 @@ cmake -G Ninja ^
178178
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
179179
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
180180
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
181-
-D WITH_PYSPATIALITE=TRUE ^
182181
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
183182
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
184183
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^

python/ext-libs/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
SET (QGIS_PYTHON_DIR ${QGIS_DATA_DIR}/python)
44
SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
55

6-
SET (WITH_PYSPATIALITE FALSE CACHE BOOL "Determines whether PYSPATIALITE should be built")
7-
IF (WITH_PYSPATIALITE)
8-
ADD_SUBDIRECTORY(pyspatialite)
9-
ENDIF (WITH_PYSPATIALITE)
10-
116
MACRO(EXT_PYLIB lib enable_by_default)
127
STRING(TOUPPER ${lib} ulib)
138
SET (WITH_INTERNAL_${ulib} ${enable_by_default} CACHE BOOL "Determines whether python ${lib} should be included")

python/ext-libs/pyspatialite/CMakeLists.txt

Lines changed: 0 additions & 66 deletions
This file was deleted.

python/ext-libs/pyspatialite/LICENSE

Lines changed: 0 additions & 19 deletions
This file was deleted.

python/ext-libs/pyspatialite/lib/__init__.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

python/ext-libs/pyspatialite/lib/dbapi2.py

Lines changed: 0 additions & 91 deletions
This file was deleted.

python/ext-libs/pyspatialite/lib/dump.py

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)