Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits: 74ca2b0d by Bas Couwenberg at 2020-05-18T20:35:25+02:00 Don't use embedded copy of qt3extras headers when the system has them. (closes: #960954) - - - - - 2 changed files: - debian/changelog - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +qgis (3.10.6+dfsg-1~exp2) UNRELEASED; urgency=medium + + * Don't use embedded copy of qt3extras headers when the system has them. + (closes: #960954) + + -- Bas Couwenberg <[email protected]> Mon, 18 May 2020 20:33:59 +0200 + qgis (3.10.6+dfsg-1~exp1) experimental; urgency=medium * New upstream release. ===================================== debian/rules ===================================== @@ -125,12 +125,14 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster bionic eoan focal")) ifneq (,$(findstring $(DISTRIBUTION),"sid buster eoan focal")) # Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu +ifneq (0,$(shell ls /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasversion.h 2> /dev/null | grep -c qt3dextrasversion.h)) CMAKE_OPTS += \ -DCMAKE_PREFIX_PATH=$(realpath external/qt3dextra-headers/cmake) \ -DQT5_3DEXTRA_INCLUDE_DIR=$(realpath external/qt3dextra-headers) \ -DQT5_3DEXTRA_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libQt53DExtras.so endif endif +endif ifneq (,$(WITH_ORACLE)) ifeq ($(DEB_BUILD_ARCH),amd64) View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/commit/74ca2b0dad13d139ad0d0c245cbb7635411ceeb4 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/commit/74ca2b0dad13d139ad0d0c245cbb7635411ceeb4 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
