Re: [PATCH] gnu: add proj4.

["Björn Höfling" <bjoern.hoefling@bjoernhoefling.de>]

On Mon, 16 Jan 2017 00:21:28 +0100
Danny Milosavljevic <dannym@scratchpost.org> wrote:

> Hi,
> 
> > * gnu/packages/geo.scm:139:13: proj4-4.9.3: invalid license field
> > 
> > But the documentation explicitly speaks about list values. What's
> > wrong?  
> 
> You quoted the list. That means that all the symbols in it stay
> symbols and are not resolved. Instead of substituting the actual
> license license:asl2.0, it will literally put 'license:asl2.0 into
> the list.
> 
> I'd just use something like (list license:a license:b) .

It's a list of records, not of symbols, of cause! Thanks.

> 
> It would also be possible to use quasiquote but I'd not do that in
> this case. It's too obtuse. `(,license:a ,license:b)
> 
> > * /home/bjoern/guix/gnu/packages/geo.scm:100:2: proj4-4.9.3: line
> > 125 is way too long (102 characters)  
> 
> It's an URL in a comment - I'd be fine with it as-is and I wouldn't
> break it anywhere.
> 
> > About the package name: The official name is "proj.4", so I left it
> > as that.  
> 
> Seems reasonable.
> 
> > As variable name, I chose "proj4". Is that correct?  
> 
> Why not use the variable name "proj.4" too then? *scratches head*


Because my Scheme-time is far too long ago, and I'm used to languages
where "dot" in variable names is bad.

Here is the new patch with the two corrections.

Björn




* gnu/packages/geo.scm (proj4): New variable.
---
 gnu/packages/geo.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 86828e717..0e63fe8c7 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2017 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,8 +20,9 @@
 
 (define-module (gnu packages geo)
   #:use-module (guix build-system glib-or-gtk)
+  #:use-module (guix build-system gnu)
   #:use-module (guix download)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (gnu packages glib)
@@ -92,4 +94,56 @@
 the OpenStreetMap project.  It can provide directions for walking, bicycling,
 and driving.")
     (home-page "https://wiki.gnome.org/Apps/Maps")
-    (license gpl2+)))
+    (license license:gpl2+)))
+
+(define-public proj.4
+  (package
+    (name "proj.4")
+    (version "4.9.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://download.osgeo.org/proj/proj-"
+                                  version
+                                  ".tar.gz"))
+              (sha256
+               (base32
+                "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139"))))
+    (build-system gnu-build-system)
+    (arguments `(#:phases
+                 (modify-phases %standard-phases
+                   (add-after
+                       'unpack 'patch-test-shebangs
+                     (lambda _
+                       (substitute* '("nad/test27"
+                                      "nad/test83"
+                                      "nad/testvarious"
+                                      "nad/testdatumfile"
+                                      "nad/testflaky"
+                                      "nad/testIGNF")
+                         (("/bin/rm") (which "rm")))))
+                   ;; Precision problems on i686 and other platforms. See:
+                   ;; https://web.archive.org/web/20151006134301/http://trac.osgeo.org/proj/ticket/255
+                   ;; Disable failing test.
+                   (add-after
+                       'patch-test-shebangs 'ignore-failing-tests
+                     (lambda _
+                       (substitute* '("nad/Makefile.in")
+                         (("\tPROJ_LIB.*" all) (string-append  "#" all))))))))
+    (inputs
+     `(("glib" ,glib)))
+    (home-page "http://proj4.org/")
+    (synopsis "Cartographic Projections Library")
+    (description
+     "Proj.4 is a library for converting coordinates between cartographic projections.
+")
+    (license (list license:expat
+               ;; config.guess, config.sub
+               license:gpl3+
+               ;; libtool
+               license:gpl2+
+               ;; src/PJ_patterson.c
+               license:asl2.0
+               ;; src/geodesic.c/h
+               license:x11
+               ;; cmake/*
+               license:boost1.0))))
-- 
2.11.0