[Git][debian-gis-team/osmcoastline][master] 2 commits: Add patch to fix FTBFS with GDAL 3.7.0. (closes: #1037976)

[Bas Couwenberg (@sebastic)]

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


Commits:
0366f868 by Bas Couwenberg at 2023-06-15T07:02:20+02:00
Add patch to fix FTBFS with GDAL 3.7.0. (closes: #1037976)

- - - - -
53e3cae2 by Bas Couwenberg at 2023-06-15T07:02:44+02:00
Set distribution to unstable.

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,11 @@
-osmcoastline (2.4.0-2) UNRELEASED; urgency=medium
+osmcoastline (2.4.0-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.6.2, no changes.
   * Bump debhelper compat to 13.
+  * Add patch to fix FTBFS with GDAL 3.7.0.
+    (closes: #1037976)
 
- -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Jan 2023 17:04:20 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 15 Jun 2023 07:02:32 +0200
 
 osmcoastline (2.4.0-1) unstable; urgency=medium
 


=====================================
debian/patches/gdal-3.7.patch
=====================================
@@ -0,0 +1,34 @@
+Description: Fix FTBFS with GDAL 3.7.0.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://github.com/osmcode/osmcoastline/issues/44
+Bug-Debian: https://bugs.debian.org/1037976
+Forwarded: https://github.com/osmcode/osmcoastline/pull/45
+
+--- a/src/coastline_polygons.hpp
++++ b/src/coastline_polygons.hpp
+@@ -78,7 +78,11 @@ class CoastlinePolygons {
+ 
+     std::pair<std::unique_ptr<OGRPolygon>, std::unique_ptr<OGRPolygon>> split_envelope(const OGREnvelope& envelope, int level, int num_points) const;
+ 
++#if (GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3,7,0))
++    void add_line_to_output(std::unique_ptr<OGRLineString> line, const OGRSpatialReference* srs) const;
++#else
+     void add_line_to_output(std::unique_ptr<OGRLineString> line, OGRSpatialReference* srs) const;
++#endif
+     void output_polygon_ring_as_lines(int max_points, const OGRLinearRing* ring) const;
+ 
+ public:
+--- a/src/coastline_polygons.cpp
++++ b/src/coastline_polygons.cpp
+@@ -254,7 +254,11 @@ void CoastlinePolygons::output_land_poly
+     }
+ }
+ 
++#if (GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3,7,0))
++void CoastlinePolygons::add_line_to_output(std::unique_ptr<OGRLineString> line, const OGRSpatialReference* srs) const {
++#else
+ void CoastlinePolygons::add_line_to_output(std::unique_ptr<OGRLineString> line, OGRSpatialReference* srs) const {
++#endif
+     line->setCoordinateDimension(2);
+     line->assignSpatialReference(srs);
+     m_output.add_line(std::move(line));


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



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmcoastline/-/compare/c66eacfbcd81039044a08b36b06a0f1246217c4c...53e3cae2ba3906985fa7c4257f2176c2f9cc7b64

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmcoastline/-/compare/c66eacfbcd81039044a08b36b06a0f1246217c4c...53e3cae2ba3906985fa7c4257f2176c2f9cc7b64
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/20230615/c39221b6/attachment-0001.htm>