From bec7b96fc437c76518e879559bfd9f0293885a88 Mon Sep 17 00:00:00 2001 From: ArTourter Date: Mon, 4 Jul 2022 10:51:33 +0100 Subject: gis/geos: Updated for version 3.11.0. - disable build testing by default - add flag to build testing components and run make test - new project site URL - use download url from new site rather than github. Signed-off-by: ArTourter Signed-off-by: Andrew Clemons Signed-off-by: Willy Sudiarto Raharjo --- gis/geos/README | 4 ++++ gis/geos/geos.SlackBuild | 12 +++++++++--- gis/geos/geos.info | 8 ++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gis/geos/README b/gis/geos/README index b6cf0b40fa..857f61a8f5 100644 --- a/gis/geos/README +++ b/gis/geos/README @@ -3,3 +3,7 @@ Suite (JTS). As such, it aims to contain the complete functionality of JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial predicate functions and spatial operators, as well as specific JTS enhanced topology functions. + +By default, the script does not build nor run the tests. You can use the +option TESTBUILD=YES to build and run the tests before the make install +part. diff --git a/gis/geos/geos.SlackBuild b/gis/geos/geos.SlackBuild index ffc5bad363..02cf55b0f7 100644 --- a/gis/geos/geos.SlackBuild +++ b/gis/geos/geos.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=geos -VERSION=${VERSION:-3.10.3} +VERSION=${VERSION:-3.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -67,11 +67,15 @@ fi set -e +if [[ ${TESTBUILD:='NO'} == 'NO' ]]; then + TESTBUILDFLAGS='-DBUILD_TESTING=OFF' +fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -88,9 +92,11 @@ mkdir -p build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_MANDIR=/usr/man \ + $TESTBUILDFLAGS \ -DCMAKE_BUILD_TYPE=Release \ .. make + [[ $TESTBUILD == "YES" ]] && make test make install DESTDIR=$PKG ) @@ -99,7 +105,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING DEVELOPER-NOTES.md HOWTO_RELEASE NEWS README.md \ + AUTHORS CODE_OF_CONDUCT.md COPYING DEVELOPER-NOTES.md NEWS.md README.md release.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/gis/geos/geos.info b/gis/geos/geos.info index 54e2b85b22..3093640d76 100644 --- a/gis/geos/geos.info +++ b/gis/geos/geos.info @@ -1,8 +1,8 @@ PRGNAM="geos" -VERSION="3.10.3" -HOMEPAGE="https://trac.osgeo.org/geos/" -DOWNLOAD="https://github.com/libgeos/geos/archive/3.10.3/geos-3.10.3.tar.gz" -MD5SUM="301f073f51ad44d383c388db31914c07" +VERSION="3.11.0" +HOMEPAGE="https://libgeos.org/" +DOWNLOAD="https://download.osgeo.org/geos/geos-3.11.0.tar.bz2" +MD5SUM="3978c4e9eb880083ad69f5384d043c72" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -- cgit v1.2.3