Subject: Re: [bug#37619] [PATCH] gnu: Add libspatialindex.
From: Ludovic Courtès <[email-masked]>
To: Wiktor Żelazny <[email-masked]>
Cc: [email-masked]
Date: Mon, 04 Nov 2019 23:34:43 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi Wiktor,

Wiktor Żelazny <[email-masked]> skribis:

> From: Wiktor Żelazny <[email-masked]>
>
> * 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 <uri>.md5
          "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw"))))
     (build-system gnu-build-system)
     (home-page "https://libspatialindex.org")