CVS commit: pkgsrc/geography/qgis

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat May  9 12:01:07 UTC 2026

Modified Files:
        pkgsrc/geography/qgis: Makefile distinfo
Added Files:
        pkgsrc/geography/qgis/patches: patch-external_mdal_frmts_mdal__gdal.cpp
            patch-src_analysis_processing_qgsalgorithmimportphotos.cpp
            patch-src_core_providers_gdal_qgsgdalprovider.cpp
            patch-src_core_providers_ogr_qgsogrproviderconnection.cpp
            patch-src_core_providers_ogr_qgsogrprovidermetadata.cpp
            patch-src_core_qgsgdalutils.cpp patch-src_core_qgsogrutils.cpp
            patch-src_core_qgsogrutils.h patch-src_core_qgsvectorfilewriter.cpp
            patch-src_core_raster_qgsrasterfilewriter.cpp

Log Message:
geography/qgis: Cherry-pick pending upstream PR to fix build with 3.13.0

A lot of diff noise, but really it's a minor type cleanup.  Almost
certainly can be dropped with 3.44.10.


To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 pkgsrc/geography/qgis/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/geography/qgis/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/qgis/patches/patch-external_mdal_frmts_mdal__gdal.cpp \
    pkgsrc/geography/qgis/patches/patch-src_analysis_processing_qgsalgorithmimportphotos.cpp \
    pkgsrc/geography/qgis/patches/patch-src_core_providers_gdal_qgsgdalprovider.cpp \
    pkgsrc/geography/qgis/patches/patch-src_core_providers_ogr_qgsogrproviderconnection.cpp \
    pkgsrc/geography/qgis/patches/patch-src_core_providers_ogr_qgsogrprovidermetadata.cpp \
    pkgsrc/geography/qgis/patches/patch-src_core_qgsgdalutils.cpp \
    pkgsrc/geography/qgis/patches/patch-src_core_qgsogrutils.cpp \
    pkgsrc/geography/qgis/patches/patch-src_core_qgsogrutils.h \
    pkgsrc/geography/qgis/patches/patch-src_core_qgsvectorfilewriter.cpp \
    pkgsrc/geography/qgis/patches/patch-src_core_raster_qgsrasterfilewriter.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.269 pkgsrc/geography/qgis/Makefile:1.270
--- pkgsrc/geography/qgis/Makefile:1.269        Wed Apr 29 16:19:38 2026
+++ pkgsrc/geography/qgis/Makefile      Sat May  9 12:01:06 2026
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.269 2026/04/29 16:19:38 gdt Exp $
+# $NetBSD: Makefile,v 1.270 2026/05/09 12:01:06 gdt Exp $
 
 # This is intentionally 3.44, about to be Long Term Release.  Please
 # do not update to later branches without MAINTAINER consensus.  The
 # transition to 4.0/4.2 and qt6 will be particularly tricky.
 DISTNAME=      qgis-3.44.9
+PKGREVISION=   1
 CATEGORIES=    geography
 MASTER_SITES=  https://qgis.org/downloads/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/geography/qgis/distinfo
diff -u pkgsrc/geography/qgis/distinfo:1.89 pkgsrc/geography/qgis/distinfo:1.90
--- pkgsrc/geography/qgis/distinfo:1.89 Wed Apr 29 16:19:38 2026
+++ pkgsrc/geography/qgis/distinfo      Sat May  9 12:01:06 2026
@@ -1,11 +1,21 @@
-$NetBSD: distinfo,v 1.89 2026/04/29 16:19:38 gdt Exp $
+$NetBSD: distinfo,v 1.90 2026/05/09 12:01:06 gdt Exp $
 
 BLAKE2s (qgis-3.44.9.tar.bz2) = 78b853c09620b28ffd74e0ec615dd3da276da541f409bc0ba599b32a8bdcdc74
 SHA512 (qgis-3.44.9.tar.bz2) = 1843849b45a8bea68d749db7af906bf9447e9e6daff00759b33357cef0f765d07916de5d4a40bcd572dfe74482d6fb5c99d1a2a765aba1122b234e3623a52057
 Size (qgis-3.44.9.tar.bz2) = 191550241 bytes
 SHA1 (patch-cmake_FindQwt.cmake) = 245463bc44fb4f2cb4aa61a8b86931e95e4ac820
+SHA1 (patch-external_mdal_frmts_mdal__gdal.cpp) = 82a1b5257087efcbe3aabd5e8fa9b0e17399c033
 SHA1 (patch-external_nmea_tok.c) = 94b9ce398787170250fc5fbd8835d7d7fa1cd013
 SHA1 (patch-mac_CMakeLists.txt) = 09986d53737b2825bf53e03173e3eab55d6d19c0
 SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
