From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:37612)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) 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 <Debian-debbugs@debbugs.gnu.org>) 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 <Debian-debbugs@debbugs.gnu.org>)
 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 <Debian-debbugs@debbugs.gnu.org>) 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-To: guix-patches@gnu.org
Resent-Message-ID: <handler.37619.D37619.15729069033334.done@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
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>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Wiktor =?UTF-8?Q?=C5=BBelazny?= <wz@freeshell.de>
Cc: 37619-done@debbugs.gnu.org

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Hi Wiktor,

Wiktor =C5=BBelazny <wz@freeshell.de> skribis:

> From: Wiktor =C5=BBelazny <wzelazny@vurv.cz>
>
> * 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=E2=80=99.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

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 <uri>.md5
          "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw"))))
     (build-system gnu-build-system)
     (home-page "https://libspatialindex.org")

--=-=-=--