From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH] gnu: add proj4. Date: Tue, 17 Jan 2017 14:42:45 +0100 Message-ID: <878tq9950q.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170115232147.2ee240cc@alma-ubu> <20170115232402.17585716@alma-ubu> <20170116002121.1aec454e@scratchpost.org> <20170116210512.6e519268@alma-ubu> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTU2F-00082c-SO for guix-devel@gnu.org; Tue, 17 Jan 2017 08:42:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTU2C-0006i2-NR for guix-devel@gnu.org; Tue, 17 Jan 2017 08:42:51 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:35014) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cTU2C-0006hg-Fd for guix-devel@gnu.org; Tue, 17 Jan 2017 08:42:48 -0500 In-Reply-To: <20170116210512.6e519268@alma-ubu> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: =?utf-8?Q?Bj=C3=B6rn_H=C3=B6fling?= , guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Bj=C3=B6rn H=C3=B6fling writes: > Hi list, > > this im my first patch to Guix, so please tell me what you think. Hello Bj=C3=B6rn! Welcome to the list! Pretty impressive for a first patch :-) I've committed it with a few cosmetic improvements, described below. > * 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 =C2=A9 2016 Leo Famulari > ;;; Copyright =C2=A9 2016 Alex Griffin > +;;; Copyright =C2=A9 2017 Bj=C3=B6rn H=C3=B6fling > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -19,8 +20,9 @@ >=20=20 > (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, bicyc= ling, > and driving.") > (home-page "https://wiki.gnome.org/Apps/Maps") > - (license gpl2+))) > + (license license:gpl2+))) While trivial, this change should be mentioned in the commit log according to the GNU ChangeLog style. This way, if it did break anything, it would be found with "git log --grep gnome-maps" :-) > +(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 I moved the '`(#:phases..' down one line and indented again. Now the URL fi= ts nicely on a horizontally split 1920x1080 screen. > + (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. Se= e: > + ;; 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))= )))))) 'substitute*' has an undefined return value, so we add an explicit #t at the end of such phases to make sure they succeed. > + (inputs > + `(("glib" ,glib))) > + (home-page "http://proj4.org/") > + (synopsis "Cartographic Projections Library") > + (description > + "Proj.4 is a library for converting coordinates between cartographi= c projections. > +") > + (license (list license:expat > + ;; config.guess, config.sub > + license:gpl3+ > + ;; libtool > + license:gpl2+ Autotools generated files do not need to be mentioned here AFAIA. > + ;; src/PJ_patterson.c > + license:asl2.0 > + ;; src/geodesic.c/h > + license:x11 > + ;; cmake/* > + license:boost1.0)))) I also added a license entry for the embedded EPSG database: http://www.epsg.org/TermsOfUse Pushed as 0e159a1a09970c72603d08a028d0bb531ab6ab61 ! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlh+H1UACgkQoqBt8qM6 VPqTfAgA1SDISY0wj1Jh9h05RSin+c7YZU8QHKmmiSx21aahLBwpw7cueTdP0aRm 0UlyNaA1R7lt7szL0gokFS691xLav8HRYUQ1SJ7QZV65M/ul/MXmLBG5Py6kc+UE fJ6nkHNbG8suVpUFvJh/dUFSXWQafUXil5YSeYVKUs826TVRCiaB044Q70iqRI7Y cy4a3LB/PBJZEdC7aYzsqKwIqdbOr5j/un3Zz6pyPfAYO0+GI7n2RdMv3ceSn9XC QkNStBKNydG8Xlf7T6Bwqnm8UUKbx+AygOUOjkqOdH0Fmgf3o9/nE/iiWIEZL/4Q mOCKu6JO5czQOvcmqkizYT72/s5xXQ== =TMtR -----END PGP SIGNATURE----- --=-=-=--