+SHA1 (patch-src_analysis_processing_qgsalgorithmimportphotos.cpp) = 6d092b020d4e5a410cef8a02cf6dc0f3019552f5
+SHA1 (patch-src_core_providers_gdal_qgsgdalprovider.cpp) = 695af870aa61a125cbd7badfc2afa2b6343a5a10
+SHA1 (patch-src_core_providers_ogr_qgsogrproviderconnection.cpp) = 5809502247da91d6fb0dda1ca471b49049f3261f
+SHA1 (patch-src_core_providers_ogr_qgsogrprovidermetadata.cpp) = dbdd672e8ccfba8626420e54c627918869365742
 SHA1 (patch-src_core_qgsapplication.cpp) = ca9e193cc4c7b275463e6e74b80594e6390187b8
+SHA1 (patch-src_core_qgsgdalutils.cpp) = 4eff702ced62ec4abfc12372575b046a37f3c818
+SHA1 (patch-src_core_qgsogrutils.cpp) = 0c2118461c5e4a810e55e179b91d96d079650b78
+SHA1 (patch-src_core_qgsogrutils.h) = d60ac451db8202c60f3ed2f8873dd2be324e9d32
+SHA1 (patch-src_core_qgsvectorfilewriter.cpp) = 2f7249ebffa9e61f7ee0199a5485acc9fb55202e
+SHA1 (patch-src_core_raster_qgsrasterfilewriter.cpp) = b193a227822e09943adea1962bc9c0f53a5b2118
 SHA1 (patch-src_crssync_CMakeLists.txt) = 7269ba6dce3ca41f5d63d36ffc02ffc6d0cea5d8

Added files:

