Bas Couwenberg pushed to branch master at Debian GIS Project / jeolib-jiplib
Commits: c6562ba0 by Bas Couwenberg at 2026-04-17T10:53:16+02:00 Add patch to fix FTBFS with GDAL 3.13.0. (closes: #1134166) - - - - - 3 changed files: - debian/changelog - + debian/patches/gdal-3.13.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -3,6 +3,8 @@ jeolib-jiplib (1.1.7+ds-2) UNRELEASED; urgency=medium * Team upload. * Mark libjiplib-dev as Multi-Arch: same. * Bump Standards-Version to 4.7.4, no changes. + * Add patch to fix FTBFS with GDAL 3.13.0. + (closes: #1134166) -- Bas Couwenberg <[email protected]> Sun, 15 Feb 2026 08:14:32 +0100 ===================================== debian/patches/gdal-3.13.patch ===================================== @@ -0,0 +1,75 @@ +Description: Fix FTBFS with GDAL 3.13.0. + error: invalid conversion from 'CSLConstList' {aka 'const char* const*'} to 'char**' [-fpermissive] + . + From GDAL 3.13.0 NEWS: + " + * GDALMajorObject: Use CSLConstList for GetMetadata, SetMetadata (API breakage) + " + https://github.com/OSGeo/gdal/blob/v3.13.0beta1/NEWS.md +Author: Bas Couwenberg <[email protected]> +Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/10 + +--- a/src/imageclasses/Jim.cc ++++ b/src/imageclasses/Jim.cc +@@ -1026,7 +1026,11 @@ void Jim::getGeoTransform(vector<double> + /** + * @return the metadata of this data set in C style string format (const version) + **/ ++#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 13, 0) ++CSLConstList Jim::getMetadata() const ++#else + char** Jim::getMetadata() const ++#endif + { + if(m_gds){ + if(m_gds->GetMetadata()!=NULL) +@@ -1045,7 +1049,11 @@ char** Jim::getMetadata() const + void Jim::getMetadata(std::list<std::string>& metadata) const + { + if(m_gds){ ++#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 13, 0) ++ CSLConstList cmetadata=m_gds->GetMetadata(); ++#else + char** cmetadata=m_gds->GetMetadata(); ++#endif + while(*cmetadata!=NULL){ + metadata.push_back(*(cmetadata)); + ++cmetadata; +@@ -1494,7 +1502,11 @@ CPLErr Jim::registerDriver() + s << "FileOpenError (" << m_imageType << ")"; + throw(s.str()); + } ++#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 13, 0) ++ CSLConstList papszMetadata; ++#else + char **papszMetadata; ++#endif + papszMetadata = poDriver->GetMetadata(); + //todo: try and catch if CREATE is not supported (as in PNG) + if( ! CSLFetchBoolean( papszMetadata, GDAL_DCAP_CREATE, FALSE )){ +@@ -2120,7 +2132,11 @@ CPLErr Jim::open(app::AppFactory &app){ + GDALRasterBand *poBand;//we will fetch the first band to obtain the gds metadata + + if(m_gds){ ++#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 13, 0) ++ CSLConstList papszMetadata; ++#else + char **papszMetadata; ++#endif + papszMetadata = m_gds->GetMetadata("SUBDATASETS"); + vector<string> LayersAll; + if( papszMetadata ){ +--- a/src/imageclasses/Jim.h ++++ b/src/imageclasses/Jim.h +@@ -640,7 +640,11 @@ class Jim : public std::enable_shared_fr + //Get a pointer to the GDAL dataset + GDALDataset* getDataset(){return m_gds;}; + ///Get the metadata of this dataset ++#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 13, 0) ++ CSLConstList getMetadata() const; ++#else + char** getMetadata() const; ++#endif + // Get the metadata of this dataset in the form of a list of strings (const version) + void getMetadata(std::list<std::string>& metadata) const; + ///Get the image description from the driver of this dataset ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ pip-break-sys-pkg.patch wheel.patch +gdal-3.13.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/commit/c6562ba03fa6dffdb508b5a816929ce0cc582e86 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/commit/c6562ba03fa6dffdb508b5a816929ce0cc582e86 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
