From patchwork Mon Nov 4 22:34:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 15965 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7A029176AE; Mon, 4 Nov 2019 22:36:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 323C71768F for ; Mon, 4 Nov 2019 22:36:26 +0000 (GMT) Received: from localhost ([::1]:39206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRkxV-0001wg-PQ for patchwork@mira.cbaines.net; Mon, 04 Nov 2019 17:36:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37612) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRkx9-0001lo-EJ for guix-patches@gnu.org; Mon, 04 Nov 2019 17:36:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRkx8-0007UY-Cb for guix-patches@gnu.org; Mon, 04 Nov 2019 17:36:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57102) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iRkx8-0007UK-8z for guix-patches@gnu.org; Mon, 04 Nov 2019 17:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iRkx8-0000tT-5e for guix-patches@gnu.org; Mon, 04 Nov 2019 17:36:02 -0500 Subject: bug#37619: [PATCH] gnu: Add libspatialindex. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 04 Nov 2019 22:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 37619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Wiktor =?utf-8?q?=C5=BBelazny?= Cc: 37619-done@debbugs.gnu.org Mail-Followup-To: 37619@debbugs.gnu.org, ludo@gnu.org, wz@freeshell.de Received: via spool by 37619-done@debbugs.gnu.org id=D37619.15729069033334 (code D ref 37619); Mon, 04 Nov 2019 22:36:01 +0000 Received: (at 37619-done) by debbugs.gnu.org; 4 Nov 2019 22:35:03 +0000 Received: from localhost ([127.0.0.1]:37689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRkwA-0000rh-Sa for submit@debbugs.gnu.org; Mon, 04 Nov 2019 17:35:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRkw8-0000r5-Sv for 37619-done@debbugs.gnu.org; Mon, 04 Nov 2019 17:35:01 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iRkvw-00061z-1C; Mon, 04 Nov 2019 17:34:48 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36252 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iRkvt-0002AH-6c; Mon, 04 Nov 2019 17:34:46 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20191004132516.16761-1-wz@freeshell.de> Date: Mon, 04 Nov 2019 23:34:43 +0100 In-Reply-To: <20191004132516.16761-1-wz@freeshell.de> ("Wiktor \=\?utf-8\?Q\?\=C5\=BBelazny\=22's\?\= message of "Fri, 4 Oct 2019 15:25:16 +0200") Message-ID: <87h83j46f0.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Wiktor, Wiktor Żelazny skribis: > From: Wiktor Żelazny > > * gnu/packages/geo.scm (libspatialindex): new variable. Applied with the minor changes below: no fancy regexp matching to build up the URL :-), and slight reindentation. Thanks! Ludo’. diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 37549cab3f..e49e0b6db6 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -67,8 +67,7 @@ #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages wxwidgets) - #:use-module (gnu packages xml) - #:use-module (ice-9 regex)) + #:use-module (gnu packages xml)) (define-public geos (package @@ -1007,13 +1006,10 @@ volunteers.") (source (origin (method url-fetch) - (uri (string-append - "https://download.osgeo.org/" name "/" - (regexp-substitute #f (string-match "^lib" name) 'pre "" 'post) - "-src-" version ".tar.gz")) + (uri (string-append "https://download.osgeo.org/libspatialindex/" + "spatialindex-src-" version ".tar.gz")) (sha256 (base32 - ; checked .md5 "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw")))) (build-system gnu-build-system) (home-page "https://libspatialindex.org")