From cf7bdf7e18a30891a473508345d8fec896eb1227 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Nov 02 2021 08:43:58 +0000 Subject: Update to 3.9.2 --- diff --git a/.gitignore b/.gitignore index f0290bc..bbc569f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /geos-3.8.1.tar.bz2 /geos-3.9.0.tar.bz2 /geos-3.9.1.tar.bz2 +/geos-3.9.2.tar.bz2 diff --git a/e615f6ca286cb15bad3f919e066b4b3bbd8cad58.patch b/e615f6ca286cb15bad3f919e066b4b3bbd8cad58.patch deleted file mode 100644 index 01e83fc..0000000 --- a/e615f6ca286cb15bad3f919e066b4b3bbd8cad58.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rupN --no-dereference geos-3.9.1/src/noding/SegmentNodeList.cpp geos-3.9.1-new/src/noding/SegmentNodeList.cpp ---- geos-3.9.1/src/noding/SegmentNodeList.cpp 2021-02-10 19:10:27.000000000 +0100 -+++ geos-3.9.1-new/src/noding/SegmentNodeList.cpp 2021-06-17 11:44:40.862229759 +0200 -@@ -301,6 +301,8 @@ SegmentNodeList::getSplitCoordinates() - addEdgeCoordinates(eiPrev, ei, *coordList); - eiPrev = ei; - } -+ // Remove duplicate Coordinates from coordList -+ coordList->erase(std::unique(coordList->begin(), coordList->end()), coordList->end()); - return coordList; - } - -@@ -312,8 +314,6 @@ SegmentNodeList::addEdgeCoordinates(cons - createSplitEdgePts(ei0, ei1, pts); - // Append pts to coordList - coordList.insert(coordList.end(), pts.begin(), pts.end()); -- // Remove duplicate Coordinates from coordList -- coordList.erase(std::unique(coordList.begin(), coordList.end()), coordList.end()); - } - - diff --git a/geos.spec b/geos.spec index abfea45..69a603c 100644 --- a/geos.spec +++ b/geos.spec @@ -1,6 +1,6 @@ Name: geos -Version: 3.9.1 -Release: 5%{?dist} +Version: 3.9.2 +Release: 1%{?dist} Summary: GEOS is a C++ port of the Java Topology Suite License: LGPLv2 @@ -11,8 +11,6 @@ Source1: http://git.osgeo.org/gitea/geos/geos/raw/tag/%{version}/doc/check # Honour libsuffix Patch1: geos_libsuffix.patch -# Backport fix for performance regression -Patch2: https://github.com/libgeos/geos/commit/e615f6ca286cb15bad3f919e066b4b3bbd8cad58.patch BuildRequires: cmake BuildRequires: doxygen @@ -88,6 +86,9 @@ make docs -C %{__cmake_builddir} %changelog +* Tue Nov 02 2021 Sandro Mani - 3.9.2-1 +- Update to 3.9.2 + * Thu Jul 22 2021 Fedora Release Engineering - 3.9.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/geos_libsuffix.patch b/geos_libsuffix.patch index 3993e5b..f8784c1 100644 --- a/geos_libsuffix.patch +++ b/geos_libsuffix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference geos-3.9.1/CMakeLists.txt geos-3.9.1-new/CMakeLists.txt ---- geos-3.9.1/CMakeLists.txt 2021-02-10 19:10:27.000000000 +0100 -+++ geos-3.9.1-new/CMakeLists.txt 2021-06-17 11:44:40.776229757 +0200 +diff -rupN --no-dereference geos-3.9.2/CMakeLists.txt geos-3.9.2-new/CMakeLists.txt +--- geos-3.9.2/CMakeLists.txt 2021-11-01 18:52:04.000000000 +0100 ++++ geos-3.9.2-new/CMakeLists.txt 2021-11-02 09:43:02.671291410 +0100 @@ -308,16 +308,16 @@ configure_file(cmake/geos-config.cmake install(TARGETS geos geos_cxx_flags @@ -37,9 +37,9 @@ diff -rupN --no-dereference geos-3.9.1/CMakeLists.txt geos-3.9.1-new/CMakeLists. install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/geos" "${CMAKE_CURRENT_BINARY_DIR}/include/geos" -diff -rupN --no-dereference geos-3.9.1/tools/CMakeLists.txt geos-3.9.1-new/tools/CMakeLists.txt ---- geos-3.9.1/tools/CMakeLists.txt 2021-02-10 19:10:27.000000000 +0100 -+++ geos-3.9.1-new/tools/CMakeLists.txt 2021-06-17 11:44:40.776229757 +0200 +diff -rupN --no-dereference geos-3.9.2/tools/CMakeLists.txt geos-3.9.2-new/tools/CMakeLists.txt +--- geos-3.9.2/tools/CMakeLists.txt 2021-11-01 18:52:04.000000000 +0100 ++++ geos-3.9.2-new/tools/CMakeLists.txt 2021-11-02 09:43:02.672291373 +0100 @@ -36,7 +36,7 @@ if(NOT MSVC) install(FILES @@ -49,9 +49,9 @@ diff -rupN --no-dereference geos-3.9.1/tools/CMakeLists.txt geos-3.9.1-new/tools endif() -diff -rupN --no-dereference geos-3.9.1/tools/geos-config.cmake geos-3.9.1-new/tools/geos-config.cmake ---- geos-3.9.1/tools/geos-config.cmake 2021-02-04 00:19:53.000000000 +0100 -+++ geos-3.9.1-new/tools/geos-config.cmake 2021-06-17 11:44:40.776229757 +0200 +diff -rupN --no-dereference geos-3.9.2/tools/geos-config.cmake geos-3.9.2-new/tools/geos-config.cmake +--- geos-3.9.2/tools/geos-config.cmake 2021-11-01 18:52:04.000000000 +0100 ++++ geos-3.9.2-new/tools/geos-config.cmake 2021-11-02 09:43:02.672291373 +0100 @@ -1,7 +1,7 @@ #!/bin/sh @@ -61,9 +61,9 @@ diff -rupN --no-dereference geos-3.9.1/tools/geos-config.cmake geos-3.9.1-new/to usage() { -diff -rupN --no-dereference geos-3.9.1/tools/geos.pc.cmake geos-3.9.1-new/tools/geos.pc.cmake ---- geos-3.9.1/tools/geos.pc.cmake 2021-02-04 00:19:53.000000000 +0100 -+++ geos-3.9.1-new/tools/geos.pc.cmake 2021-06-17 11:44:40.776229757 +0200 +diff -rupN --no-dereference geos-3.9.2/tools/geos.pc.cmake geos-3.9.2-new/tools/geos.pc.cmake +--- geos-3.9.2/tools/geos.pc.cmake 2021-11-01 18:52:04.000000000 +0100 ++++ geos-3.9.2-new/tools/geos.pc.cmake 2021-11-02 09:43:02.672291373 +0100 @@ -8,4 +8,4 @@ Description: Geometry Engine, Open Sourc Requires: Version: @GEOS_VERSION@ diff --git a/sources b/sources index 8f0d483..6ddeff2 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (check_doxygen_errors.cmake) = 4764415b279cd7583f8ec2e0150ab2e87f12f7b9c6249ee03bf3a368c12f698c586a6b116ae892395b7d46d620f96d2a1ac6aa16ce4bbf4dc2cdedca9f12e07f -SHA512 (geos-3.9.1.tar.bz2) = 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28 +SHA512 (geos-3.9.2.tar.bz2) = 3d42d0c6fde51e6dfde6372b1283759c95c3be8d330e1b640eaa099cd9d276671c75962f4553510e71bd64389d8d6da591294645534d156310e12e885ac41b87