Add package geos v3.11.1 (#4857)
This commit is contained in:
sindhu-karri
GitHub
Родитель
2d40397e27
Коммит
7ef4978dbc
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
|
@ -249,6 +249,7 @@
|
|||
"genwqe-tools",
|
||||
"GeoIP",
|
||||
"geolite2",
|
||||
"geos",
|
||||
"gfs2-utils",
|
||||
"ghc-srpm-macros",
|
||||
"giflib",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"geos-3.11.1.tar.bz2": "6d0eb3cfa9f92d947731cc75f1750356b3bdfc07ea020553daf6af1c768e0be2"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,380 @@
|
|||
Summary: GEOS is a C++ port of the Java Topology Suite
|
||||
Name: geos
|
||||
Version: 3.11.1
|
||||
Release: 4%{?dist}
|
||||
License: LGPLv2
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
URL: https://trac.osgeo.org/geos/
|
||||
Source0: https://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2
|
||||
# Fix doxygen errors
|
||||
Patch0: geos_docs.patch
|
||||
# Fix GCC13 FTBFS
|
||||
Patch1: geos_gcc13.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: gcc-c++
|
||||
|
||||
%description
|
||||
GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology
|
||||
Suite (JTS). As such, it aims to contain the complete functionality of
|
||||
JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial
|
||||
predicate functions and spatial operators, as well as specific JTS topology
|
||||
functions such as IsValid()
|
||||
|
||||
%package devel
|
||||
Summary: Development files for GEOS
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology
|
||||
Suite (JTS). As such, it aims to contain the complete functionality of
|
||||
JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial
|
||||
predicate functions and spatial operators, as well as specific JTS topology
|
||||
functions such as IsValid().
|
||||
|
||||
This package contains the development files to build applications that
|
||||
use GEOS.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
# Native build
|
||||
%cmake -DDISABLE_GEOS_INLINE=ON -DBUILD_DOCUMENTATION=ON
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
make docs -C %{__cmake_builddir}
|
||||
|
||||
%check
|
||||
%ctest
|
||||
|
||||
%files
|
||||
%doc AUTHORS NEWS.md README.md
|
||||
%license COPYING
|
||||
%{_bindir}/geosop
|
||||
%{_libdir}/libgeos.so.3.11.1
|
||||
%{_libdir}/libgeos_c.so.1*
|
||||
|
||||
%files devel
|
||||
%doc %{__cmake_builddir}/doxygen/doxygen_docs
|
||||
%{_bindir}/geos-config
|
||||
%{_includedir}/geos/
|
||||
%{_includedir}/geos_c.h
|
||||
%{_includedir}/geos.h
|
||||
%{_libdir}/libgeos_c.so
|
||||
%{_libdir}/libgeos.so
|
||||
%{_libdir}/cmake/GEOS/
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
|
||||
%changelog
|
||||
* Tue Feb 14 2023 Sindhu Karri <lakarri@microsoft.com> - 3.11.1-4
|
||||
- Initial CBL-Mariner import from Fedora 38 (license: MIT)
|
||||
- Removed building for mingw environment
|
||||
- License verified
|
||||
- Updated geos project URL from http to https
|
||||
- Remove macro referencing unsupported arch s390x in run check tests
|
||||
|
||||
* Tue Jan 24 2023 Sandro Mani <manisandro@gmail.com> - 3.11.1-3
|
||||
- Add geos_gcc13.patch
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Nov 14 2022 Sandro Mani <manisandro@gmail.com> - 3.11.1-1
|
||||
- Update to 3.11.1
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Jul 01 2022 Sandro Mani <manisandro@gmail.com> - 3.11.0-1
|
||||
- Update to 3.11.0
|
||||
|
||||
* 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
|
||||
|
||||
* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 3.10.2-4
|
||||
- Make mingw subpackages noarch
|
||||
|
||||
* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 3.10.2-3
|
||||
- Add mingw subpackages
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Jan 17 2022 Sandro Mani <manisandro@gmail.com> - 3.10.2-1
|
||||
- Update to 3.10.2
|
||||
|
||||
* Tue Nov 02 2021 Sandro Mani <manisandro@gmail.com> - 3.10.1-1
|
||||
- Update to 3.10.1
|
||||
|
||||
* Thu Oct 21 2021 Sandro Mani <manisandro@gmail.com> - 3.10.0-2
|
||||
- Disable inline
|
||||
|
||||
* Thu Oct 21 2021 Sandro Mani <manisandro@gmail.com> - 3.10.0-1
|
||||
- Update to 3.10.0
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Jun 17 2021 Sandro Mani <manisandro@gmail.com> - 3.9.1-4
|
||||
- Backport fix for performance regression (#1972892)
|
||||
|
||||
* Tue Mar 23 2021 Sandro Mani <manisandro@gmail.com> - 3.9.1-3
|
||||
- Bump
|
||||
|
||||
* Wed Mar 10 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 3.9.1-2
|
||||
- Fix RHBZ#1937424 (Wrong output from geos-config --libs etc.)
|
||||
- Fix RHBZ#1937443 (Wrong output from pkgconf geos --libs etc.)
|
||||
|
||||
* Thu Feb 11 2021 Sandro Mani <manisandro@gmail.com> - 3.9.1-1
|
||||
- Update to 3.9.1
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Dec 10 2020 Sandro Mani <manisandro@gmail.com> - 3.9.0-1
|
||||
- Update to 3.9.0
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jun 16 2020 Miro Hrončok <mhroncok@redhat.com> - 3.8.1-2
|
||||
- Remove ttmath in favour of DD (#1841335)
|
||||
|
||||
* Wed Mar 11 2020 Sandro Mani <manisandro@gmail.com> - 3.8.1-1
|
||||
- Update to 3.8.1
|
||||
|
||||
* Tue Mar 03 2020 Sandro Mani <manisandro@gmail.com> - 3.8.0-2
|
||||
- Install libgeos.so
|
||||
|
||||
* Thu Feb 20 2020 Sandro Mani <manisandro@gmail.com> - 3.8.0-1
|
||||
- Update to 3.8.0
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Feb 04 2019 Devrim Gündüz <devrim@gunduz.org> - 3.7.1-1
|
||||
- Update to 3.7.1
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jan 15 2019 Miro Hrončok <mhroncok@redhat.com> - 3.6.1-11
|
||||
- Subpackage python2-geos has been removed
|
||||
See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
|
||||
|
||||
* Wed Jul 25 2018 Devrim Gündüz <devrim@gunduz.org> - 3.6.1-10
|
||||
- Fix #1606885
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.6.1-8
|
||||
- Update Python 2 dependency declarations to new packaging standards
|
||||
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.6.1-6
|
||||
- Add Provides for the old name without %%_isa
|
||||
|
||||
* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.6.1-5
|
||||
- Python 2 binary package renamed to python2-geos
|
||||
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Dec 28 2016 Devrim Gündüz <devrim@gunduz.org> - 3.6.1-1
|
||||
- Update to 3.6.1
|
||||
- Remove -php subpackage, it is now a separate project.
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.0-4
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Tue Apr 5 2016 Tom Hughes <tom@compton.nu> - 3.5.0-3
|
||||
- Patch FTBFS with gcc 6. Fixes #1305276 .
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Oct 13 2015 Devrim GUNDUZ <devrim@gunduz.org> - 3.5.0-1
|
||||
- Update to 3.5.0, per changes described at:
|
||||
http://trac.osgeo.org/geos/browser/tags/3.5.0/NEWS
|
||||
- Add swig as BR to python subpackage, as it does not build without that.
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.4.2-5
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Thu Feb 26 2015 Orion Poplawski <orion@cora.nwra.com> - 3.4.2-4
|
||||
- Rebuild for gcc 5 C++11 ABI
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed Sep 11 2013 Devrim GUNDUZ <devrim@gunduz.org> - 3.4.2-1
|
||||
- Update to 3.4.2, per changes described in:
|
||||
http://trac.osgeo.org/geos/browser/tags/3.4.2/NEWS
|
||||
- Remove Patch2, it is now in upstream.
|
||||
- Disable ruby bindings
|
||||
- Remove all conditionals -- no more RHEL 4!
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.8-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed Mar 13 2013 Vít Ondruch <vondruch@redhat.com> - 3.3.8-2
|
||||
- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
|
||||
|
||||
* Wed Mar 6 2013 Devrim GUNDUZ <devrim@gunduz.org> - 3.3.8-1
|
||||
- Update to 3.3.8, per changes described in:
|
||||
http://trac.osgeo.org/geos/browser/tags/3.3.8/NEWS
|
||||
|
||||
* Fri Jan 25 2013 Devrim GUNDUZ <devrim@gunduz.org> - 3.3.7-1
|
||||
- Update to 3.3.7, per changes described in:
|
||||
http://trac.osgeo.org/geos/browser/tags/3.3.7/NEWS
|
||||
|
||||
* Fri Nov 16 2012 Devrim GUNDUZ <devrim@gunduz.org> - 3.3.6-1
|
||||
- Update to 3.3.6, per changes described in:
|
||||
http://trac.osgeo.org/geos/browser/tags/3.3.6/NEWS
|
||||
|
||||
* Tue Nov 13 2012 Devrim GUNDUZ <devrim@gunduz.org> - 3.3.5-1
|
||||
- Update to 3.3.5
|
||||
- Remove patch3, already in upstream.
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Mon Feb 27 2012 Vít Ondruch <vondruch@redhat.com> - 3.3.2-2
|
||||
- Rebuilt for Ruby 1.9.3.
|
||||
- Rebuilt for PHP 5.4.
|
||||
|
||||
* Mon Jan 09 2012 Devrim GUNDUZ <devrim@gunduz.org> - 3.3.2-1
|
||||
- Update to 3.3.2
|
||||
|
||||
* Tue Dec 27 2011 Rex Dieter <rdieter@fedoraproject.org> 3.3.1-3
|
||||
- track soname so abi bumps aren't a surprise
|
||||
|
||||
* Tue Oct 18 2011 Devrim GUNDUZ <devrim@gunduz.org> - 3.3.1-2
|
||||
- Enable PHP bindings, per Peter Hopfgartner, bz #746574
|
||||
|
||||
* Tue Oct 4 2011 Devrim GUNDUZ <devrim@gunduz.org> - 3.3.1-1
|
||||
- Update to 3.3.1
|
||||
|
||||
* Wed Jun 1 2011 Devrim GUNDUZ <devrim@gunduz.org> - 3.3.0-1
|
||||
- Update to 3.3.0
|
||||
- Remove 2 patches.
|
||||
|
||||
* Mon May 9 2011 Devrim GUNDUZ <devrim@gunduz.org> - 3.2.2-1
|
||||
- Update to 3.2.2
|
||||
- Add a patch to fix builds on ARM, per bz #682538
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.2.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Wed Jul 21 2010 Dan Horák <dan[at]danny.cz> - 3.2.1-2
|
||||
- fix build with swig 2.0.0
|
||||
|
||||
* Tue Mar 30 2010 Devrim GUNDUZ <devrim@gunduz.org> - 3.2.1-1
|
||||
- Update to 3.2.1
|
||||
|
||||
* Thu Mar 18 2010 Balint Cristian <cristian.balint@gmail.com> - 3.2.0-2
|
||||
- fix bz#473975
|
||||
|
||||
* Sun Dec 20 2009 Devrim GUNDUZ <devrim@gunduz.org> - 3.2.0-1
|
||||
- Update to 3.2.0
|
||||
|
||||
* Thu Dec 03 2009 Devrim GÜNDÜZ <devrim@gunduz.org> - 3.2.0-rc3_1.1
|
||||
- Fix spec (dep error).
|
||||
|
||||
* Wed Dec 2 2009 Devrim GUNDUZ <devrim@gunduz.org> - 3.2.0rc3-1
|
||||
- Update to 3.2.0 rc3
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Thu Jun 18 2009 Devrim GUNDUZ <devrim@gunduz.org> - 3.1.1-1
|
||||
- Update to 3.1.1
|
||||
- Update URL and download URL.
|
||||
- Apply cosmetic changes to spec file.
|
||||
|
||||
* Sun Apr 26 2009 Devrim GUNDUZ <devrim@gunduz.org> - 3.1.0-1
|
||||
- Update to 3.1.0
|
||||
|
||||
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Sat Dec 06 2008 Balint Cristian <rezso@rdsor.ro> - 3.0.3-1
|
||||
- new upstream stable
|
||||
|
||||
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 3.0.1-2
|
||||
- Rebuild for Python 2.6
|
||||
|
||||
* Fri Oct 17 2008 Balint Cristian <rezso@rdsor.ro> - 3.0.1-1
|
||||
- new stable bugfix
|
||||
- fix another gcc43 header
|
||||
|
||||
* Wed May 28 2008 Balint Cristian <rezso@rdsor.ro> - 3.0.0-4
|
||||
- disable bindings for REL4
|
||||
|
||||
* Wed Apr 23 2008 Balint Cristian <rezso@rdsor.ro> - 3.0.0-3
|
||||
- require ruby too
|
||||
|
||||
* Wed Apr 23 2008 Balint Cristian <rezso@rdsor.ro> - 3.0.0-2
|
||||
- remove python-abi request, koji fails
|
||||
|
||||
* Sun Apr 20 2008 Balint Cristian <rezso@rdsor.ro> - 3.0.0-1
|
||||
- New branch upstream
|
||||
- Fix gcc43 build
|
||||
- Avoid r-path hardcoding
|
||||
- Enable and include python module
|
||||
- Enable and include ruby module
|
||||
- Enable and run testsuite during build
|
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.2.3-2
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Mon Jan 8 2007 Shawn McCann <mccann0011@hotmail.com> - 2.2.3-1
|
||||
- Upgraded to geos-2.2.3 and removed patches
|
||||
|
||||
* Sat Sep 16 2006 Shawn McCann <mccann0011@hotmail.com> - 2.2.1-5
|
||||
- Rebuild for Fedora Extras 6
|
||||
|
||||
* Sat Mar 4 2006 Shawn McCann <mccann0011@hotmail.com> - 2.2.1-4
|
||||
- Rebuild for Fedora Extras 5
|
||||
|
||||
* Sat Jan 14 2006 Shawn McCann <smccann@canasoft.ca> - 2.2.1-3
|
||||
- Updated gcc4 patch
|
||||
|
||||
* Wed Jan 11 2006 Ralf Corsépius <rc040203@freenet.de> - 2.2.1-2
|
||||
- Add gcc4 patch
|
||||
|
||||
* Sat Dec 31 2005 Shawn McCann <smccann@canasoft.ca> - 2.2.1-1
|
||||
- Updated to address review comments in bug 17039
|
||||
|
||||
* Fri Dec 30 2005 Shawn McCann <smccann@canasoft.ca> - 2.2.1-1
|
||||
- Initial release
|
||||
|
|
@ -0,0 +1,143 @@
|
|||
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:
|
||||
*
|
||||
* 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<void*>* query(const geom::Envelope *searchEnv)=0;
|
||||
+ virtual void query(const geom::Envelope* searchEnv, std::vector<void*>&) = 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<std::size_t>& 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<CoordinateSequence*>& lineList);
|
||||
+ static void rawOffset(const LineString& geom, double dist, std::vector<CoordinateSequence*>& 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.
|
||||
*
|
||||
- * The method handles arguments of {@link Location#NONE} correctly
|
||||
+ * The method handles arguments of {@link Location} correctly
|
||||
*/
|
||||
static bool isResultOfOpPoint(const OverlayLabel* label, int opCode);
|
||||
|
||||
@@ -284,7 +284,7 @@ public:
|
||||
* computed during the overlay process should be
|
||||
* included in the result geometry.
|
||||
*
|
||||
- * The method handles arguments of {@link Location#NONE} correctly.
|
||||
+ * The method handles arguments of {@link Location} correctly.
|
||||
*/
|
||||
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<Coordinate>& polyShell, TriList<Tri>& triListResult);
|
||||
+
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
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 <geos/geom/Location.h>
|
||||
#include <geos/geom/Position.h>
|
||||
#include <string>
|
||||
+#include <cstdint>
|
||||
|
||||
// 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
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#include <iosfwd> // for operator<<
|
||||
#include <cassert>
|
||||
+#include <cstdint>
|
||||
|
||||
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 <array>
|
||||
#include <string>
|
||||
#include <cassert>
|
||||
+#include <cstdint>
|
||||
|
||||
#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 <string>
|
||||
#include <cctype>
|
||||
+#include <cstdint>
|
||||
|
||||
#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 @@
|
||||
#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.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 <geos/export.h>
|
||||
#include <string>
|
||||
+#include <cstdint>
|
||||
|
||||
// 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
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <geos/export.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
+#include <cstdint>
|
||||
|
||||
// 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 <geos/export.h>
|
||||
#include <string>
|
||||
+#include <cstdint>
|
||||
|
||||
// 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
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <cstdlib>
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
+#include <cstdint>
|
||||
|
||||
#include "capi_test_utils.h"
|
||||
|
||||
|
|
@ -4045,6 +4045,16 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
"other": {
|
||||
"name": "geos",
|
||||
"version": "3.11.1",
|
||||
"downloadUrl": "https://download.osgeo.org/geos/geos-3.11.1.tar.bz2"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче