Control: tags 1118731 + pending Dear maintainer,
I've prepared an NMU for sumo (versioned as 1.24.0+dfsg1-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for sumo-1.24.0+dfsg1 sumo-1.24.0+dfsg1 changelog | 8 ++++++++ patches/gdal-3.12.patch | 36 ++++++++++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 45 insertions(+) diff -Nru sumo-1.24.0+dfsg1/debian/changelog sumo-1.24.0+dfsg1/debian/changelog --- sumo-1.24.0+dfsg1/debian/changelog 2025-10-14 22:36:56.000000000 +0300 +++ sumo-1.24.0+dfsg1/debian/changelog 2025-11-12 14:15:03.000000000 +0200 @@ -1,3 +1,11 @@ +sumo (1.24.0+dfsg1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch from Bas Couwenberg for FTBFS with GDAL 3.12. + (Closes: #1118731) + + -- Adrian Bunk <[email protected]> Wed, 12 Nov 2025 14:15:03 +0200 + sumo (1.24.0+dfsg1-1) unstable; urgency=medium * [238db3e] Update excluded files in copyright file. (Closes: #1104207) diff -Nru sumo-1.24.0+dfsg1/debian/patches/gdal-3.12.patch sumo-1.24.0+dfsg1/debian/patches/gdal-3.12.patch --- sumo-1.24.0+dfsg1/debian/patches/gdal-3.12.patch 1970-01-01 02:00:00.000000000 +0200 +++ sumo-1.24.0+dfsg1/debian/patches/gdal-3.12.patch 2025-11-12 14:14:29.000000000 +0200 @@ -0,0 +1,36 @@ +Description: Fix FTBFS with GDAL 3.12.0. +Author: Bas Couwenberg <[email protected]> + +--- a/src/netbuild/NBHeightMapper.cpp ++++ b/src/netbuild/NBHeightMapper.cpp +@@ -196,7 +196,7 @@ NBHeightMapper::loadShapeFile(const std: + + // triangle coordinates are stored in WGS84 and later matched with network coordinates in WGS84 + // build coordinate transformation +- OGRSpatialReference* sr_src = layer->GetSpatialRef(); ++ const OGRSpatialReference* sr_src = layer->GetSpatialRef(); + OGRSpatialReference sr_dest; + sr_dest.SetWellKnownGeogCS("WGS84"); + OGRCoordinateTransformation* toWGS84 = OGRCreateCoordinateTransformation(sr_src, &sr_dest); +--- a/src/netimport/NIImporter_ArcView.cpp ++++ b/src/netimport/NIImporter_ArcView.cpp +@@ -143,7 +143,7 @@ NIImporter_ArcView::load() { + poLayer->ResetReading(); + + // build coordinate transformation +- OGRSpatialReference* origTransf = poLayer->GetSpatialRef(); ++ const OGRSpatialReference* origTransf = poLayer->GetSpatialRef(); + OGRSpatialReference destTransf; + // use wgs84 as destination + destTransf.SetWellKnownGeogCS("WGS84"); +--- a/src/polyconvert/PCLoaderArcView.cpp ++++ b/src/polyconvert/PCLoaderArcView.cpp +@@ -147,7 +147,7 @@ PCLoaderArcView::load(const std::string& + poLayer->ResetReading(); + + // build coordinate transformation +- OGRSpatialReference* origTransf = poLayer->GetSpatialRef(); ++ const OGRSpatialReference* origTransf = poLayer->GetSpatialRef(); + OGRSpatialReference destTransf; + // use wgs84 as destination + destTransf.SetWellKnownGeogCS("WGS84"); diff -Nru sumo-1.24.0+dfsg1/debian/patches/series sumo-1.24.0+dfsg1/debian/patches/series --- sumo-1.24.0+dfsg1/debian/patches/series 2024-10-28 17:20:00.000000000 +0200 +++ sumo-1.24.0+dfsg1/debian/patches/series 2025-11-12 14:15:01.000000000 +0200 @@ -4,3 +4,4 @@ fix_python.patch fix_gui_font.patch fix_privacy_breach.patch +gdal-3.12.patch
