Update to 3.10.3
This commit is contained in:
parent
6df1b8aab9
commit
31dc63ab7d
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,3 +7,4 @@
|
||||
/geos-3.10.0.tar.bz2
|
||||
/geos-3.10.1.tar.bz2
|
||||
/geos-3.10.2.tar.bz2
|
||||
/geos-3.10.3.tar.bz2
|
||||
|
||||
16
geos.spec
16
geos.spec
@ -1,6 +1,6 @@
|
||||
Name: geos
|
||||
Version: 3.10.2
|
||||
Release: 5%{?dist}
|
||||
Version: 3.10.3
|
||||
Release: 1%{?dist}
|
||||
Summary: GEOS is a C++ port of the Java Topology Suite
|
||||
|
||||
License: LGPLv2
|
||||
@ -8,6 +8,9 @@ URL: http://trac.osgeo.org/geos/
|
||||
Source0: http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2
|
||||
# Add library version suffix also when building with cmake for mingw
|
||||
Patch0: geos_version-suffix.patch
|
||||
# Fix test failure due to
|
||||
# warning: found documented return type for XXX that does not return anything
|
||||
Patch1: geos_docs.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: doxygen
|
||||
@ -98,7 +101,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config
|
||||
%doc AUTHORS NEWS README.md
|
||||
%license COPYING
|
||||
%{_bindir}/geosop
|
||||
%{_libdir}/libgeos.so.3.10.2
|
||||
%{_libdir}/libgeos.so.3.10.3
|
||||
%{_libdir}/libgeos_c.so.1*
|
||||
|
||||
%files devel
|
||||
@ -114,7 +117,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config
|
||||
%files -n mingw32-%{name}
|
||||
%license COPYING
|
||||
%{mingw32_bindir}/geosop.exe
|
||||
%{mingw32_bindir}/libgeos-3.10.2.dll
|
||||
%{mingw32_bindir}/libgeos-3.10.3.dll
|
||||
%{mingw32_bindir}/libgeos_c-1.dll
|
||||
%{mingw32_includedir}/geos/
|
||||
%{mingw32_includedir}/geos_c.h
|
||||
@ -126,7 +129,7 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config
|
||||
%files -n mingw64-%{name}
|
||||
%license COPYING
|
||||
%{mingw64_bindir}/geosop.exe
|
||||
%{mingw64_bindir}/libgeos-3.10.2.dll
|
||||
%{mingw64_bindir}/libgeos-3.10.3.dll
|
||||
%{mingw64_bindir}/libgeos_c-1.dll
|
||||
%{mingw64_includedir}/geos/
|
||||
%{mingw64_includedir}/geos_c.h
|
||||
@ -137,6 +140,9 @@ rm -f %{buildroot}%{mingw64_bindir}/geos-config
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 06 2022 Sandro Mani <manisandro@gmail.com> - 3.10.3-1
|
||||
- Update to 3.10.3
|
||||
|
||||
* Fri Mar 25 2022 Sandro Mani <manisandro@gmail.com> - 3.10.2-5
|
||||
- Rebuild with mingw-gcc-12
|
||||
|
||||
|
||||
35
geos_docs.patch
Normal file
35
geos_docs.patch
Normal file
@ -0,0 +1,35 @@
|
||||
diff -rupN geos-3.10.3/include/geos/noding/SegmentNodeList.h geos-3.10.3-new/include/geos/noding/SegmentNodeList.h
|
||||
--- geos-3.10.3/include/geos/noding/SegmentNodeList.h 2022-06-03 18:04:49.000000000 +0200
|
||||
+++ geos-3.10.3-new/include/geos/noding/SegmentNodeList.h 2022-06-06 12:01:08.148151403 +0200
|
||||
@@ -157,9 +157,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.10.3/include/geos/triangulate/polygon/PolygonEarClipper.h geos-3.10.3-new/include/geos/triangulate/polygon/PolygonEarClipper.h
|
||||
--- geos-3.10.3/include/geos/triangulate/polygon/PolygonEarClipper.h 2022-06-03 18:04:49.000000000 +0200
|
||||
+++ geos-3.10.3-new/include/geos/triangulate/polygon/PolygonEarClipper.h 2022-06-06 12:01:52.576152397 +0200
|
||||
@@ -186,7 +186,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<Coordinate>& polyShell, TriList& triListResult);
|
||||
|
||||
diff -rupN geos-3.10.3/include/geos/triangulate/polygon/VertexSequencePackedRtree.h geos-3.10.3-new/include/geos/triangulate/polygon/VertexSequencePackedRtree.h
|
||||
--- geos-3.10.3/include/geos/triangulate/polygon/VertexSequencePackedRtree.h 2022-06-03 18:04:49.000000000 +0200
|
||||
+++ geos-3.10.3-new/include/geos/triangulate/polygon/VertexSequencePackedRtree.h 2022-06-06 12:02:19.176152992 +0200
|
||||
@@ -137,7 +137,6 @@ public:
|
||||
*
|
||||
* @param queryEnv the query extent
|
||||
* @param result vector to fill with results
|
||||
- * @return
|
||||
*/
|
||||
void query(const Envelope& queryEnv, std::vector<std::size_t>& result) const;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -rupN --no-dereference geos-3.10.2/CMakeLists.txt geos-3.10.2-new/CMakeLists.txt
|
||||
--- geos-3.10.2/CMakeLists.txt 2022-01-15 22:14:55.000000000 +0100
|
||||
+++ geos-3.10.2-new/CMakeLists.txt 2022-01-18 09:17:48.278835601 +0100
|
||||
diff -rupN --no-dereference geos-3.10.3/CMakeLists.txt geos-3.10.3-new/CMakeLists.txt
|
||||
--- geos-3.10.3/CMakeLists.txt 2022-06-03 18:04:49.000000000 +0200
|
||||
+++ geos-3.10.3-new/CMakeLists.txt 2022-06-06 11:34:32.396115706 +0200
|
||||
@@ -280,6 +280,9 @@ if(BUILD_SHARED_LIBS)
|
||||
|
||||
set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION_NOPATCH})
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (geos-3.10.2.tar.bz2) = 390381711ccf56b862c2736cf6329200822f121de1c49df52b8b85cabea8c7787b199df2196acacc2e5c677ff3ebe042d93d70e89deadbc19d754499edb65126
|
||||
SHA512 (geos-3.10.3.tar.bz2) = d6df49193ab006e8d0ddc86c58cfd3d3ee8f42c0a1b325fbe3f77e4d98abce8e7cce283343b81355aa96a5212b740fe04f7cbaca0106b02a9688e9fa78818e34
|
||||
|
||||
Loading…
Reference in New Issue
Block a user