Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits: d57c7776 by Bas Couwenberg at 2024-03-07T18:43:29+01:00 Bump minimum GRASS build dependency version to 8.3.2. - - - - - 0170ba80 by Bas Couwenberg at 2024-03-08T05:29:16+01:00 Add upstream patch to fix FTBFS with PROJ 9.4.0. (closes: #1065501) - - - - - 51c59c2a by Bas Couwenberg at 2024-03-08T08:03:58+01:00 Set distribution to unstable. - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/pr56765-mod_krovak.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +qgis (3.34.4+dfsg-4) unstable; urgency=medium + + * Bump minimum GRASS build dependency version to 8.3.2. + * Add upstream patch to fix FTBFS with PROJ 9.4.0. + (closes: #1065501) + + -- Bas Couwenberg <[email protected]> Fri, 08 Mar 2024 08:03:33 +0100 + qgis (3.34.4+dfsg-3) unstable; urgency=medium * Add dpkg-dev (>= 1.22.5) to build dependencies for t64 changes. ===================================== debian/control ===================================== @@ -14,7 +14,7 @@ Build-Depends: bison, dpkg-dev (>= 1.22.5), flex, gdal-bin, - grass-dev (>= 8.3.1), + grass-dev (>= 8.3.2), libexiv2-dev, libexpat1-dev, libfcgi-dev, ===================================== debian/patches/pr56765-mod_krovak.patch ===================================== @@ -0,0 +1,16 @@ +Description: Fix compilation with proj 9.4+ +Author: Nyall Dawson <[email protected]> +Origin: https://github.com/qgis/QGIS/pull/56765 +Bug: https://github.com/qgis/QGIS/pull/56765 + +--- a/src/core/proj/qgscoordinatereferencesystemutils.cpp ++++ b/src/core/proj/qgscoordinatereferencesystemutils.cpp +@@ -348,6 +348,8 @@ QString QgsCoordinateReferenceSystemUtil + return QObject::tr( "Miller Oblated Stereographic" ); + if ( projection == QLatin1String( "mill" ) ) + return QObject::tr( "Miller Cylindrical" ); ++ if ( projection == QLatin1String( "mod_krovak" ) ) ++ return QObject::tr( "Modified Krovak" ); + if ( projection == QLatin1String( "moll" ) ) + return QObject::tr( "Mollweide" ); + if ( projection == QLatin1String( "murd1" ) ) ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ developersmap-use-debian-package.patch exclude-elvensword-resources.patch exclude-cc-by-nc-resources.patch spelling-errors.patch +pr56765-mod_krovak.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/90e6653f9a721f89466eb12e67c0a3334b3b1d99...51c59c2ab5a32ca90ecd09523301a599738fb267 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/90e6653f9a721f89466eb12e67c0a3334b3b1d99...51c59c2ab5a32ca90ecd09523301a599738fb267 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
