[Git][debian-gis-team/mapnik][master] Add patch to fix FTBFS with GDAL 3.12.0. (closes: #1118725)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / mapnik


Commits:
017b8a92 by Bas Couwenberg at 2025-10-24T16:59:40+02:00
Add patch to fix FTBFS with GDAL 3.12.0. (closes: #1118725)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/gdal-3.12.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mapnik (4.1.3+ds-2) UNRELEASED; urgency=medium
+
+  * Add patch to fix FTBFS with GDAL 3.12.0.
+    (closes: #1118725)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 24 Oct 2025 16:56:09 +0200
+
 mapnik (4.1.3+ds-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/patches/gdal-3.12.patch
=====================================
@@ -0,0 +1,18 @@
+Description: Fix FTBFS with GDAL 3.12.0.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/mapnik/mapnik/pull/4531
+
+--- a/plugins/input/ogr/ogr_datasource.cpp
++++ b/plugins/input/ogr/ogr_datasource.cpp
+@@ -378,7 +378,11 @@ void ogr_datasource::init(mapnik::parame
+         }
+     }
+     mapnik::parameters& extra_params = desc_.get_extra_parameters();
++#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 12, 0)
++    const OGRSpatialReference* srs_ref = layer->GetSpatialRef();
++#else
+     OGRSpatialReference* srs_ref = layer->GetSpatialRef();
++#endif
+     char* srs_output = nullptr;
+     if (srs_ref && srs_ref->exportToProj4(&srs_output) == OGRERR_NONE)
+     {


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+gdal-3.12.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/commit/017b8a920c58b59c031e8ebd285a93fcc7e8dcbe

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/commit/017b8a920c58b59c031e8ebd285a93fcc7e8dcbe
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20251024/57e92602/attachment-0001.htm>