Skip to content

Commit facceb6

Browse files
committedMay 19, 2020
debian packaging: verify absence of Qt3DExtras system headers before
falling back to internal copy
1 parent 882b685 commit facceb6

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed
 

‎debian/control.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ Breaks: python-qgis-common (<< ${source:Version})
423423
Replaces: python-qgis-common (<< ${source:Version})
424424
Suggests:
425425
#eoan focal buster sid# otb-qgis,
426-
saga
426+
saga
427427
Description: Python bindings to QGIS - architecture-independent files
428428
QGIS is a Geographic Information System (GIS) which manages, analyzes and
429429
display databases of geographic information.

‎debian/rules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster bionic eoan focal"))
122122
-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so
123123

124124
ifneq (,$(findstring $(DISTRIBUTION),"sid buster eoan focal"))
125+
$(shell test -f /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasversion.h)
126+
ifneq (0,$(.SHELLSTATUS))
125127
# Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu
126128
CMAKE_OPTS += \
127129
-DCMAKE_PREFIX_PATH=$(realpath external/qt3dextra-headers/cmake) \
@@ -130,6 +132,8 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster eoan focal"))
130132
endif
131133
endif
132134

135+
endif
136+
133137
ifneq (,$(WITH_ORACLE))
134138
ifeq ($(DEB_BUILD_ARCH),amd64)
135139
ORACLE_INCLUDEDIR=/usr/include/oracle/18.5/client64/

0 commit comments

Comments
 (0)
Please sign in to comment.