Index: pkgsrc/geography/qgis/patches/patch-external_mdal_frmts_mdal__gdal.cpp
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-external_mdal_frmts_mdal__gdal.cpp:1.1
--- /dev/null   Sat May  9 12:01:07 2026
+++ pkgsrc/geography/qgis/patches/patch-external_mdal_frmts_mdal__gdal.cpp      Sat May  9 12:01:07 2026
@@ -0,0 +1,33 @@
+$NetBSD: patch-external_mdal_frmts_mdal__gdal.cpp,v 1.1 2026/05/09 12:01:07 gdt Exp $
+
+This file, and all of
+
+  patch-external_mdal_frmts_mdal__gdal.cpp
+  patch-src_analysis_processing_qgsalgorithmimportphotos.cpp
+  patch-src_core_providers_gdal_qgsgdalprovider.cpp
+  patch-src_core_providers_ogr_qgsogrproviderconnection.cpp
+  patch-src_core_providers_ogr_qgsogrprovidermetadata.cpp
+  patch-src_core_qgsgdalutils.cpp
+  patch-src_core_qgsogrutils.cpp
+  patch-src_core_qgsogrutils.h
+  patch-src_core_qgsvectorfilewriter.cpp
+  patch-src_core_raster_qgsrasterfilewriter.cpp
+
+are a cherry-pick of
+
+  https://github.com/qgis/QGIS/pull/66017/
+  
+to fix the build with gdal 3.13.0.
+
+--- external/mdal/frmts/mdal_gdal.cpp.orig     2026-04-03 12:00:51.000000000 +0000
++++ external/mdal/frmts/mdal_gdal.cpp
+@@ -175,8 +175,7 @@ double MDAL::DriverGdal::parseMetadataTi
+ MDAL::DriverGdal::metadata_hash MDAL::DriverGdal::parseMetadata( GDALMajorObjectH gdalObject, const char *pszDomain /* = 0 */ )
+ {
+   MDAL::DriverGdal::metadata_hash meta;
+-  char **GDALmetadata = nullptr;
+-  GDALmetadata = GDALGetMetadata( gdalObject, pszDomain );
++  CSLConstList GDALmetadata = GDALGetMetadata( gdalObject, pszDomain );
+ 
+   if ( GDALmetadata )
+   {
Index: pkgsrc/geography/qgis/patches/patch-src_analysis_processing_qgsalgorithmimportphotos.cpp
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_analysis_processing_qgsalgorithmimportphotos.cpp:1.1
--- /dev/null   Sat May  9 12:01:07 2026
+++ pkgsrc/geography/qgis/patches/patch-src_analysis_processing_qgsalgorithmimportphotos.cpp    Sat May  9 12:01:07 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_analysis_processing_qgsalgorithmimportphotos.cpp,v 1.1 2026/05/09 12:01:07 gdt Exp $
+
+--- src/analysis/processing/qgsalgorithmimportphotos.cpp.orig  2026-04-03 12:00:51.000000000 +0000
++++ src/analysis/processing/qgsalgorithmimportphotos.cpp
+@@ -397,7 +397,7 @@ QVariantMap QgsImportPhotosAlgorithm::pr
+       continue;
+     }
+ 
+-    char **GDALmetadata = GDALGetMetadata( hDS.get(), nullptr );
++    CSLConstList GDALmetadata = GDALGetMetadata( hDS.get(), nullptr );
+     if ( !GDALmetadata )
+     {
+       GDALmetadata = GDALGetMetadata( hDS.get(), "EXIF" );
Index: pkgsrc/geography/qgis/patches/patch-src_core_providers_gdal_qgsgdalprovider.cpp
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_providers_gdal_qgsgdalprovider.cpp:1.1
--- /dev/null   Sat May  9 12:01:07 2026
+++ pkgsrc/geography/qgis/patches/patch-src_core_providers_gdal_qgsgdalprovider.cpp     Sat May  9 12:01:07 2026
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_core_providers_gdal_qgsgdalprovider.cpp,v 1.1 2026/05/09 12:01:07 gdt Exp $
+
+--- src/core/providers/gdal/qgsgdalprovider.cpp.orig   2026-04-03 12:00:51.000000000 +0000
++++ src/core/providers/gdal/qgsgdalprovider.cpp
+@@ -517,7 +517,7 @@ void QgsGdalProvider::loadMetadata()
+     // read ESRI FileGeodatabase/Personal Geodatabase layer metadata
+     // (This branch is only possible on GDAL 3.7+, in earlier releases there was
+     // no raster OpenFileGDB driver)
+-    if ( char **GDALmetadata = GDALGetMetadata( mGdalDataset, "xml:documentation" ) )
++    if ( CSLConstList GDALmetadata = GDALGetMetadata( mGdalDataset, "xml:documentation" ) )
+     {
+       const QString metadata( GDALmetadata[0] );
+       if ( !metadata.isEmpty() )
+@@ -565,7 +565,7 @@ QString QgsGdalProvider::htmlMetadata() 
+   for ( int i = 1; i <= GDALGetRasterCount( dsForMetadata ); ++i )
+   {
+     GDALRasterBandH gdalBand = GDALGetRasterBand( dsForMetadata, i );
+-    char **GDALmetadata = GDALGetMetadata( gdalBand, nullptr );
++    CSLConstList GDALmetadata = GDALGetMetadata( gdalBand, nullptr );
+     myMetadata += QStringLiteral( "<tr><td class=\"highlight\">" ) + tr( "Band %1" ).arg( i ) + QStringLiteral( "</td><td>" );
+     if ( GDALmetadata )
+     {
+@@ -596,7 +596,7 @@ QString QgsGdalProvider::htmlMetadata() 
+     myMetadata += tr( "Mask band (exposed as alpha band)" ) + QStringLiteral( "<br />\n" );
+   }
+ 
+-  char **GDALmetadata = GDALGetMetadata( dsForMetadata, nullptr );
++  CSLConstList GDALmetadata = GDALGetMetadata( dsForMetadata, nullptr );
+   if ( GDALmetadata )
+   {
+     QStringList metadata = QgsOgrUtils::cStringListToQStringList( GDALmetadata );
+@@ -1304,7 +1304,7 @@ QString QgsGdalProvider::generateBandNam
+ 
+   if ( mDriverName == QLatin1String( "netCDF" ) || mDriverName == QLatin1String( "GTiff" ) )
+   {
+-    char **GDALmetadata = GDALGetMetadata( mGdalDataset, nullptr );
++    CSLConstList GDALmetadata = GDALGetMetadata( mGdalDataset, nullptr );
+     if ( GDALmetadata )
+     {
+       QStringList metadata = QgsOgrUtils::cStringListToQStringList( GDALmetadata );
+@@ -1847,7 +1847,7 @@ QList<QgsProviderSublayerDetails> QgsGda
+ 
+   QList<QgsProviderSublayerDetails> res;
+ 
+-  char **metadata = GDALGetMetadata( dataset, "SUBDATASETS" );
++  CSLConstList metadata = GDALGetMetadata( dataset, "SUBDATASETS" );
+ 
+   QVariantMap uriParts = decodeGdalUri( baseUri );
+   const QString datasetPath = uriParts.value( QStringLiteral( "path" ) ).toString();
Index: pkgsrc/geography/qgis/patches/patch-src_core_providers_ogr_qgsogrproviderconnection.cpp
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_providers_ogr_qgsogrproviderconnection.cpp:1.1
--- /dev/null   Sat May  9 12:01:07 2026
+++ pkgsrc/geography/qgis/patches/patch-src_core_providers_ogr_qgsogrproviderconnection.cpp     Sat May  9 12:01:07 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_core_providers_ogr_qgsogrproviderconnection.cpp,v 1.1 2026/05/09 12:01:07 gdt Exp $
+
+--- src/core/providers/ogr/qgsogrproviderconnection.cpp.orig   2026-04-03 12:00:51.000000000 +0000
++++ src/core/providers/ogr/qgsogrproviderconnection.cpp
+@@ -419,7 +419,7 @@ void QgsOgrProviderConnection::setDefaul
+   mGeometryColumnCapabilities |= GeometryColumnCapability::SinglePolygon;
+ #endif
+ 
+-  char **driverMetadata = GDALGetMetadata( hDriver, nullptr );
++  CSLConstList driverMetadata = GDALGetMetadata( hDriver, nullptr );
+ 
+ #if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3,6,0)
+   if ( CSLFetchBoolean( driverMetadata, GDAL_DCAP_Z_GEOMETRIES, false ) )
Index: pkgsrc/geography/qgis/patches/patch-src_core_providers_ogr_qgsogrprovidermetadata.cpp
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_providers_ogr_qgsogrprovidermetadata.cpp:1.1
--- /dev/null   Sat May  9 12:01:07 2026
+++ pkgsrc/geography/qgis/patches/patch-src_core_providers_ogr_qgsogrprovidermetadata.cpp       Sat May  9 12:01:07 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_core_providers_ogr_qgsogrprovidermetadata.cpp,v 1.1 2026/05/09 12:01:07 gdt Exp $
+
+--- src/core/providers/ogr/qgsogrprovidermetadata.cpp.orig     2026-04-03 12:00:51.000000000 +0000
++++ src/core/providers/ogr/qgsogrprovidermetadata.cpp
+@@ -103,7 +103,7 @@ bool QgsOgrProviderMetadata::createDatab
+     return false;
+   }
+ 
+-  char **metadata = GDALGetMetadata( poDriver, nullptr );
++  CSLConstList metadata = GDALGetMetadata( poDriver, nullptr );
+ 
+   if ( !CSLFetchBoolean( metadata, GDAL_DCAP_VECTOR, false )
+        || !CSLFetchBoolean( metadata, GDAL_DCAP_CREATE, false ) )
Index: pkgsrc/geography/qgis/patches/patch-src_core_qgsgdalutils.cpp
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_qgsgdalutils.cpp:1.1
--- /dev/null   Sat May  9 12:01:07 2026
+++ pkgsrc/geography/qgis/patches/patch-src_core_qgsgdalutils.cpp       Sat May  9 12:01:07 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_core_qgsgdalutils.cpp,v 1.1 2026/05/09 12:01:07 gdt Exp $
+
+--- src/core/qgsgdalutils.cpp.orig     2026-04-03 12:00:51.000000000 +0000
++++ src/core/qgsgdalutils.cpp
+@@ -496,7 +496,7 @@ QString QgsGdalUtils::helpCreationOption
+   if ( myGdalDriver )
+   {
+     // first report details and help page
+-    char **GDALmetadata = GDALGetMetadata( myGdalDriver, nullptr );
++    CSLConstList GDALmetadata = GDALGetMetadata( myGdalDriver, nullptr );
+     message += QLatin1String( "Format Details:\n" );
+     message += QStringLiteral( "  Extension: %1\n" ).arg( CSLFetchNameValue( GDALmetadata, GDAL_DMD_EXTENSION ) );
+     message += QStringLiteral( "  Short Name: %1" ).arg( GDALGetDriverShortName( myGdalDriver ) );
Index: pkgsrc/geography/qgis/patches/patch-src_core_qgsogrutils.cpp
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_qgsogrutils.cpp:1.1
--- /dev/null   Sat May  9 12:01:07 2026
+++ pkgsrc/geography/qgis/patches/patch-src_core_qgsogrutils.cpp        Sat May  9 12:01:07 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_core_qgsogrutils.cpp,v 1.1 2026/05/09 12:01:07 gdt Exp $
+
+--- src/core/qgsogrutils.cpp.orig      2026-04-03 12:00:51.000000000 +0000
++++ src/core/qgsogrutils.cpp
+@@ -1153,7 +1153,7 @@ QgsFields QgsOgrUtils::stringToFields( c
+   return fields;
+ }
+ 
+-QStringList QgsOgrUtils::cStringListToQStringList( char **stringList )
++QStringList QgsOgrUtils::cStringListToQStringList( const char *const *stringList )
+ {
+   if ( !stringList )
+     return {};
Index: pkgsrc/geography/qgis/patches/patch-src_core_qgsogrutils.h
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_qgsogrutils.h:1.1
--- /dev/null   Sat May  9 12:01:07 2026
+++ pkgsrc/geography/qgis/patches/patch-src_core_qgsogrutils.h  Sat May  9 12:01:07 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_core_qgsogrutils.h,v 1.1 2026/05/09 12:01:07 gdt Exp $
+
+--- src/core/qgsogrutils.h.orig        2026-04-03 12:00:51.000000000 +0000
++++ src/core/qgsogrutils.h
+@@ -312,7 +312,7 @@ class CORE_EXPORT QgsOgrUtils
+      *
+      * \since QGIS 3.2
+      */
+-    static QStringList cStringListToQStringList( char **stringList );
++    static QStringList cStringListToQStringList( const char *const *stringList );
+ 
+     /**
+      * Converts a OGRwkbGeometryType to QgsWkbTypes::Type
Index: pkgsrc/geography/qgis/patches/patch-src_core_qgsvectorfilewriter.cpp
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_qgsvectorfilewriter.cpp:1.1
--- /dev/null   Sat May  9 12:01:07 2026
+++ pkgsrc/geography/qgis/patches/patch-src_core_qgsvectorfilewriter.cpp        Sat May  9 12:01:07 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_core_qgsvectorfilewriter.cpp,v 1.1 2026/05/09 12:01:07 gdt Exp $
+
+--- src/core/qgsvectorfilewriter.cpp.orig      2026-04-03 12:00:51.000000000 +0000
++++ src/core/qgsvectorfilewriter.cpp
+@@ -158,7 +158,7 @@ bool QgsVectorFileWriter::supportsFeatur
+   if ( !gdalDriver )
+     return false;
+ 
+-  char **driverMetadata = GDALGetMetadata( gdalDriver, nullptr );
++  CSLConstList driverMetadata = GDALGetMetadata( gdalDriver, nullptr );
+   if ( !driverMetadata )
+     return false;
+ 
+@@ -4187,7 +4187,7 @@ QString QgsVectorFileWriter::driverForEx
+     GDALDriverH drv = GDALGetDriver( i );
+     if ( drv )
+     {
+-      char **driverMetadata = GDALGetMetadata( drv, nullptr );
++      CSLConstList driverMetadata = GDALGetMetadata( drv, nullptr );
+       if ( CSLFetchBoolean( driverMetadata, GDAL_DCAP_CREATE, false ) && CSLFetchBoolean( driverMetadata, GDAL_DCAP_VECTOR, false ) )
+       {
+         QString drvName = GDALGetDriverShortName( drv );
Index: pkgsrc/geography/qgis/patches/patch-src_core_raster_qgsrasterfilewriter.cpp
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_core_raster_qgsrasterfilewriter.cpp:1.1
--- /dev/null   Sat May  9 12:01:07 2026
+++ pkgsrc/geography/qgis/patches/patch-src_core_raster_qgsrasterfilewriter.cpp Sat May  9 12:01:07 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_core_raster_qgsrasterfilewriter.cpp,v 1.1 2026/05/09 12:01:07 gdt Exp $
+
+--- src/core/raster/qgsrasterfilewriter.cpp.orig       2026-04-03 12:00:51.000000000 +0000
++++ src/core/raster/qgsrasterfilewriter.cpp
+@@ -1090,7 +1090,7 @@ QString QgsRasterFileWriter::driverForEx
+     GDALDriverH drv = GDALGetDriver( i );
+     if ( drv )
+     {
+-      char **driverMetadata = GDALGetMetadata( drv, nullptr );
++      CSLConstList driverMetadata = GDALGetMetadata( drv, nullptr );
+       if ( CSLFetchBoolean( driverMetadata, GDAL_DCAP_RASTER, false ) )
+       {
+         QString drvName = GDALGetDriverShortName( drv );
+@@ -1113,7 +1113,7 @@ QStringList QgsRasterFileWriter::extensi
+   GDALDriverH drv = GDALGetDriverByName( format.toLocal8Bit().data() );
+   if ( drv )
+   {
+-    char **driverMetadata = GDALGetMetadata( drv, nullptr );
++    CSLConstList driverMetadata = GDALGetMetadata( drv, nullptr );
+     if ( CSLFetchBoolean( driverMetadata, GDAL_DCAP_RASTER, false ) )
+     {
+       return QString( GDALGetMetadataItem( drv, GDAL_DMD_EXTENSIONS, nullptr ) ).split( ' ' );