Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits: 28d7072e by Bas Couwenberg at 2022-05-11T08:39:32+02:00 Add patch to fix FTBFS with GDAL 3.5.0. - - - - - 3 changed files: - debian/changelog - + debian/patches/gdal-multiarch.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +qgis (3.22.6+dfsg-1~exp2) UNRELEASED; urgency=medium + + * Add patch to fix FTBFS with GDAL 3.5.0. + + -- Bas Couwenberg <[email protected]> Wed, 11 May 2022 08:31:31 +0200 + qgis (3.22.6+dfsg-1~exp1) experimental; urgency=medium * New upstream release. ===================================== debian/patches/gdal-multiarch.patch ===================================== @@ -0,0 +1,15 @@ +Description: Add support for GDAL 3.5.0 Multi-Arch path. +Author: Bas Couwenberg <[email protected]> +Forwarded: https://github.com/qgis/QGIS/pull/48509 + +--- a/cmake/FindGDAL.cmake ++++ b/cmake/FindGDAL.cmake +@@ -174,7 +174,7 @@ ELSE(WIN32) + SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE) + ENDIF (NOT GDAL_LIBRARY) + ELSE (APPLE) +- FIND_LIBRARY(GDAL_LIBRARY NAMES ${GDAL_LIB_NAME} PATHS ${GDAL_LINK_DIRECTORIES}/lib) ++ FIND_LIBRARY(GDAL_LIBRARY NAMES ${GDAL_LIB_NAME} gdal PATHS ${GDAL_LINK_DIRECTORIES}/lib ${GDAL_LINK_DIRECTORIES}) + ENDIF (APPLE) + + ELSE(GDAL_CONFIG) ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ python-env.patch developersmap-use-debian-package.patch exclude-elvensword-resources.patch spelling-errors.patch +gdal-multiarch.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/commit/28d7072eaa09c5a07c1b1957c8b987f5fffd26d6 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/commit/28d7072eaa09c5a07c1b1957c8b987f5fffd26d6 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
