[gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/files/, sci-libs/geos/
commit: 2f7dad5c2882013ab855c0c65db529904dd4c0c7 Author: Sam James gentoo org> AuthorDate: Fri Mar 17 03:19:01 2023 + Commit: Sam James gentoo org> CommitDate: Fri Mar 17 03:19:01 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7dad5c sci-libs/geos: add 3.11.2 Signed-off-by: Sam James gentoo.org> sci-libs/geos/Manifest | 1 + sci-libs/geos/files/geos-3.11.2-gcc-13.patch | 38 + sci-libs/geos/geos-3.11.2.ebuild | 50 3 files changed, 89 insertions(+) diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index e090e325a34b..42022eecc40f 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,2 +1,3 @@ DIST geos-3.11.0.tar.bz2 6727294 BLAKE2B 7d2cb7ae2dc6c5eb13836c16c8164402c1e964f98df95d5aaf9f6fd957ebcdbdefb43ae4fb17a5a671b6dfdb812bdacfdbfdfdea6e5bd44f135e3701a3cc914d SHA512 40c7553bbb93673c231ddd0131b73bf43b3f50524bc5bd9e6934c068d2c09632f388b7429254ae15d9641da2d15e3a626b430438854e98d9e7419ad04e535189 DIST geos-3.11.1.tar.bz2 6753232 BLAKE2B 376050ca3224e5220f69d82ff62d79ff7ea3d35d5fe90b7ab4e0cabcb4200b47d7569110538c201df9cb28da784f09f8207a9a8233ee002ab2ec87f5cf336ba1 SHA512 708500aba9b04208ee46a531d55ddf63a213dfaa2922dae937b524300b2b46c95143ed6cd3ff1414e9099f2be95e5df5a2e0b49df43acf93a9478215259f20d3 +DIST geos-3.11.2.tar.bz2 6774288 BLAKE2B 62ddcaf5b6716983d49a6931c97ebe8d4c457ce7d127531ff3ff98e9dfc2f1ebd211d1fe7afe183a3858913b4c22ec4674f68fb28ee8c43c9e9ce61abd3b SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec diff --git a/sci-libs/geos/files/geos-3.11.2-gcc-13.patch b/sci-libs/geos/files/geos-3.11.2-gcc-13.patch new file mode 100644 index ..fa46cf8bf4d2 --- /dev/null +++ b/sci-libs/geos/files/geos-3.11.2-gcc-13.patch @@ -0,0 +1,38 @@ +https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1 + +From bea3188be44075034fd349f5bb117c943bdb7fb1 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Mon, 23 Jan 2023 15:56:11 +0100 +Subject: [PATCH] Fix build with gcc 13 by including (#805) + +In addition to [1]. Otherwise geos fails to build with: +"geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:40:28: error: expected ')' before 'p_level' + 40 | HilbertEncoder(uint32_t p_level, geom::Envelope& extent); + | ~^~~~ + |) +/var/tmp/paludis/build/sci-libs-geos-3.11.1/work/geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:41:5: error: 'uint32_t' does not name a type + 41 | uint32_t encode(const geom::Envelope* env); + | ^~~~" + +[1] 0e8d4368b8bd72a7d361286e8523ebce5cff6146 +--- a/include/geos/shape/fractal/HilbertEncoder.h b/include/geos/shape/fractal/HilbertEncoder.h +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + // Forward declarations + namespace geos { +--- a/tests/unit/capi/GEOSMakeValidTest.cpp b/tests/unit/capi/GEOSMakeValidTest.cpp +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + #include "capi_test_utils.h" + + diff --git a/sci-libs/geos/geos-3.11.2.ebuild b/sci-libs/geos/geos-3.11.2.ebuild new file mode 100644 index ..9aa1b4eecd40 --- /dev/null +++ b/sci-libs/geos/geos-3.11.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Geometry engine library for Geographic Information Systems" +HOMEPAGE="https://libgeos.org/"; +SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"; + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND="doc? ( app-doc/doxygen )" + +PATCHES=( + "${FILESDIR}"/${P}-gcc-13.patch +) + +src_configure() { + local mycmakeargs=( + -DBUILD_DOCUMENTATION=$(usex doc) + -DBUILD_TESTING=$(usex test) + -DUSE_CCACHE=OFF + + # bug #709368 + $(usev arm '-DDISABLE_GEOS_INLINE=ON') + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + use doc && cmake_src_compile docs +} + +src_install() { + cmake_src_install + + if use doc ; then + HTML_DOCS=( "${BUILD_DIR}"/doxygen/doxygen_docs/html/. ) + einstalldocs + fi +}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/files/, sci-libs/geos/
commit: 4b2cb7b09bd5568a3a55aa3e0cff4dad63aa4ec0 Author: Sam James gentoo org> AuthorDate: Thu Jan 26 07:25:53 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jan 26 07:55:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b2cb7b0 sci-libs/geos: fix build w/ gcc 13 Signed-off-by: Sam James gentoo.org> sci-libs/geos/files/geos-3.11.1-gcc-13.patch | 111 +++ sci-libs/geos/geos-3.11.1.ebuild | 6 +- 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/sci-libs/geos/files/geos-3.11.1-gcc-13.patch b/sci-libs/geos/files/geos-3.11.1-gcc-13.patch new file mode 100644 index ..45054e860082 --- /dev/null +++ b/sci-libs/geos/files/geos-3.11.1-gcc-13.patch @@ -0,0 +1,111 @@ +https://github.com/libgeos/geos/commit/0e8d4368b8bd72a7d361286e8523ebce5cff6146 +https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1 + +From 0e8d4368b8bd72a7d361286e8523ebce5cff6146 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Tue, 29 Nov 2022 23:10:22 + +Subject: [PATCH] Add missing includes for gcc-13 (#743) + +Without the change build on `gcc-13` fails as: + +geos/include/geos/geomgraph/TopologyLocation.h:143:52: error: 'uint32_t' has not been declared + 143 | bool isEqualOnSide(const TopologyLocation& le, uint32_t locIndex) const + |^~~~ +--- a/include/geos/geomgraph/Depth.h b/include/geos/geomgraph/Depth.h +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + // Forward declarations + namespace geos { +--- a/include/geos/geomgraph/TopologyLocation.h b/include/geos/geomgraph/TopologyLocation.h +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #ifdef _MSC_VER + #pragma warning(push) +--- a/include/geos/io/WKTWriter.h b/include/geos/io/WKTWriter.h +@@ -24,6 +24,7 @@ + + #include + #include ++#include + + #ifdef _MSC_VER + #pragma warning(push) +--- a/include/geos/operation/overlayng/OverlayLabel.h b/include/geos/operation/overlayng/OverlayLabel.h +@@ -14,6 +14,8 @@ + + #pragma once + ++#include ++ + #include + #include + #include +--- a/include/geos/shape/fractal/HilbertCode.h b/include/geos/shape/fractal/HilbertCode.h +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + // Forward declarations + namespace geos { +--- a/include/geos/shape/fractal/MortonCode.h b/include/geos/shape/fractal/MortonCode.h +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + // Forward declarations + namespace geos { + +From bea3188be44075034fd349f5bb117c943bdb7fb1 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Mon, 23 Jan 2023 15:56:11 +0100 +Subject: [PATCH] Fix build with gcc 13 by including (#805) + +In addition to [1]. Otherwise geos fails to build with: +"geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:40:28: error: expected ')' before 'p_level' + 40 | HilbertEncoder(uint32_t p_level, geom::Envelope& extent); + | ~^~~~ + |) +/var/tmp/paludis/build/sci-libs-geos-3.11.1/work/geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:41:5: error: 'uint32_t' does not name a type + 41 | uint32_t encode(const geom::Envelope* env); + | ^~~~" + +[1] 0e8d4368b8bd72a7d361286e8523ebce5cff6146 +--- a/include/geos/shape/fractal/HilbertEncoder.h b/include/geos/shape/fractal/HilbertEncoder.h +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + // Forward declarations + namespace geos { +--- a/tests/unit/capi/GEOSMakeValidTest.cpp b/tests/unit/capi/GEOSMakeValidTest.cpp +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + #include "capi_test_utils.h" + + diff --git a/sci-libs/geos/geos-3.11.1.ebuild b/sci-libs/geos/geos-3.11.1.ebuild index dd84d4906b89..b560a1fb3e08 100644 --- a/sci-libs/geos/geos-3.11.1.ebuild +++ b/sci-libs/geos/geos-3.11.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,6 +17,10 @@ RESTRICT="!test? ( test )" BDEPEND="doc? ( app-doc/doxygen )" +PATCHES=( + "${FILESDIR}"/${P}-gcc-13.patch +) + src_configure() { local mycmakeargs=( -DBUILD_DOCUMENTATION=$(usex doc)
[gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/files/, sci-libs/geos/
commit: f714c19448624808fdb8c3f81b598be86d980479 Author: David Seifert gentoo org> AuthorDate: Sat Sep 17 13:46:29 2016 + Commit: David Seifert gentoo org> CommitDate: Sat Sep 17 14:11:35 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f714c194 sci-libs/geos: Allow for compiling with GCC 6 Gentoo-bug: 593934 * Patches taken from Upstream trunk Package-Manager: portage-2.3.0 .../files/geos-3.5.0-autoconf-detect-isnan.patch | 25 + sci-libs/geos/files/geos-3.5.0-std-isnan.patch | 26 ++ sci-libs/geos/geos-3.5.0-r2.ebuild | 2 ++ 3 files changed, 53 insertions(+) diff --git a/sci-libs/geos/files/geos-3.5.0-autoconf-detect-isnan.patch b/sci-libs/geos/files/geos-3.5.0-autoconf-detect-isnan.patch new file mode 100644 index ..79e319d --- /dev/null +++ b/sci-libs/geos/files/geos-3.5.0-autoconf-detect-isnan.patch @@ -0,0 +1,25 @@ +From edbeee650287a4a36837e090eafed90a760bad83 Mon Sep 17 00:00:00 2001 +From: Sandro Santilli +Date: Mon, 7 Mar 2016 10:21:33 + +Subject: [PATCH] Look for isnan in std:: namespace + +Tested with gcc 4.8.4 + +git-svn-id: http://svn.osgeo.org/geos/trunk@4169 5242fede-7e19-0410-aef8-94bd7d2200fb +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7fdc579..8976a6a 100644 +--- a/configure.ac b/configure.ac +@@ -197,7 +197,7 @@ dnl of isnan(). + AC_LANG_PUSH([C++]) + AC_CACHE_CHECK([for isnan], ac_cv_isnan, + [AC_TRY_LINK([#include ], +- [double x; int y; y = isnan(x);], ++ [double x; int y; y = std::isnan(x);], + ac_cv_isnan=yes, + ac_cv_isnan=no + )]) diff --git a/sci-libs/geos/files/geos-3.5.0-std-isnan.patch b/sci-libs/geos/files/geos-3.5.0-std-isnan.patch new file mode 100644 index ..c2b6a99 --- /dev/null +++ b/sci-libs/geos/files/geos-3.5.0-std-isnan.patch @@ -0,0 +1,26 @@ +From a9bb3ed34e71f5f9d1d1b0bc3044555a0b3b932c Mon Sep 17 00:00:00 2001 +From: Sandro Santilli +Date: Thu, 14 Jul 2016 10:38:35 + +Subject: [PATCH] Fully qualify isnan call when HAVE_ISNAN is defined + +Fixes build with GCC-5.3.0 and higher. +Closes #784 + +git-svn-id: http://svn.osgeo.org/geos/trunk@4224 5242fede-7e19-0410-aef8-94bd7d2200fb +--- + include/geos/platform.h.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in +index d8d4558..c3bc9c8 100644 +--- a/include/geos/platform.h.in b/include/geos/platform.h.in +@@ -86,7 +86,7 @@ extern "C" + #endif + + #if defined(HAVE_ISNAN) +-# define ISNAN(x) (isnan(x)) ++# define ISNAN(x) (std::isnan(x)) + #else + # if defined(_MSC_VER) + # define ISNAN(x) _isnan(x) diff --git a/sci-libs/geos/geos-3.5.0-r2.ebuild b/sci-libs/geos/geos-3.5.0-r2.ebuild index e7d6e01..79b1c94 100644 --- a/sci-libs/geos/geos-3.5.0-r2.ebuild +++ b/sci-libs/geos/geos-3.5.0-r2.ebuild @@ -37,6 +37,8 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/3.4.2-solaris-isnan.patch + "${FILESDIR}"/${PN}-3.5.0-std-isnan.patch + "${FILESDIR}"/${PN}-3.5.0-autoconf-detect-isnan.patch "${FILESDIR}"/${P}-phpconfig-path.patch )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/files/
commit: a5ddd09f034237fe05f99b03297c4ce05c15f7fb Author: Sam Jorna gentoo org> AuthorDate: Wed Mar 23 05:43:25 2016 + Commit: Sam Jorna gentoo org> CommitDate: Wed Mar 23 05:43:42 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ddd09f sci-libs/geos: remove unneeded patches Package-Manager: portage-2.2.28 sci-libs/geos/files/3.2.0-darwin.patch| 13 - sci-libs/geos/files/3.2.0-python.patch| 40 --- sci-libs/geos/files/3.3.2-solaris-isnan.patch | 13 - sci-libs/geos/files/3.4.1-solaris-isnan.patch | 14 -- sci-libs/geos/files/3.4.2-ruby_so_name.patch | 12 5 files changed, 92 deletions(-) diff --git a/sci-libs/geos/files/3.2.0-darwin.patch b/sci-libs/geos/files/3.2.0-darwin.patch deleted file mode 100644 index 2701b59..000 --- a/sci-libs/geos/files/3.2.0-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -Also check for dylib before giving up, bug #335811 - macros/ac_python_devel.m4 -+++ macros/ac_python_devel.m4 -@@ -42,7 +42,7 @@ - # Check for Python library path - AC_MSG_CHECKING([for Python library path]) - python_path=`python$PYTHON_VERSION -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("LIBDIR"))'` --if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so ; then -+if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so && test ! -f "${python_path}"/libpython$PYTHON_VERSION.dylib ; then - python_path="" - fi - AC_MSG_RESULT([$python_path]) diff --git a/sci-libs/geos/files/3.2.0-python.patch b/sci-libs/geos/files/3.2.0-python.patch deleted file mode 100644 index b4a85c0..000 --- a/sci-libs/geos/files/3.2.0-python.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/macros/ac_python_devel.m4 b/macros/ac_python_devel.m4 -index d67842b..f3a3a3b 100644 a/macros/ac_python_devel.m4 -+++ b/macros/ac_python_devel.m4 -@@ -29,13 +29,10 @@ AC_DEFUN([AC_PYTHON_DEVEL],[ - - # Check for Python include path - AC_MSG_CHECKING([for Python include path]) --for i in "$base_python_path/include/python$PYTHON_VERSION/" "$base_python_path/include/python/" "$base_python_path/include/" "$base_python_path/" ; do --python_path=`find $i -type f -name Python.h -print 2> /dev/null | sed "1q"` --if test -n "$python_path" ; then --break --fi --done --python_path=`echo $python_path | sed "s,/Python.h$,,"` -+python_path="${base_python_path}/include/python$PYTHON_VERSION/" -+if test ! -f "${python_path}"/Python.h ; then -+python_path="" -+fi - AC_MSG_RESULT([$python_path]) - if test -z "$python_path" ; then - AC_MSG_ERROR([cannot find Python include path]) -@@ -44,13 +41,10 @@ AC_DEFUN([AC_PYTHON_DEVEL],[ - - # Check for Python library path - AC_MSG_CHECKING([for Python library path]) --for i in "$base_python_path/lib/python$PYTHON_VERSION/config/" "$base_python_path/lib/python$PYTHON_VERSION/" "$base_python_path/lib/python/config/" "$base_python_path/lib/python/" "$base_python_path/" "$base_python_path/libs/" ; do --python_path=`find $i -name libpython$PYTHON_VERSION.* -print 2> /dev/null | sed "1q"` --if test -n "$python_path" ; then --break --fi --done --python_path=`echo $python_path | sed "s,/libpython.*$,,"` -+python_path=`python$PYTHON_VERSION -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("LIBDIR"))'` -+if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so ; then -+python_path="" -+fi - AC_MSG_RESULT([$python_path]) - if test -z "$python_path" ; then - AC_MSG_ERROR([cannot find Python library path]) diff --git a/sci-libs/geos/files/3.3.2-solaris-isnan.patch b/sci-libs/geos/files/3.3.2-solaris-isnan.patch deleted file mode 100644 index 04dc131..000 --- a/sci-libs/geos/files/3.3.2-solaris-isnan.patch +++ /dev/null @@ -1,13 +0,0 @@ include/geos/platform.h.in -+++ include/geos/platform.h.in -@@ -97,8 +97,9 @@ -// It does leave a version in std. - # define ISNAN(x) (std::isnan(x)) - # elif defined(__sun) || defined(__sun__) -+# define _XOPEN_SOURCE 600 // force iso/math_c99 - # include --# define ISNAN(x) (::isnan(x)) -+# define ISNAN(x) (std::isnan(x)) - # endif - #endif - diff --git a/sci-libs/geos/files/3.4.1-solaris-isnan.patch b/sci-libs/geos/files/3.4.1-solaris-isnan.patch deleted file mode 100644 index f4cb2ae..000 --- a/sci-libs/geos/files/3.4.1-solaris-isnan.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naruw geos-3.4.1.orig/include/geos/platform.h.in geos-3.4.1/include/geos/platform.h.in geos-3.4.1.orig/include/geos/platform.h.in 2013-08-17 14:08:04.