CVS commit: pkgsrc/geography/qgis

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri May  2 17:05:07 UTC 2025

Modified Files:
        pkgsrc/geography/qgis: Makefile distinfo
Added Files:
        pkgsrc/geography/qgis/patches:
            patch-src_core_proj_qgscoordinatereferencesystemutils.cpp

Log Message:
geography/qgis: Adapt to new projection in proj 9.6.0

proj 9.6.0 adds the Spilhaus projection.  qgis has a table
(implemented with if statments in c++) that maps proj projection names
to human names for projections, which can then be translated.
Further, the qgis build fails if there is a projection not in the
table.

Add a translation entry from "spilhaus" to "Spilhaus".


To generate a diff of this commit:
cvs rdiff -u -r1.239 -r1.240 pkgsrc/geography/qgis/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/geography/qgis/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/qgis/patches/patch-src_core_proj_qgscoordinatereferencesystemutils.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/qgis/Makefile
diff -u pkgsrc/geography/qgis/Makefile:1.239 pkgsrc/geography/qgis/Makefile:1.240
--- pkgsrc/geography/qgis/Makefile:1.239        Thu Apr 24 14:14:09 2025
+++ pkgsrc/geography/qgis/Makefile      Fri May  2 17:05:07 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.239 2025/04/24 14:14:09 wiz Exp $
+# $NetBSD: Makefile,v 1.240 2025/05/02 17:05:07 gdt Exp $
 
 # This is intentionally 3.34 Long Term Release.  Please do not update
 # to later branches, and instead discuss whether/how we want multiple
 # versions, or to only track one LTR branch.
 DISTNAME=      qgis-3.34.15
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    geography
 MASTER_SITES=  https://qgis.org/downloads/
 EXTRACT_SUFX=  .tar.bz2
@@ -63,6 +63,10 @@ SUBST_SED.pyqt+=     -e '/^ *SET/s,pyuic5,&-
 SUBST_SED.pyqt+=       -e '/^ *SET/s,pyrcc5,&-${PYVERSSUFFIX},'
 SUBST_SED.pyqt+=       -e '/ *FIND_PROGRAM(__pyuic5 /s,"pyuic5,&-${PYVERSSUFFIX},'
 
+# Optimize for understandability when the build output is examined,
+# because it is only examined when there are failures.
+CMAKE_CONFIGURE_ARGS+=         -DCMAKE_VERBOSE_MAKEFILE=TRUE
+
 CMAKE_CONFIGURE_ARGS+=         -DWITH_BINDINGS:BOOL=TRUE
 CMAKE_CONFIGURE_ARGS+=         -DWITH_INTERNAL_MARKUPSAFE=FALSE
 

Index: pkgsrc/geography/qgis/distinfo
diff -u pkgsrc/geography/qgis/distinfo:1.74 pkgsrc/geography/qgis/distinfo:1.75
--- pkgsrc/geography/qgis/distinfo:1.74 Fri Feb  7 15:56:51 2025
+++ pkgsrc/geography/qgis/distinfo      Fri May  2 17:05:07 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2025/02/07 15:56:51 gdt Exp $
+$NetBSD: distinfo,v 1.75 2025/05/02 17:05:07 gdt Exp $
 
 BLAKE2s (qgis-3.34.15.tar.bz2) = e88c5547e7481c61e73f55316f7652d7ac1e53efe32d22f48851975e191533f2
 SHA512 (qgis-3.34.15.tar.bz2) = f23ffd2397342fc2987b7794cbfb539051149723202911e0d98182183eae69ad1d88117d97476918fe15868ee739e948397d3f930883a5b41869a70ce0d1dc7b
@@ -6,6 +6,7 @@ Size (qgis-3.34.15.tar.bz2) = 171258671 
 SHA1 (patch-cmake_FindQwt.cmake) = 14d42b2733f14e0fef976c4944979b3a13274538
 SHA1 (patch-mac_CMakeLists.txt) = 7967c0fa4eed8dc2ce24192bdbec8ae8a336be1c
 SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
+SHA1 (patch-src_core_proj_qgscoordinatereferencesystemutils.cpp) = 619c44a2d6348448fa982dcf184fa31da7894201
 SHA1 (patch-src_core_qgsapplication.cpp) = 54bba734969cd9fd90a2317d8c1531da2827d145
 SHA1 (patch-src_core_raster_qgsrasterattributetable.cpp) = db31738096e60fa20b546849f56a017a44d0b6e7
 SHA1 (patch-src_crssync_CMakeLists.txt) = 7269ba6dce3ca41f5d63d36ffc02ffc6d0cea5d8

Added files:

Index: pkgsrc/geography/qgis/patches/patch-src_core_proj_qgscoordinatereferencesystemutils.cpp
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_proj_qgscoordinatereferencesystemutils.cpp:1.1
--- /dev/null   Fri May  2 17:05:07 2025
+++ pkgsrc/geography/qgis/patches/patch-src_core_proj_qgscoordinatereferencesystemutils.cpp     Fri May  2 17:05:07 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_core_proj_qgscoordinatereferencesystemutils.cpp,v 1.1 2025/05/02 17:05:07 gdt Exp $
+
+Add a translation for spilhaus, newly in proj 9.6.0.
+
+Not filed upstream because 3.34 is no longer maintained, surely upstream
+is aware, and thus this must be fixed in 3.40.
+
+--- src/core/proj/qgscoordinatereferencesystemutils.cpp.orig   2025-05-02 13:15:20.754684358 +0000
++++ src/core/proj/qgscoordinatereferencesystemutils.cpp
+@@ -482,5 +482,7 @@ QString QgsCoordinateReferenceSystemUtil
+     return QObject::tr( "Winkel Tripel" );
+   if ( projection == QLatin1String( "gstmerc" ) )
+     return QObject::tr( "Gauss-Schreiber" );
++  if ( projection == QLatin1String( "spilhaus" ) )
++    return QObject::tr( "Spilhaus" );
+   return QString();
+ }