qspatialite: 'update' qt5 port (fixes #19419)

(backport 6551913, c7e914c, 1201df5 & 67e846e3)
qgis · Aug 2, 2018 · 028a8be · 028a8be
1 parent 1def308
commit 028a8be
Show file tree

Hide file tree

Showing 14 changed files with 793 additions and 822 deletions.
diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -88,6 +88,7 @@ RUN  apt-get update \
     qtpositioning5-dev \
     qttools5-dev \
     qttools5-dev-tools \
+    qtbase5-private-dev \
     saga \
     spawn-fcgi \
     txt2tags \

diff --git a/INSTALL b/INSTALL
diff --git a/debian/control.in b/debian/control.in
@@ -22,6 +22,7 @@ Build-Depends:
  libspatialindex-dev,
  libzip-dev,
  qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev, qt5keychain-dev,
+#!xenial# qtbase5-private-dev,
  libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5scintilla2-dev,
  libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins,
  python3-dev, python3-all-dev, python3-sip, python3-sip-dev,
@@ -40,7 +41,7 @@ Build-Depends:
  xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
 #sid buster artful bionic cosmic# libosgearth-dev,
 #artful bionic cosmic# qt3d5-dev, qt3d-assimpsceneimport-plugin, qt3d-defaultgeometryloader-plugin, qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin,
-#oracle# oracle-instantclient12.1-devel, oracle-instantclient12.1-basiclite, qtbase5-private-dev,
+#oracle# oracle-instantclient12.1-devel, oracle-instantclient12.1-basiclite,
  locales, ca-certificates, ninja-build
 Build-Conflicts: libqgis-dev, qgis-dev
 #sid buster stretch xenial yakkety zesty artful bionic cosmic#Standards-Version: 3.9.7

diff --git a/debian/qgis-providers.install.in b/debian/qgis-providers.install.in
@@ -20,4 +20,4 @@ usr/lib/qgis/plugins/libwmsprovider.so
 usr/lib/qgis/plugins/libarcgismapserverprovider.so
 usr/lib/qgis/plugins/libarcgisfeatureserverprovider.so
 usr/lib/qgis/plugins/libmdalprovider.so
-{QT_PLUGINS_DIR}/sqldrivers/libqsqlspatialite.so
+#!xenial#{QT_PLUGINS_DIR}/sqldrivers/libqsqlspatialite.so
diff --git a/debian/rules b/debian/rules
@@ -72,7 +72,6 @@ CMAKE_OPTS := \
 	-DWITH_SERVER=TRUE \
 	-DWITH_SERVER_PLUGINS=TRUE \
 	-DWITH_QWTPOLAR=FALSE \
-	-DWITH_QSPATIALITE=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
@@ -93,6 +92,9 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
+ifneq ($(DISTRIBUTION),xenial)
+	CMAKE_OPTS += -DWITH_QSPATIALITE=TRUE
+endif
 
 ifneq (,$(WITH_GLOBE))
 	CMAKE_OPTS += -DWITH_GLOBE=TRUE
@@ -109,7 +111,6 @@ ifneq (,$(findstring $(DISTRIBUTION),"artful bionic cosmic"))
 		-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
 endif
 
-
 ifneq (,$(WITH_ORACLE))
 ifeq ($(DEB_BUILD_ARCH),amd64)
 	ORACLE_INCLUDEDIR=/usr/include/oracle/12.1/client64/

diff --git a/doc/INSTALL.html b/doc/INSTALL.html
diff --git a/doc/linux.t2t b/doc/linux.t2t
diff --git a/external/qspatialite/CMakeLists.txt b/external/qspatialite/CMakeLists.txt
@@ -6,7 +6,10 @@ ADD_DEFINITIONS(-DQT_PLUGIN)
 ADD_DEFINITIONS(-DQT_NO_DEBUG)
 ADD_DEFINITIONS(-DQT_SHARED)
 
-INCLUDE_DIRECTORIES(SYSTEM ${SQLITE3_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(SYSTEM
+	${SQLITE3_INCLUDE_DIR}
+	${Qt5Sql_PRIVATE_INCLUDE_DIRS}
+)
 
 SET(QSQLSPATIALITE_SRC qsql_spatialite.cpp smain.cpp)
 QT5_WRAP_CPP(QSQLSPATIALITE_SRC qsql_spatialite.h smain.h)