CVS commit: pkgsrc/geography/merkaartor

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Oct 20 23:17:14 UTC 2025

Modified Files:
        pkgsrc/geography/merkaartor: Makefile distinfo
Added Files:
        pkgsrc/geography/merkaartor/patches:
            patch-src_ImportExport_ImportExportGdal.cpp

Log Message:
geography/merkaartor: Const police to prepare for gdal 3.12.0


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 pkgsrc/geography/merkaartor/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/geography/merkaartor/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/merkaartor/patches/patch-src_ImportExport_ImportExportGdal.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/merkaartor/Makefile
diff -u pkgsrc/geography/merkaartor/Makefile:1.154 pkgsrc/geography/merkaartor/Makefile:1.155
--- pkgsrc/geography/merkaartor/Makefile:1.154  Sun Oct  5 19:26:00 2025
+++ pkgsrc/geography/merkaartor/Makefile        Mon Oct 20 23:17:13 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.154 2025/10/05 19:26:00 js Exp $
+# $NetBSD: Makefile,v 1.155 2025/10/20 23:17:13 gdt Exp $
 
 DISTNAME=      merkaartor-0.20.0
-PKGREVISION=   18
+PKGREVISION=   19
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=openstreetmap/}
 GITHUB_PROJECT=        merkaartor

Index: pkgsrc/geography/merkaartor/distinfo
diff -u pkgsrc/geography/merkaartor/distinfo:1.18 pkgsrc/geography/merkaartor/distinfo:1.19
--- pkgsrc/geography/merkaartor/distinfo:1.18   Wed Sep 18 14:01:30 2024
+++ pkgsrc/geography/merkaartor/distinfo        Mon Oct 20 23:17:13 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.18 2024/09/18 14:01:30 gdt Exp $
+$NetBSD: distinfo,v 1.19 2025/10/20 23:17:13 gdt Exp $
 
 BLAKE2s (merkaartor-0.20.0.tar.gz) = 93eb83946bd7905346dc733c8dc54b7a83ed3329d2cb9a21b135ca9f773e3a5e
 SHA512 (merkaartor-0.20.0.tar.gz) = db64c3053618a0bed7984223c9aa8e4175fdf7db2dd70bf3c6ec021b46fae1d095c513c3e151086baf07446c7cf81c49923a2e43e79963d956d29643d7f93910
 Size (merkaartor-0.20.0.tar.gz) = 5592116 bytes
+SHA1 (patch-src_ImportExport_ImportExportGdal.cpp) = 006ea9d560eb68a4b374bd34af528d46f1b0b162

Added files:

Index: pkgsrc/geography/merkaartor/patches/patch-src_ImportExport_ImportExportGdal.cpp
diff -u /dev/null pkgsrc/geography/merkaartor/patches/patch-src_ImportExport_ImportExportGdal.cpp:1.1
--- /dev/null   Mon Oct 20 23:17:14 2025
+++ pkgsrc/geography/merkaartor/patches/patch-src_ImportExport_ImportExportGdal.cpp     Mon Oct 20 23:17:13 2025
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_ImportExport_ImportExportGdal.cpp,v 1.1 2025/10/20 23:17:13 gdt Exp $
+
+  - Const hygiene exposed by gdal 3.12.0.
+  - Arguably srs release in OSGB workaround is a bug anyway.
+
+https://github.com/openstreetmap/merkaartor/issues/314
+
+--- src/ImportExport/ImportExportGdal.cpp.orig 2025-10-20 22:58:47.446184870 +0000
++++ src/ImportExport/ImportExportGdal.cpp
+@@ -337,7 +337,7 @@ bool ImportExportGdal::importGDALDataset
+     qDebug(lc_importExportGdal) << "Layers #" << poDS->GetLayerCount();
+     OGRLayer  *poLayer = poDS->GetLayer(0);
+ 
+-    OGRSpatialReference * theSrs = poLayer->GetSpatialRef(); // Note: Contrary to other OGR objects, the spatial ref must NOT be released by our code!
++    const OGRSpatialReference * theSrs = poLayer->GetSpatialRef(); // Note: Contrary to other OGR objects, the spatial ref must NOT be released by our code!
+     toWGS84 = NULL;
+ 
+     if (theSrs) {
+@@ -351,7 +351,6 @@ bool ImportExportGdal::importGDALDataset
+                 qDebug("GDAL: couldn't initialise EPSG:27700: %d: %s", ogrError, CPLGetLastErrorMsg());
+                 the27700Srs->Release();
+             } else {
+-                theSrs->Release();
+                 theSrs = the27700Srs;
+             }
+         }
+@@ -390,7 +389,7 @@ bool ImportExportGdal::importGDALDataset
+                 Feature* F = parseGeometry(aLayer, poGeometry);
+                 if (F) {
+                     for (int i=0; i<poFeature->GetFieldCount(); ++i) {
+-                        OGRFieldDefn  *fd = poFeature->GetFieldDefnRef(i);
++                        const OGRFieldDefn  *fd = poFeature->GetFieldDefnRef(i);
+                         QString k = QString::fromUtf8(fd->GetNameRef());
+                         if (k == "osm_id") {
+                             F->setId(IFeature::FId(F->getType(), (qint64)poFeature->GetFieldAsDouble(i)));