From ef124c0c335670160f051107d04c41e8d4bf62f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Mon, 5 Dec 2022 05:50:31 -0600 Subject: [PATCH 1/7] geos: update to 3.11.1. --- common/shlibs | 4 ++-- srcpkgs/geos/patches/geos-arm.patch | 14 -------------- srcpkgs/geos/template | 15 +++++++-------- 3 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/geos/patches/geos-arm.patch diff --git a/common/shlibs b/common/shlibs index 965eef4df56f..f56364c39012 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3440,8 +3440,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.9.0.so geos-3.9.0_1 -libgeos_c.so.1 geos-3.9.0_1 +libgeos.so.3.11.1 geos-3.11.1_1 +libgeos_c.so.1 geos-3.11.1_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 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..615426ea1183 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 +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 c50891d4bb753ad804f700b899abaa1a3e2466dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Mon, 5 Dec 2022 06:07:36 -0600 Subject: [PATCH 2/7] libgdal: rebuild for geos-3.11.1. --- srcpkgs/libgdal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index efe7a2adcf50..d6a527322ec3 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,7 +1,7 @@ # Template file for 'libgdal' pkgname=libgdal version=3.5.3 -revision=3 +revision=4 build_style=cmake build_helper=python3 configure_args="-DGDAL_USE_OPENCL=ON From 02666aa29734187e7f2c7866cbe9a7a7062e261d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Mon, 5 Dec 2022 06:08:25 -0600 Subject: [PATCH 3/7] librttopo: rebuild for geos-3.11.1. --- srcpkgs/librttopo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/librttopo/template b/srcpkgs/librttopo/template index 60eb07d5eca7..270daebc48dc 100644 --- a/srcpkgs/librttopo/template +++ b/srcpkgs/librttopo/template @@ -1,7 +1,7 @@ # Template file for 'librttopo' pkgname=librttopo version=1.1.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="which autoconf automake libtool geos-devel" makedepends="geos-devel" From 97363020c4f4cb419627181c9c163128b79f7b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Mon, 5 Dec 2022 06:08:50 -0600 Subject: [PATCH 4/7] libspatialite: rebuild for geos-3.11.1. --- srcpkgs/libspatialite/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template index 54885e5e8b8c..ec03354fdfe7 100644 --- a/srcpkgs/libspatialite/template +++ b/srcpkgs/libspatialite/template @@ -1,7 +1,7 @@ # Template file for 'libspatialite' pkgname=libspatialite version=5.0.1 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config geos-devel" makedepends="sqlite-devel zlib-devel proj-devel freexl-devel From bbe37c0a23ae4e8798842d98442ca7db50535551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Mon, 5 Dec 2022 06:09:29 -0600 Subject: [PATCH 5/7] postgis-postgresql13: rebuild for geos-3.11.1. --- srcpkgs/postgis-postgresql13/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template index 6a6cedb505e7..b95707840357 100644 --- a/srcpkgs/postgis-postgresql13/template +++ b/srcpkgs/postgis-postgresql13/template @@ -1,7 +1,7 @@ # Template file for 'postgis-postgresql13' pkgname=postgis-postgresql13 version=3.2.1 -revision=2 +revision=3 build_style=gnu-configure configure_args=" --with-projdir=${XBPS_CROSS_BASE}/usr From aeaef0008ce40131b7d5920328b84d5f97b5837a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Mon, 5 Dec 2022 06:09:53 -0600 Subject: [PATCH 6/7] postgis-postgresql14: rebuild for geos-3.11.1. --- srcpkgs/postgis-postgresql14/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template index c1d68a3c9dee..5b07a5bd027d 100644 --- a/srcpkgs/postgis-postgresql14/template +++ b/srcpkgs/postgis-postgresql14/template @@ -1,7 +1,7 @@ # Template file for 'postgis-postgresql14' pkgname=postgis-postgresql14 version=3.2.1 -revision=3 +revision=4 build_style=gnu-configure configure_args=" --with-projdir=${XBPS_CROSS_BASE}/usr From f25179345beb75158bd2ba5f704000b0237c91d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Mon, 5 Dec 2022 06:15:49 -0600 Subject: [PATCH 7/7] 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