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

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / jeolib-jiplib


Commits:
4f5bc08b by Bas Couwenberg at 2025-10-24T20:35:20+02:00
Add patch to fix FTBFS with GDAL 3.12.0. (closes: #1118729)

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jeolib-jiplib (1.1.5+ds-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add patch to fix FTBFS with GDAL 3.12.0.
+    (closes: #1118729)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 24 Oct 2025 20:19:02 +0200
+
 jeolib-jiplib (1.1.5+ds-1) unstable; urgency=medium
 
   * Initial release.


=====================================
debian/patches/gdal-3.12.patch
=====================================
@@ -0,0 +1,36 @@
+Description: Fix FTBFS with GDAL 3.12.0.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/7
+
+--- a/src/imageclasses/VectorOgr.cc
++++ b/src/imageclasses/VectorOgr.cc
+@@ -475,7 +475,7 @@ void VectorOgr::close(void)
+ }
+ 
+ ///Create a layer
+-OGRErr VectorOgr::pushLayer(const std::string& layername, OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType, char** papszOptions){
++OGRErr VectorOgr::pushLayer(const std::string& layername, const OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType, char** papszOptions){
+   if( !m_gds->TestCapability( ODsCCreateLayer ) ){
+     // std::ostringstream errorStream;
+     // errorStream << "Error: Test capability to create layer " << layername << " failed (1)" << std::endl;
+@@ -2016,7 +2016,8 @@ void VectorOgr::merge(VectorOgr &ogrRead
+       if(verbose_opt[0])
+         std::cout << "layer: " << layerstream.str() << std::endl;
+ 
+-      OGRSpatialReference *thatSpatialRef=ogrReader.getLayer(ilayer)->GetSpatialRef();
++      const OGRSpatialReference *tempSpatialRef=ogrReader.getLayer(ilayer)->GetSpatialRef();
++      OGRSpatialReference *thatSpatialRef=tempSpatialRef->Clone();
+ #if GDAL_VERSION_MAJOR > 2
+       thatSpatialRef->SetAxisMappingStrategy(OSRAxisMappingStrategy::OAMS_TRADITIONAL_GIS_ORDER);
+ #endif
+--- a/src/imageclasses/VectorOgr.h
++++ b/src/imageclasses/VectorOgr.h
+@@ -207,7 +207,7 @@ class VectorOgr : public std::enable_sha
+   ///Get the filename of this dataset
+   std::string getFileName() const {return m_filename;};
+   ///Create a layer
+-  OGRErr pushLayer(const std::string& layername, OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType=wkbUnknown, char** papszOptions=NULL);
++  OGRErr pushLayer(const std::string& layername, const OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType=wkbUnknown, char** papszOptions=NULL);
+   ///Create a layer
+   OGRErr pushLayer(const std::string& layername, const std::string& theProjection=std::string(), const OGRwkbGeometryType& geometryType=wkbUnknown, char** papszOptions=NULL);
+   ///Create a layer


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ jeolib-jiplib_swig4.3.patch
 pip-break-sys-pkg.patch
 spelling-errors.patch
 spelling-errors-take2.patch
+gdal-3.12.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/commit/4f5bc08b84f5bcdc8c792d306905f7d173a016b3

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/commit/4f5bc08b84f5bcdc8c792d306905f7d173a016b3
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/815d1ba3/attachment-0001.htm>