Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gdal.git#90905d440cafe18f905d7b2b5176bfd14052d688
This commit is contained in:
DistroBaker 2020-10-30 02:36:58 +01:00
parent 1344cff5a0
commit bbd8e6c74d
2 changed files with 18 additions and 1 deletions

12
gdal-gcc11.patch Normal file
View File

@ -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 <iostream>
#include <memory>
#include <string>
+#include <limits>
#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

View File

@ -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 <law@redhat.com> - 3.1.3-3
- Fix missing #include for gcc-11
* Fri Oct 16 21:25:24 CEST 2020 Sandro Mani <manisandro@gmail.com> - 3.1.3-2
- Rebuild (jasper)