From c1e64d62774af51f4cfd019560fb61c1eed3e6ca Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 19 Mar 2023 13:51:24 +0100 Subject: [PATCH] Update to 3.11.2 --- geos.spec | 16 +++++----- geos_gcc13.patch | 81 ++++++++---------------------------------------- 2 files changed, 22 insertions(+), 75 deletions(-) diff --git a/geos.spec b/geos.spec index 1911c4d..aaddd28 100644 --- a/geos.spec +++ b/geos.spec @@ -10,15 +10,14 @@ %endif Name: geos -Version: 3.11.1 -Release: 3%{?dist} +Version: 3.11.2 +Release: 1%{?dist} Summary: GEOS is a C++ port of the Java Topology Suite License: LGPLv2 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 @@ -123,7 +122,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config %doc AUTHORS NEWS.md README.md %license COPYING %{_bindir}/geosop -%{_libdir}/libgeos.so.3.11.1 +%{_libdir}/libgeos.so.3.11.2 %{_libdir}/libgeos_c.so.1* %files devel @@ -141,7 +140,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config %files -n mingw32-%{name} %license COPYING %{mingw32_bindir}/geosop.exe -%{mingw32_bindir}/libgeos-3.11.1.dll +%{mingw32_bindir}/libgeos-3.11.2.dll %{mingw32_bindir}/libgeos_c-1.dll %{mingw32_includedir}/geos/ %{mingw32_includedir}/geos_c.h @@ -154,7 +153,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config %files -n mingw64-%{name} %license COPYING %{mingw64_bindir}/geosop.exe -%{mingw64_bindir}/libgeos-3.11.1.dll +%{mingw64_bindir}/libgeos-3.11.2.dll %{mingw64_bindir}/libgeos_c-1.dll %{mingw64_includedir}/geos/ %{mingw64_includedir}/geos_c.h @@ -167,6 +166,9 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config %changelog +* Sun Mar 19 2023 Sandro Mani - 3.11.2-1 +- Update to 3.11.2 + * Tue Jan 24 2023 Sandro Mani - 3.11.1-3 - Add geos_gcc13.patch diff --git a/geos_gcc13.patch b/geos_gcc13.patch index c4d2d52..11c43be 100644 --- a/geos_gcc13.patch +++ b/geos_gcc13.patch @@ -1,17 +1,6 @@ -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 - #include - #include -+#include - - // 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 +diff -rupN geos-3.11.2/include/geos/geomgraph/Label.h geos-3.11.2-new/include/geos/geomgraph/Label.h +--- geos-3.11.2/include/geos/geomgraph/Label.h 2023-03-17 00:57:01.000000000 +0100 ++++ geos-3.11.2-new/include/geos/geomgraph/Label.h 2023-03-19 12:24:14.383887619 +0100 @@ -26,6 +26,7 @@ #include // for operator<< @@ -20,32 +9,10 @@ diff -rupN geos-3.11.1/include/geos/geomgraph/Label.h geos-3.11.1-new/include/ge 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 - #include - #include -+#include - - #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 - #include -+#include - - #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 @@ +diff -rupN geos-3.11.2/include/geos/operation/overlayng/OverlayLabel.h geos-3.11.2-new/include/geos/operation/overlayng/OverlayLabel.h +--- geos-3.11.2/include/geos/operation/overlayng/OverlayLabel.h 2023-03-17 00:57:01.000000000 +0100 ++++ geos-3.11.2-new/include/geos/operation/overlayng/OverlayLabel.h 2023-03-19 12:24:16.550885155 +0100 +@@ -19,6 +19,7 @@ #include #include #include @@ -53,20 +20,9 @@ diff -rupN geos-3.11.1/include/geos/operation/overlayng/OverlayLabel.h geos-3.11 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 - #include -+#include - - // 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 +diff -rupN geos-3.11.2/include/geos/shape/fractal/HilbertEncoder.h geos-3.11.2-new/include/geos/shape/fractal/HilbertEncoder.h +--- geos-3.11.2/include/geos/shape/fractal/HilbertEncoder.h 2023-03-17 00:57:01.000000000 +0100 ++++ geos-3.11.2-new/include/geos/shape/fractal/HilbertEncoder.h 2023-03-19 12:24:17.190884427 +0100 @@ -18,6 +18,7 @@ #include #include @@ -75,20 +31,9 @@ diff -rupN geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h geos-3.11.1-n // 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 - #include -+#include - - // 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 +diff -rupN geos-3.11.2/tests/unit/capi/GEOSMakeValidTest.cpp geos-3.11.2-new/tests/unit/capi/GEOSMakeValidTest.cpp +--- geos-3.11.2/tests/unit/capi/GEOSMakeValidTest.cpp 2023-03-17 00:57:01.000000000 +0100 ++++ geos-3.11.2-new/tests/unit/capi/GEOSMakeValidTest.cpp 2023-03-19 12:24:17.991883515 +0100 @@ -9,6 +9,7 @@ #include #include