From 513b0be6bdcfda86566580d0aff69d03a080b13c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Tue, 6 Dec 2022 02:33:34 -0600 Subject: [PATCH 1/2] geos: update to 3.11.1. --- common/shlibs | 1 - srcpkgs/geos/patches/geos-arm.patch | 14 -------------- srcpkgs/geos/template | 17 ++++++++--------- 3 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/geos/patches/geos-arm.patch diff --git a/common/shlibs b/common/shlibs index 965eef4df56f..7c31cba400c2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3440,7 +3440,6 @@ 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.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 diff --git a/srcpkgs/geos/patches/geos-arm.patch b/srcpkgs/geos/patches/geos-arm.patch deleted file mode 100644 index c4c0e6cec02a..000000000000 --- a/srcpkgs/geos/patches/geos-arm.patch +++ /dev/null @@ -1,14 +0,0 @@ -see http://trac.osgeo.org/geos/ticket/222 - ---- a/src/inlines.cpp 2020-12-09 18:17:36.000000000 +0100 -+++ b/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 efc698ab3dc8..b99a05a13843 100644 --- a/srcpkgs/geos/template +++ b/srcpkgs/geos/template @@ -1,14 +1,14 @@ # Template file for 'geos' pkgname=geos -version=3.9.1 -revision=2 -build_style=gnu-configure +version=3.11.1 +revision=1 +build_style=cmake short_desc="C++ port of the Java Topology Suite (JTS)" 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=7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a +homepage="https://libgeos.org/" +distfiles="https://download.osgeo.org/geos/geos-${version}.tar.bz2" +checksum=6d0eb3cfa9f92d947731cc75f1750356b3bdfc07ea020553daf6af1c768e0be2 geos-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" @@ -17,8 +17,7 @@ geos-devel_package() { vmove usr/bin/geos-config vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/libgeos.so - vmove usr/lib/libgeos_c.so - vmove "usr/lib/*.a" + vmove usr/lib/cmake + vmove "usr/lib/*.so" } } From 1b1c0bb69d011008ae83e3cf5c12fccc86fa7694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Tue, 6 Dec 2022 02:34:25 -0600 Subject: [PATCH 2/2] python3-shapely: update to 1.8.5.post1. --- srcpkgs/python3-shapely/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template index 20a3f0d03597..d9dabb1e066f 100644 --- a/srcpkgs/python3-shapely/template +++ b/srcpkgs/python3-shapely/template @@ -1,7 +1,7 @@ # Template file for 'python3-shapely' pkgname=python3-shapely -version=1.8.4 -revision=2 +version=1.8.5.post1 +revision=1 build_style=python3-module build_helper=numpy make_check_target=tests @@ -14,7 +14,7 @@ maintainer="Karl Nilsson " license="BSD-3-Clause" homepage="https://github.com/shapely/shapely" distfiles="https://github.com/shapely/shapely/archive/${version}.tar.gz" -checksum=e27c49ab0019b9e47bf4f35545b2868af34731e22be755f56f22b5278d3e4efd +checksum=51badb76fa13ce1d4d6e5b2cbfef2b6af0ddae56a4449b84c3f3e6f404c6b43c pre_configure() { if [ "$CROSS_BUILD" ]; then