Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ca3028cb822841bfe970bb29d39655b75fe4841
commit 6ca3028cb822841bfe970bb29d39655b75fe4841 Author: crazy <[email protected]> Date: Sat Jan 7 22:57:47 2017 +0100 geos-3.6.1-1-x86_64 * Version bump diff --git a/source/lib-extra/geos/FrugalBuild b/source/lib-extra/geos/FrugalBuild index 4ba365e..7252476 100644 --- a/source/lib-extra/geos/FrugalBuild +++ b/source/lib-extra/geos/FrugalBuild @@ -2,29 +2,17 @@ # Maintainer: Janos Kovacs <[email protected]> pkgname=geos -pkgver=3.5.0 -pkgrel=2 +pkgver=3.6.1 +pkgrel=1 pkgdesc="GEOS (Geometry Engine, Open Source) topology library" url="http://geos.refractions.net"; license="LGPL" depends=('libstdc++>=6.2.1-5') -archs=('i686' 'x86_64') +archs=('x86_64') groups=('lib-extra') -up2date="lynx -dump ${url}/ |grep ${pkgname}-[0-9\.]*\.tar.bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - geos-3.5.0-autoconf-detect-isnan.patch geos-3.5.0-std-isnan.patch) -sha1sums=('142be1db41cb7c62afb9f6d3304769a39dd0b5ac' \ - '4dab482a455f66d53a9c8d934d96e8dbd86eac2a' \ - '0d138f9e218495862b322bac9c14c1b78fb790e2') +up2date="Flasttar $url" +source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('2eadda190aa625d2923137691ffec218687ed3b0') -build() { - - Fcd - Fpatchall - Fautoreconf - Fmake - Fmakeinstall -} - # optimization OK diff --git a/source/lib-extra/geos/geos-3.5.0-autoconf-detect-isnan.patch b/source/lib-extra/geos/geos-3.5.0-autoconf-detect-isnan.patch deleted file mode 100644 index 79e319d..0000000 --- a/source/lib-extra/geos/geos-3.5.0-autoconf-detect-isnan.patch +++ /dev/null @@ -1,25 +0,0 @@ -From edbeee650287a4a36837e090eafed90a760bad83 Mon Sep 17 00:00:00 2001 -From: Sandro Santilli <[email protected]> -Date: Mon, 7 Mar 2016 10:21:33 +0000 -Subject: [PATCH] Look for isnan in std:: namespace - -Tested with gcc 4.8.4 - -git-svn-id: http://svn.osgeo.org/geos/trunk@4169 5242fede-7e19-0410-aef8-94bd7d2200fb ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7fdc579..8976a6a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -197,7 +197,7 @@ dnl of isnan(). - AC_LANG_PUSH([C++]) - AC_CACHE_CHECK([for isnan], ac_cv_isnan, - [AC_TRY_LINK([#include <cmath>], -- [double x; int y; y = isnan(x);], -+ [double x; int y; y = std::isnan(x);], - ac_cv_isnan=yes, - ac_cv_isnan=no - )]) diff --git a/source/lib-extra/geos/geos-3.5.0-std-isnan.patch b/source/lib-extra/geos/geos-3.5.0-std-isnan.patch deleted file mode 100644 index c2b6a99..0000000 --- a/source/lib-extra/geos/geos-3.5.0-std-isnan.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a9bb3ed34e71f5f9d1d1b0bc3044555a0b3b932c Mon Sep 17 00:00:00 2001 -From: Sandro Santilli <[email protected]> -Date: Thu, 14 Jul 2016 10:38:35 +0000 -Subject: [PATCH] Fully qualify isnan call when HAVE_ISNAN is defined - -Fixes build with GCC-5.3.0 and higher. -Closes #784 - -git-svn-id: http://svn.osgeo.org/geos/trunk@4224 5242fede-7e19-0410-aef8-94bd7d2200fb ---- - include/geos/platform.h.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in -index d8d4558..c3bc9c8 100644 ---- a/include/geos/platform.h.in -+++ b/include/geos/platform.h.in -@@ -86,7 +86,7 @@ extern "C" - #endif - - #if defined(HAVE_ISNAN) --# define ISNAN(x) (isnan(x)) -+# define ISNAN(x) (std::isnan(x)) - #else - # if defined(_MSC_VER) - # define ISNAN(x) _isnan(x) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
