Bas Couwenberg pushed to branch master at Debian GIS Project / qmapshack
Commits: 674b7f28 by Bas Couwenberg at 2026-04-17T06:35:56+02:00 Add patch to fix FTBFS with GDAL 3.13.0. (closes: #1134149) - - - - - 3 changed files: - debian/changelog - + debian/patches/gdal-3.13.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,6 +1,8 @@ qmapshack (1.20.1-2) UNRELEASED; urgency=medium * Bump Standards-Version to 4.7.4, no changes. + * Add patch to fix FTBFS with GDAL 3.13.0. + (closes: #1134149) -- Bas Couwenberg <[email protected]> Sat, 04 Apr 2026 10:21:47 +0200 ===================================== debian/patches/gdal-3.13.patch ===================================== @@ -0,0 +1,20 @@ +Description: Fix FTBFS with GDAL 3.13.0. + error: 'MIN' was not declared in this scope + error: 'MAX' was not declared in this scope +Author: Bas Couwenberg <[email protected]> +Forwarded: https://github.com/Maproom/qmapshack/pull/1046 + +--- a/src/qmt_map2jnx/main.cpp ++++ b/src/qmt_map2jnx/main.cpp +@@ -430,7 +430,11 @@ static void printProgress(int current, i + static int nLastTick = -1; + int nThisTick = (int)(dfComplete * 40.0); + ++#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 13, 0) ++ nThisTick = CPL_MIN(40, CPL_MAX(0, nThisTick)); ++#else + nThisTick = MIN(40, MAX(0, nThisTick)); ++#endif + + // Have we started a new progress run? + if (nThisTick < nLastTick && nLastTick >= 39) { ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ proj.patch +gdal-3.13.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/-/commit/674b7f286717cb71c5618931f8a9720c09845a54 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/-/commit/674b7f286717cb71c5618931f8a9720c09845a54 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
