rpms/geos
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add geos_gcc13.patch

Browse Source
This commit is contained in:
Sandro Mani 2023-01-24 19:12:52 +01:00
parent 2f75adf56c
commit ce60cdf55a
2 changed files with 105 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
geos.spec
View File

@ -11,7 +11,7 @@
Name: geos
Version: 3.11.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: GEOS is a C++ port of the Java Topology Suite
License: LGPLv2
@ -19,6 +19,8 @@ URL: http://trac.osgeo.org/geos/
Source0: http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2
# Fix doxygen errors
Patch0: geos_docs.patch
# Fix GCC13 FTBFS
Patch1: geos_gcc13.patch
BuildRequires: cmake
BuildRequires: doxygen
@ -165,6 +167,9 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config
%changelog
* Tue Jan 24 2023 Sandro Mani <manisandro@gmail.com> - 3.11.1-3
- Add geos_gcc13.patch
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

99
geos_gcc13.patch Normal file
View File

@ -0,0 +1,99 @@
diff -rupN geos-3.11.1/include/geos/geomgraph/Depth.h geos-3.11.1-new/include/geos/geomgraph/Depth.h
--- geos-3.11.1/include/geos/geomgraph/Depth.h 2022-11-13 20:24:40.000000000 +0100
+++ geos-3.11.1-new/include/geos/geomgraph/Depth.h 2023-01-24 07:41:01.310455996 +0100
@@ -24,6 +24,7 @@
#include <geos/geom/Location.h>
#include <geos/geom/Position.h>
#include <string>
+#include <cstdint>
// Forward declarations
namespace geos {
diff -rupN geos-3.11.1/include/geos/geomgraph/Label.h geos-3.11.1-new/include/geos/geomgraph/Label.h
--- geos-3.11.1/include/geos/geomgraph/Label.h 2022-11-13 20:24:40.000000000 +0100
+++ geos-3.11.1-new/include/geos/geomgraph/Label.h 2023-01-24 07:50:33.250454277 +0100
@@ -26,6 +26,7 @@
#include <iosfwd> // for operator<<
#include <cassert>
+#include <cstdint>
namespace geos {
namespace geomgraph { // geos.geomgraph
diff -rupN geos-3.11.1/include/geos/geomgraph/TopologyLocation.h geos-3.11.1-new/include/geos/geomgraph/TopologyLocation.h
--- geos-3.11.1/include/geos/geomgraph/TopologyLocation.h 2022-11-13 20:24:40.000000000 +0100
+++ geos-3.11.1-new/include/geos/geomgraph/TopologyLocation.h 2023-01-24 07:58:49.033130619 +0100
@@ -27,6 +27,7 @@
#include <array>
#include <string>
#include <cassert>
+#include <cstdint>
#ifdef _MSC_VER
#pragma warning(push)
diff -rupN geos-3.11.1/include/geos/io/WKTWriter.h geos-3.11.1-new/include/geos/io/WKTWriter.h
--- geos-3.11.1/include/geos/io/WKTWriter.h 2022-11-13 20:24:40.000000000 +0100
+++ geos-3.11.1-new/include/geos/io/WKTWriter.h 2023-01-24 08:09:32.946821997 +0100
@@ -24,6 +24,7 @@
#include <string>
#include <cctype>
+#include <cstdint>
#ifdef _MSC_VER
#pragma warning(push)
diff -rupN geos-3.11.1/include/geos/operation/overlayng/OverlayLabel.h geos-3.11.1-new/include/geos/operation/overlayng/OverlayLabel.h
--- geos-3.11.1/include/geos/operation/overlayng/OverlayLabel.h 2022-11-13 20:24:40.000000000 +0100
+++ geos-3.11.1-new/include/geos/operation/overlayng/OverlayLabel.h 2023-01-24 08:24:50.236120617 +0100
@@ -17,6 +17,7 @@
#include <geos/geom/Location.h>
#include <geos/geom/Position.h>
#include <geos/export.h>
+#include <cstdint>
using geos::geom::Location;
using geos::geom::Position;
diff -rupN geos-3.11.1/include/geos/shape/fractal/HilbertCode.h geos-3.11.1-new/include/geos/shape/fractal/HilbertCode.h
--- geos-3.11.1/include/geos/shape/fractal/HilbertCode.h 2022-11-13 20:24:40.000000000 +0100
+++ geos-3.11.1-new/include/geos/shape/fractal/HilbertCode.h 2023-01-24 08:34:19.200753980 +0100
@@ -17,6 +17,7 @@
#include <geos/export.h>
#include <string>
+#include <cstdint>
// Forward declarations
namespace geos {
diff -rupN geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h geos-3.11.1-new/include/geos/shape/fractal/HilbertEncoder.h
--- geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h 2022-11-13 20:24:40.000000000 +0100
+++ geos-3.11.1-new/include/geos/shape/fractal/HilbertEncoder.h 2023-01-24 08:43:34.124625256 +0100
@@ -18,6 +18,7 @@
#include <geos/export.h>
#include <string>
#include <vector>
+#include <cstdint>
// Forward declarations
namespace geos {
diff -rupN geos-3.11.1/include/geos/shape/fractal/MortonCode.h geos-3.11.1-new/include/geos/shape/fractal/MortonCode.h
--- geos-3.11.1/include/geos/shape/fractal/MortonCode.h 2022-11-13 20:24:40.000000000 +0100
+++ geos-3.11.1-new/include/geos/shape/fractal/MortonCode.h 2023-01-24 09:40:32.202364547 +0100
@@ -17,6 +17,7 @@
#include <geos/export.h>
#include <string>
+#include <cstdint>
// Forward declarations
namespace geos {
diff -rupN geos-3.11.1/tests/unit/capi/GEOSMakeValidTest.cpp geos-3.11.1-new/tests/unit/capi/GEOSMakeValidTest.cpp
--- geos-3.11.1/tests/unit/capi/GEOSMakeValidTest.cpp 2022-11-13 20:24:41.000000000 +0100
+++ geos-3.11.1-new/tests/unit/capi/GEOSMakeValidTest.cpp 2023-01-24 19:06:06.708755542 +0100
@@ -9,6 +9,7 @@
#include <cstdlib>
#include <cmath>
#include <cstring>
+#include <cstdint>
#include "capi_test_utils.h"