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

debian packaging: verify absence of Qt3DExtras system headers before

Browse Source 
falling back to internal copy
This commit is contained in:
Juergen E. Fischer 2020-05-19 20:39:29 +02:00
parent 882b6855f2
commit facceb6931
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control.in vendored
View File

@ -423,7 +423,7 @@ Breaks: python-qgis-common (<< ${source:Version})
Replaces: python-qgis-common (<< ${source:Version}) Replaces: python-qgis-common (<< ${source:Version})
Suggests: Suggests:
#eoan focal buster sid# otb-qgis, #eoan focal buster sid# otb-qgis,
saga saga
Description: Python bindings to QGIS - architecture-independent files Description: Python bindings to QGIS - architecture-independent files
QGIS is a Geographic Information System (GIS) which manages, analyzes and QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information. display databases of geographic information.

4
debian/rules vendored
View File

@ -122,6 +122,8 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster bionic eoan focal"))
-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
ifneq (,$(findstring $(DISTRIBUTION),"sid buster eoan focal")) ifneq (,$(findstring $(DISTRIBUTION),"sid buster eoan focal"))
$(shell test -f /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasversion.h)
ifneq (0,$(.SHELLSTATUS))
# Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu # Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu
CMAKE_OPTS += \ CMAKE_OPTS += \
-DCMAKE_PREFIX_PATH=$(realpath external/qt3dextra-headers/cmake) \ -DCMAKE_PREFIX_PATH=$(realpath external/qt3dextra-headers/cmake) \
@ -130,6 +132,8 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster eoan focal"))
endif endif
endif endif
endif
ifneq (,$(WITH_ORACLE)) ifneq (,$(WITH_ORACLE))
ifeq ($(DEB_BUILD_ARCH),amd64) ifeq ($(DEB_BUILD_ARCH),amd64)
ORACLE_INCLUDEDIR=/usr/include/oracle/18.5/client64/ ORACLE_INCLUDEDIR=/usr/include/oracle/18.5/client64/