[Git][debian-gis-team/mapnik][master] Update gdal-3.12.patch with upstream changes.

[Bas Couwenberg (@sebastic)]

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


Commits:
780023be by Bas Couwenberg at 2025-10-24T17:47:48+02:00
Update gdal-3.12.patch with upstream changes.

- - - - -


1 changed file:

- debian/patches/gdal-3.12.patch


Changes:

=====================================
debian/patches/gdal-3.12.patch
=====================================
@@ -2,18 +2,16 @@ Description: Fix FTBFS with GDAL 3.12.0.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://github.com/mapnik/mapnik/pull/4531
 Applied-Upstream: https://github.com/mapnik/mapnik/commit/ca60dda74671cb373419b8a8f91b0f730c16f161
+Origin: https://github.com/mapnik/mapnik/commit/4188a8d4e847902537c05dc76e98c974723e270a
 
 --- a/plugins/input/ogr/ogr_datasource.cpp
 +++ b/plugins/input/ogr/ogr_datasource.cpp
-@@ -378,7 +378,11 @@ void ogr_datasource::init(mapnik::parame
+@@ -378,7 +378,7 @@ 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
+-    OGRSpatialReference* srs_ref = layer->GetSpatialRef();
++    OGRSpatialReference const* srs_ref = layer->GetSpatialRef();
      char* srs_output = nullptr;
      if (srs_ref && srs_ref->exportToProj4(&srs_output) == OGRERR_NONE)
      {



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/commit/780023be8a2629c7cf18a36faea421dd7e647236
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/724578ce/attachment-0001.htm>