From 5d21bfb0164d47014de3bffa0dd5d0bf911e04d6 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 6 Jul 2023 15:57:32 +0200
Subject: [PATCH] Update to 3.12.0

---
 .gitignore       |  1 +
 geos.spec        | 16 ++++++++--------
 geos_gcc13.patch | 44 --------------------------------------------
 sources          |  2 +-
 4 files changed, 10 insertions(+), 53 deletions(-)
 delete mode 100644 geos_gcc13.patch

diff --git a/.gitignore b/.gitignore
index 6300c37..f77aaaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /geos-3.11.0.tar.bz2
 /geos-3.11.1.tar.bz2
 /geos-3.11.2.tar.bz2
+/geos-3.12.0.tar.bz2
diff --git a/geos.spec b/geos.spec
index aaddd28..49ca55f 100644
--- a/geos.spec
+++ b/geos.spec
@@ -10,17 +10,14 @@
 %endif
 
 Name:          geos
-Version:       3.11.2
+Version:       3.12.0
 Release:       1%{?dist}
 Summary:       GEOS is a C++ port of the Java Topology Suite
 
-License:       LGPLv2
+License:       LGPL-2.0
 URL:           http://trac.osgeo.org/geos/
 Source0:       http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2
 
-# Fix GCC13 FTBFS
-Patch1:        geos_gcc13.patch
-
 BuildRequires: cmake
 BuildRequires: doxygen
 BuildRequires: gcc-c++
@@ -122,7 +119,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config
 %doc AUTHORS NEWS.md README.md
 %license COPYING
 %{_bindir}/geosop
-%{_libdir}/libgeos.so.3.11.2
+%{_libdir}/libgeos.so.3.12.0
 %{_libdir}/libgeos_c.so.1*
 
 %files devel
@@ -140,7 +137,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config
 %files -n mingw32-%{name}
 %license COPYING
 %{mingw32_bindir}/geosop.exe
-%{mingw32_bindir}/libgeos-3.11.2.dll
+%{mingw32_bindir}/libgeos-3.12.0.dll
 %{mingw32_bindir}/libgeos_c-1.dll
 %{mingw32_includedir}/geos/
 %{mingw32_includedir}/geos_c.h
@@ -153,7 +150,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config
 %files -n mingw64-%{name}
 %license COPYING
 %{mingw64_bindir}/geosop.exe
-%{mingw64_bindir}/libgeos-3.11.2.dll
+%{mingw64_bindir}/libgeos-3.12.0.dll
 %{mingw64_bindir}/libgeos_c-1.dll
 %{mingw64_includedir}/geos/
 %{mingw64_includedir}/geos_c.h
@@ -166,6 +163,9 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config
 
 
 %changelog
+* Thu Jul 06 2023 Sandro Mani <manisandro@gmail.com> - 3.12.0-1
+- Update to 3.12.0
+
 * Sun Mar 19 2023 Sandro Mani <manisandro@gmail.com> - 3.11.2-1
 - Update to 3.11.2
 
diff --git a/geos_gcc13.patch b/geos_gcc13.patch
deleted file mode 100644
index 11c43be..0000000
--- a/geos_gcc13.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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 <iosfwd> // for operator<<
- #include <cassert>
-+#include <cstdint>
- 
- namespace geos {
- namespace geomgraph { // geos.geomgraph
-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 <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.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 <geos/export.h>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- // Forward declarations
- namespace geos {
-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 <cstdlib>
- #include <cmath>
- #include <cstring>
-+#include <cstdint>
- 
- #include "capi_test_utils.h"
- 
diff --git a/sources b/sources
index 70f6c7b..3137c04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (geos-3.11.2.tar.bz2) = b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec
+SHA512 (geos-3.12.0.tar.bz2) = cc67d9516d24ada2ceaf7c81ff9df40033bb15123160bf7e70fdff97b72c798f4b9ba8223c1eaebac0f33dcb530bc8cf42af000af3491f3227420290d89332d5