sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

debian packaging: disable WITH_PYSPATIALITE in favor of libsqlite3-mod-spatialite

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-04-30 15:54:04 +02:00
parent 07b2bf1124
commit 82418ea04e
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
INSTALL
View File

@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Saturday April 29, 2017
Sunday April 30, 2017
Last Updated: Saturday April 29, 2017
Last Change : Saturday April 29, 2017
Last Updated: Sunday April 30, 2017
Last Change : Sunday April 30, 2017
1. Introduction
@ -1784,7 +1784,6 @@ In a Terminal cd to the qgis source folder previously downloaded, then:
cd build
cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
-D CMAKE_BUILD_TYPE=MINSIZEREL -D ENABLE_TESTS=FALSE \
-D WITH_PYSPATIALITE=FALSE \
-D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
-D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \

3
debian/control.in vendored
View File

@ -17,7 +17,7 @@ Build-Depends:
libgeos-dev (>= 3.0.0),
libpq-dev,
libproj-dev,
libspatialite-dev,
libspatialite-dev, libsqlite3-mod-spatialite,
libsqlite3-dev,
libspatialindex-dev,
qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtscript5-dev, qtpositioning5-dev, qt5keychain-dev,
@ -331,6 +331,7 @@ Depends:
python3-plotly,
python3-pyproj,
python3-owslib,
libsqlite3-mod-spatialite,
libqgispython{QGIS_ABI},
${shlibs:Depends},
${python:Depends},

1
debian/rules vendored
View File

@ -72,7 +72,6 @@ CMAKE_OPTS := \
-DWITH_SERVER_PLUGINS=TRUE \
-DWITH_QWTPOLAR=FALSE \
-DWITH_QSPATIALITE=TRUE \
-DWITH_PYSPATIALITE=TRUE \
-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR) \
-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#') \
-DDOXYGEN_ON_DEMAND=TRUE

7
doc/INSTALL.html
View File

@ -77,13 +77,13 @@ label{ background-color: #FFFFCC;
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Saturday April 29, 2017</H3>
<H3>Sunday April 30, 2017</H3>
</DIV>
<DIV CLASS="body" ID="body">
<P>
Last Updated: Saturday April 29, 2017
Last Change : Saturday April 29, 2017
Last Updated: Sunday April 30, 2017
Last Change : Sunday April 30, 2017
</P>
<DIV CLASS="toc">
@ -2480,7 +2480,6 @@ mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
-D CMAKE_BUILD_TYPE=MINSIZEREL -D ENABLE_TESTS=FALSE \
-D WITH_PYSPATIALITE=FALSE \
-D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
-D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \

1
doc/osx.t2t
View File

@ -812,7 +812,6 @@ mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
-D CMAKE_BUILD_TYPE=MINSIZEREL -D ENABLE_TESTS=FALSE \
-D WITH_PYSPATIALITE=FALSE \
-D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
-D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \

1
rpm/qgis.spec.template
View File

@ -211,7 +211,6 @@ gzip ChangeLog
-D ENABLE_TESTS:BOOL=FALSE \
-D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
-D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
-D WITH_PYSPATIALITE:BOOL=FALSE \
-D WITH_SERVER:BOOL=TRUE \
%{configure_with_spatialite} \
.