From 90905d440cafe18f905d7b2b5176bfd14052d688 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 27 Oct 2020 16:11:13 -0600 Subject: [PATCH] Fix missing #include for gcc-11 --- gdal-gcc11.patch | 12 ++++++++++++ gdal.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gdal-gcc11.patch diff --git a/gdal-gcc11.patch b/gdal-gcc11.patch new file mode 100644 index 0000000..55fa93d --- /dev/null +++ b/gdal-gcc11.patch @@ -0,0 +1,12 @@ +diff --git a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +index b500df8..4c51316 100644 +--- a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp ++++ b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + #if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__) + // gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string diff --git a/gdal.spec b/gdal.spec index 67cdb3b..d4a1a57 100644 --- a/gdal.spec +++ b/gdal.spec @@ -46,7 +46,7 @@ Name: gdal Version: 3.1.3 -Release: 2%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} +Release: 3%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -77,6 +77,8 @@ Patch7: gdal_nopdf.patch # Adapt to jasper 2.0.21 # See https://github.com/OSGeo/gdal/commit/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Patch8: gdal_jasper.patch +# Fix issues caught by gcc-11 +Patch9: %{name}-gcc11.patch BuildRequires: gcc @@ -692,6 +694,9 @@ popd #Or as before, using ldconfig %changelog +* Tue Oct 28 2020 Jeff Law - 3.1.3-3 +- Fix missing #include for gcc-11 + * Fri Oct 16 21:25:24 CEST 2020 Sandro Mani - 3.1.3-2 - Rebuild (jasper)