diff --git a/.gitignore b/.gitignore index 115d7a6..cd7cd45 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /geos-3.10.2.tar.bz2 /geos-3.10.3.tar.bz2 /geos-3.11.0.tar.bz2 +/geos-3.11.1.tar.bz2 diff --git a/geos.spec b/geos.spec index bad6ae2..aff6624 100644 --- a/geos.spec +++ b/geos.spec @@ -10,16 +10,15 @@ %endif Name: geos -Version: 3.11.0 -Release: 2%{?dist} +Version: 3.11.1 +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 test failure due to -# warning: found documented return type for XXX that does not return anything -Patch1: geos_docs.patch +# Fix doxygen errors +Patch0: geos_docs.patch BuildRequires: cmake BuildRequires: doxygen @@ -122,7 +121,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config %doc AUTHORS NEWS.md README.md %license COPYING %{_bindir}/geosop -%{_libdir}/libgeos.so.3.11.0 +%{_libdir}/libgeos.so.3.11.1 %{_libdir}/libgeos_c.so.1* %files devel @@ -140,7 +139,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config %files -n mingw32-%{name} %license COPYING %{mingw32_bindir}/geosop.exe -%{mingw32_bindir}/libgeos-3.11.0.dll +%{mingw32_bindir}/libgeos-3.11.1.dll %{mingw32_bindir}/libgeos_c-1.dll %{mingw32_includedir}/geos/ %{mingw32_includedir}/geos_c.h @@ -153,7 +152,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config %files -n mingw64-%{name} %license COPYING %{mingw64_bindir}/geosop.exe -%{mingw64_bindir}/libgeos-3.11.0.dll +%{mingw64_bindir}/libgeos-3.11.1.dll %{mingw64_bindir}/libgeos_c-1.dll %{mingw64_includedir}/geos/ %{mingw64_includedir}/geos_c.h @@ -166,6 +165,9 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config %changelog +* Mon Nov 14 2022 Sandro Mani - 3.11.1-1 +- Update to 3.11.1 + * Thu Jul 21 2022 Fedora Release Engineering - 3.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/geos_docs.patch b/geos_docs.patch index fe942d3..0a2452a 100644 --- a/geos_docs.patch +++ b/geos_docs.patch @@ -1,68 +1,143 @@ -diff -rupN geos-3.11.0/include/geos/index/SpatialIndex.h geos-3.11.0-new/include/geos/index/SpatialIndex.h ---- geos-3.11.0/include/geos/index/SpatialIndex.h 2022-07-01 18:42:19.000000000 +0200 -+++ geos-3.11.0-new/include/geos/index/SpatialIndex.h 2022-07-02 11:07:09.740083703 +0200 -@@ -70,7 +70,6 @@ public: - * intersect the query envelope. +diff -rupN geos-3.11.1/include/geos/algorithm/CGAlgorithmsDD.h geos-3.11.1-new/include/geos/algorithm/CGAlgorithmsDD.h +--- geos-3.11.1/include/geos/algorithm/CGAlgorithmsDD.h 2022-11-13 20:24:40.000000000 +0100 ++++ geos-3.11.1-new/include/geos/algorithm/CGAlgorithmsDD.h 2022-11-15 08:03:18.909027043 +0100 +@@ -172,7 +172,7 @@ public: * - * @param searchEnv the envelope to query for -- * @return a list of the items found by the query in a newly allocated vector - */ - //virtual std::vector* query(const geom::Envelope *searchEnv)=0; - virtual void query(const geom::Envelope* searchEnv, std::vector&) = 0; -diff -rupN geos-3.11.0/include/geos/index/VertexSequencePackedRtree.h geos-3.11.0-new/include/geos/index/VertexSequencePackedRtree.h ---- geos-3.11.0/include/geos/index/VertexSequencePackedRtree.h 2022-07-01 18:42:19.000000000 +0200 -+++ geos-3.11.0-new/include/geos/index/VertexSequencePackedRtree.h 2022-07-02 11:07:44.759084486 +0200 -@@ -136,7 +136,6 @@ public: + * This method uses @ref geos::math::DD extended-precision arithmetic to provide more accurate + * results than [circumcentre(Coordinate, Coordinate, Coordinate)] +- * (@ref geos::geom::Triangle::circumcentre(const Coordinate& p0, const Coordinate& p1, const Coordinate& p2)). ++ * (geos::geom::Triangle::circumcentre(const Coordinate& p0, const Coordinate& p1, const Coordinate& p2)). + * + * @param a + * a vertex of the triangle +diff -rupN geos-3.11.1/include/geos/index/SpatialIndex.h.rej geos-3.11.1-new/include/geos/index/SpatialIndex.h.rej +--- geos-3.11.1/include/geos/index/SpatialIndex.h.rej 1970-01-01 01:00:00.000000000 +0100 ++++ geos-3.11.1-new/include/geos/index/SpatialIndex.h.rej 2022-11-14 19:32:59.422831322 +0100 +@@ -0,0 +1,10 @@ ++--- include/geos/index/SpatialIndex.h 2022-07-01 18:42:19.000000000 +0200 +++++ include/geos/index/SpatialIndex.h 2022-07-02 11:07:09.740083703 +0200 ++@@ -70,7 +70,6 @@ public: ++ * intersect the query envelope. ++ * ++ * @param searchEnv the envelope to query for ++- * @return a list of the items found by the query in a newly allocated vector ++ */ ++ //virtual std::vector* query(const geom::Envelope *searchEnv)=0; ++ virtual void query(const geom::Envelope* searchEnv, std::vector&) = 0; +diff -rupN geos-3.11.1/include/geos/index/VertexSequencePackedRtree.h.rej geos-3.11.1-new/include/geos/index/VertexSequencePackedRtree.h.rej +--- geos-3.11.1/include/geos/index/VertexSequencePackedRtree.h.rej 1970-01-01 01:00:00.000000000 +0100 ++++ geos-3.11.1-new/include/geos/index/VertexSequencePackedRtree.h.rej 2022-11-14 19:33:00.510831347 +0100 +@@ -0,0 +1,10 @@ ++--- include/geos/index/VertexSequencePackedRtree.h 2022-07-01 18:42:19.000000000 +0200 +++++ include/geos/index/VertexSequencePackedRtree.h 2022-07-02 11:07:44.759084486 +0200 ++@@ -136,7 +136,6 @@ public: ++ * ++ * @param queryEnv the query extent ++ * @param result vector to fill with results ++- * @return ++ */ ++ void query(const Envelope& queryEnv, std::vector& result) const; ++ +diff -rupN geos-3.11.1/include/geos/noding/SegmentNodeList.h.rej geos-3.11.1-new/include/geos/noding/SegmentNodeList.h.rej +--- geos-3.11.1/include/geos/noding/SegmentNodeList.h.rej 1970-01-01 01:00:00.000000000 +0100 ++++ geos-3.11.1-new/include/geos/noding/SegmentNodeList.h.rej 2022-11-14 19:33:01.494831369 +0100 +@@ -0,0 +1,12 @@ ++--- include/geos/noding/SegmentNodeList.h 2022-07-02 11:06:21.869082632 +0200 +++++ include/geos/noding/SegmentNodeList.h 2022-07-02 00:22:57.506176063 +0200 ++@@ -155,9 +155,6 @@ public: ++ * Adds an intersection into the list, if it isn't already there. ++ * The input segmentIndex is expected to be normalized. ++ * ++- * @return the SegmentIntersection found or added. It will be ++- * destroyed at SegmentNodeList destruction time. ++- * ++ * @param intPt the intersection Coordinate, will be copied ++ * @param segmentIndex ++ */ +diff -rupN geos-3.11.1/include/geos/operation/buffer/OffsetCurve.h.rej geos-3.11.1-new/include/geos/operation/buffer/OffsetCurve.h.rej +--- geos-3.11.1/include/geos/operation/buffer/OffsetCurve.h.rej 1970-01-01 01:00:00.000000000 +0100 ++++ geos-3.11.1-new/include/geos/operation/buffer/OffsetCurve.h.rej 2022-11-14 19:33:02.197831384 +0100 +@@ -0,0 +1,10 @@ ++--- include/geos/operation/buffer/OffsetCurve.h 2022-07-01 18:42:19.000000000 +0200 +++++ include/geos/operation/buffer/OffsetCurve.h 2022-07-02 11:09:25.767086746 +0200 ++@@ -252,7 +252,6 @@ public: ++ * @param dist the offset distance ++ * @param bufParams the buffer parameters to use ++ * @param lineList the vector to populate with the return value ++- * @return the raw offset line ++ */ ++ static void rawOffset(const LineString& geom, double dist, BufferParameters& bufParams, std::vector& lineList); ++ static void rawOffset(const LineString& geom, double dist, std::vector& lineList); +diff -rupN geos-3.11.1/include/geos/operation/distance/IndexedFacetDistance.h geos-3.11.1-new/include/geos/operation/distance/IndexedFacetDistance.h +--- geos-3.11.1/include/geos/operation/distance/IndexedFacetDistance.h 2022-11-13 20:24:40.000000000 +0100 ++++ geos-3.11.1-new/include/geos/operation/distance/IndexedFacetDistance.h 2022-11-15 08:03:12.656026903 +0100 +@@ -38,7 +38,7 @@ namespace distance { + /// an repeated query situation. + /// + /// Using this technique is usually much more performant than using the +-/// brute-force \ref geom::Geometry::distance(const Geometry* g) const when one ++/// brute-force geom::Geometry::distance(const Geometry* g) const when one + /// or both input geometries are large, or when evaluating many distance + /// computations against a single geometry. + /// +diff -rupN geos-3.11.1/include/geos/operation/overlayng/OverlayNG.h geos-3.11.1-new/include/geos/operation/overlayng/OverlayNG.h +--- geos-3.11.1/include/geos/operation/overlayng/OverlayNG.h 2022-11-13 20:24:40.000000000 +0100 ++++ geos-3.11.1-new/include/geos/operation/overlayng/OverlayNG.h 2022-11-15 08:05:23.491029830 +0100 +@@ -271,7 +271,7 @@ public: + * the result of overlaying the geometries using + * a given overlay operation. * - * @param queryEnv the query extent - * @param result vector to fill with results -- * @return +- * The method handles arguments of {@link Location#NONE} correctly ++ * The method handles arguments of {@link Location} correctly */ - void query(const Envelope& queryEnv, std::vector& result) const; + static bool isResultOfOpPoint(const OverlayLabel* label, int opCode); -diff -rupN geos-3.11.0/include/geos/noding/SegmentNodeList.h geos-3.11.0-new/include/geos/noding/SegmentNodeList.h ---- geos-3.11.0/include/geos/noding/SegmentNodeList.h 2022-07-02 11:06:21.869082632 +0200 -+++ geos-3.11.0-new/include/geos/noding/SegmentNodeList.h 2022-07-02 00:22:57.506176063 +0200 -@@ -155,9 +155,6 @@ public: - * Adds an intersection into the list, if it isn't already there. - * The input segmentIndex is expected to be normalized. - * -- * @return the SegmentIntersection found or added. It will be -- * destroyed at SegmentNodeList destruction time. -- * - * @param intPt the intersection Coordinate, will be copied - * @param segmentIndex - */ -diff -rupN geos-3.11.0/include/geos/operation/buffer/OffsetCurve.h geos-3.11.0-new/include/geos/operation/buffer/OffsetCurve.h ---- geos-3.11.0/include/geos/operation/buffer/OffsetCurve.h 2022-07-01 18:42:19.000000000 +0200 -+++ geos-3.11.0-new/include/geos/operation/buffer/OffsetCurve.h 2022-07-02 11:09:25.767086746 +0200 -@@ -252,7 +252,6 @@ public: - * @param dist the offset distance - * @param bufParams the buffer parameters to use - * @param lineList the vector to populate with the return value -- * @return the raw offset line - */ - static void rawOffset(const LineString& geom, double dist, BufferParameters& bufParams, std::vector& lineList); - static void rawOffset(const LineString& geom, double dist, std::vector& lineList); -diff -rupN geos-3.11.0/include/geos/precision/CommonBitsRemover.h geos-3.11.0-new/include/geos/precision/CommonBitsRemover.h ---- geos-3.11.0/include/geos/precision/CommonBitsRemover.h 2022-07-01 18:42:19.000000000 +0200 -+++ geos-3.11.0-new/include/geos/precision/CommonBitsRemover.h 2022-07-02 11:59:35.455154073 +0200 -@@ -74,7 +74,6 @@ public: - * - * @param geom the Geometry from which to remove the common - * coordinate bits -- * @return the shifted Geometry - */ - void removeCommonBits(geom::Geometry* geom); - -diff -rupN geos-3.11.0/include/geos/triangulate/polygon/PolygonEarClipper.h geos-3.11.0-new/include/geos/triangulate/polygon/PolygonEarClipper.h ---- geos-3.11.0/include/geos/triangulate/polygon/PolygonEarClipper.h 2022-07-02 11:06:21.870082632 +0200 -+++ geos-3.11.0-new/include/geos/triangulate/polygon/PolygonEarClipper.h 2022-07-02 00:22:57.507176063 +0200 -@@ -184,7 +184,6 @@ public: +@@ -284,7 +284,7 @@ public: + * computed during the overlay process should be + * included in the result geometry. * - * @param polyShell the vertices of the polygon - * @param triListResult vector to fill in with the resultant Tri s -- * @return a list of the Tris +- * The method handles arguments of {@link Location#NONE} correctly. ++ * The method handles arguments of {@link Location} correctly. */ - static void triangulate(std::vector& polyShell, TriList& triListResult); + static bool isResultOfOp(int overlayOpCode, Location loc0, Location loc1); +diff -rupN geos-3.11.1/include/geos/operation/union/UnaryUnionOp.h geos-3.11.1-new/include/geos/operation/union/UnaryUnionOp.h +--- geos-3.11.1/include/geos/operation/union/UnaryUnionOp.h 2022-11-13 20:24:40.000000000 +0100 ++++ geos-3.11.1-new/include/geos/operation/union/UnaryUnionOp.h 2022-11-15 08:04:05.928028095 +0100 +@@ -71,7 +71,7 @@ namespace geounion { // geos::operation + * or portions of line segments will be reduced to a single line segment + * in the output. + * This is consistent with the semantics of the +- * [Geometry::Union(Geometry* )](@ref geom::Geometry::Union(const Geometry* other) const) ++ * geom::Geometry::Union(const Geometry* other) const + * operation. If **merged** linework is required, the + * [LineMerger](@ref operation::linemerge::LineMerger) class + * can be used. +diff -rupN geos-3.11.1/include/geos/precision/CommonBitsRemover.h.rej geos-3.11.1-new/include/geos/precision/CommonBitsRemover.h.rej +--- geos-3.11.1/include/geos/precision/CommonBitsRemover.h.rej 1970-01-01 01:00:00.000000000 +0100 ++++ geos-3.11.1-new/include/geos/precision/CommonBitsRemover.h.rej 2022-11-14 19:33:03.029831403 +0100 +@@ -0,0 +1,10 @@ ++--- include/geos/precision/CommonBitsRemover.h 2022-07-01 18:42:19.000000000 +0200 +++++ include/geos/precision/CommonBitsRemover.h 2022-07-02 11:59:35.455154073 +0200 ++@@ -74,7 +74,6 @@ public: ++ * ++ * @param geom the Geometry from which to remove the common ++ * coordinate bits ++- * @return the shifted Geometry ++ */ ++ void removeCommonBits(geom::Geometry* geom); ++ +diff -rupN geos-3.11.1/include/geos/triangulate/polygon/PolygonEarClipper.h.rej geos-3.11.1-new/include/geos/triangulate/polygon/PolygonEarClipper.h.rej +--- geos-3.11.1/include/geos/triangulate/polygon/PolygonEarClipper.h.rej 1970-01-01 01:00:00.000000000 +0100 ++++ geos-3.11.1-new/include/geos/triangulate/polygon/PolygonEarClipper.h.rej 2022-11-14 19:33:04.069831426 +0100 +@@ -0,0 +1,10 @@ ++--- include/geos/triangulate/polygon/PolygonEarClipper.h 2022-07-02 11:06:21.870082632 +0200 +++++ include/geos/triangulate/polygon/PolygonEarClipper.h 2022-07-02 00:22:57.507176063 +0200 ++@@ -184,7 +184,6 @@ public: ++ * ++ * @param polyShell the vertices of the polygon ++ * @param triListResult vector to fill in with the resultant Tri s ++- * @return a list of the Tris ++ */ ++ static void triangulate(std::vector& polyShell, TriList& triListResult); ++ diff --git a/sources b/sources index 78a052b..d4a848b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geos-3.11.0.tar.bz2) = 40c7553bbb93673c231ddd0131b73bf43b3f50524bc5bd9e6934c068d2c09632f388b7429254ae15d9641da2d15e3a626b430438854e98d9e7419ad04e535189 +SHA512 (geos-3.11.1.tar.bz2) = 708500aba9b04208ee46a531d55ddf63a213dfaa2922dae937b524300b2b46c95143ed6cd3ff1414e9099f2be95e5df5a2e0b49df43acf93a9478215259f20d3