diff mbox series

bug#37619: [PATCH] gnu: Add libspatialindex.

Message ID 87h83j46f0.fsf@gnu.org
State Accepted
Headers show
Series bug#37619: [PATCH] gnu: Add libspatialindex. | expand

Commit Message

Ludovic Courtès Nov. 4, 2019, 10:34 p.m. UTC 
Hi Wiktor,

Wiktor Żelazny <wz@freeshell.de> skribis:

> From: Wiktor Żelazny <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’.

Comments

Wiktor Żelazny Nov. 9, 2019, 11:39 a.m. UTC | #1 
On Mon, Nov 04, 2019 at 11:34:43PM +0100, Ludovic Courtès wrote:

> Applied with the minor changes below:

Thanks. This opens the way to QGIS, which I’ve been struggling with.

> no fancy regexp matching to build up the URL :-),

LOL!

> and slight reindentation.

What’s the indentation rule? I notice that you’re mixing double and
single spaces. Is that intentional?

Also, you removed the md5 comment. I thought it would be nice to put it
there as a reminder for whoever is updating the definition for a new
version of this library to make a new md5 check (Guix Manual insists
that these should be done).

WŻ
diff mbox series

Patch

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")