From 31aa6a70a13e47a08f9d0c74e4ea7400306c2e20 Mon Sep 17 00:00:00 2001 From: Nyx70 Date: Mon, 1 Feb 2021 10:00:21 +0100 Subject: [PATCH] geos: update to 3.9.0. --- common/shlibs | 4 ++-- srcpkgs/geos/patches/geos-arm.patch | 14 ++++++++++++++ srcpkgs/geos/template | 6 +++--- 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/geos/patches/geos-arm.patch diff --git a/common/shlibs b/common/shlibs index dd8a7019ee3..a82bac09eb2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3451,8 +3451,8 @@ libmedC.so.11 libmed-4.0.0_1 libmed.so.11 libmed-4.0.0_1 libeog.so eog-3.28.0_4 libfreexl.so.1 freexl-1.0.5_1 -libgeos-3.7.0.so geos-3.7.0_1 -libgeos_c.so.1 geos-3.6.2_1 +libgeos-3.9.0.so geos-3.9.0_1 +libgeos_c.so.1 geos-3.9.0_1 libpapi.so.5 papi-5.6.0_1 libpfm.so.4 papi-5.6.0_1 libfifechan.so.0.1.5 fifechan-0.1.5_1 diff --git a/srcpkgs/geos/patches/geos-arm.patch b/srcpkgs/geos/patches/geos-arm.patch new file mode 100644 index 00000000000..5b6a7c6c7da --- /dev/null +++ b/srcpkgs/geos/patches/geos-arm.patch @@ -0,0 +1,14 @@ +see http://trac.osgeo.org/geos/ticket/222 + +--- src/inlines.cpp 2020-12-09 18:17:36.000000000 +0100 ++++ src/inlines.cpp 2021-02-02 09:57:11.270098998 +0100 +@@ -62,7 +62,9 @@ + #include + #include + #include ++#if ! defined(__ARM_EABI__) + #include ++#endif // !defined __ARM_EABI__ + #include + + #endif // defined __CYGWIN__ diff --git a/srcpkgs/geos/template b/srcpkgs/geos/template index 049af66d27a..4926620832e 100644 --- a/srcpkgs/geos/template +++ b/srcpkgs/geos/template @@ -1,14 +1,14 @@ # Template file for 'geos' pkgname=geos -version=3.7.1 +version=3.9.0 revision=1 build_style=gnu-configure short_desc="C++ port of the Java Topology Suite (JTS)" -maintainer="Giuseppe Fierro " +maintainer="Nyx70 " license="LGPL-2.1-or-later" homepage="https://trac.osgeo.org/geos" distfiles="https://download.osgeo.org/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=0006c7b49eaed016b9c5c6f872417a7d7dc022e069ddd683335793d905a8228c +checksum=bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269 geos-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}"