From b9c052b893afe64e625226eac1464e722eba1d83 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 2 Dec 2021 09:07:53 +0100 Subject: [PATCH] libgeos: update to 3.10.1 --- packages/libgeos/build.sh | 5 ++--- packages/libgeos/src-inlines.cpp.patch | 11 ----------- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 packages/libgeos/src-inlines.cpp.patch diff --git a/packages/libgeos/build.sh b/packages/libgeos/build.sh index a42bcdcf0..169f9aa33 100644 --- a/packages/libgeos/build.sh +++ b/packages/libgeos/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://geos.osgeo.org/ TERMUX_PKG_DESCRIPTION="Geometry Engine, C++ port of the Java Topology Suite" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" -TERMUX_PKG_VERSION=3.9.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=3.10.1 TERMUX_PKG_SRCURL=https://github.com/libgeos/geos/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=e9e20e83572645ac2af0af523b40a404627ce74b3ec99727754391cdf5b23645 +TERMUX_PKG_SHA256=15180d727df60ea2e61ece6273feaa3b2a4554db0a447bf6923054df676c78c0 TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_BREAKS="libgeos-dev" TERMUX_PKG_REPLACES="libgeos-dev" diff --git a/packages/libgeos/src-inlines.cpp.patch b/packages/libgeos/src-inlines.cpp.patch deleted file mode 100644 index c4f2c283f..000000000 --- a/packages/libgeos/src-inlines.cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../inlines.cpp.orig 2019-12-07 11:13:58.242315736 +0000 -+++ ./src/inlines.cpp 2019-12-07 11:14:56.612224731 +0000 -@@ -33,7 +33,7 @@ - // If using cygwin then we suppress the "multiple definition" errors by - // ignoring this section completely; the cygwin linker seems to handle - // the stubs correctly at link time by itself --#if !defined(__CYGWIN__) -+#if !defined(__CYGWIN__) && !defined(__ANDROID__) - - // Undefine GEOS_INLINE so that .inl files - // will be ready for an implementation file