From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efWlk-00018q-1p for guix-patches@gnu.org; Sat, 27 Jan 2018 15:08:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1efWlf-0000Q5-Jv for guix-patches@gnu.org; Sat, 27 Jan 2018 15:08:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:37615) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1efWlf-0000Pn-FJ for guix-patches@gnu.org; Sat, 27 Jan 2018 15:08:03 -0500 Subject: [bug#27774] [PATCH 1/1] gnu: Add libgeotiff. Resent-Message-ID: Date: Sat, 27 Jan 2018 21:07:05 +0100 From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Message-ID: <20180127210705.3352b661@alma-ubu> In-Reply-To: <20180103165600.662-2-arunisaac@systemreboot.net> References: <20180103165600.662-1-arunisaac@systemreboot.net> <20180103165600.662-2-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Arun Isaac Cc: 27774@debbugs.gnu.org Hi Arun, thanks for finishing that. I messed my git repository and then forgot about it because of other things. Bj=C3=B6rn On Wed, 3 Jan 2018 22:26:00 +0530 Arun Isaac wrote: > From: Bj=C3=B6rn H=C3=B6fling >=20 > * gnu/packages/geo.scm (libgeotiff): New variable. >=20 > Signed-off-by: Arun Isaac > --- > gnu/packages/geo.scm | 51 > +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, > 51 insertions(+) >=20 > diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm > index 7bf1562ba..c3a62c641 100644 > --- a/gnu/packages/geo.scm > +++ b/gnu/packages/geo.scm > @@ -25,9 +25,11 @@ > #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix packages) > #:use-module (guix utils) > + #:use-module (gnu packages compression) > #:use-module (gnu packages glib) > #:use-module (gnu packages gnome) > #:use-module (gnu packages gtk) > + #:use-module (gnu packages image) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages webkit) > #:use-module (gnu packages xml)) > @@ -137,6 +139,55 @@ and driving.") > (home-page "https://wiki.gnome.org/Apps/Maps") > (license license:gpl2+))) > =20 > +(define-public libgeotiff > + (package > + (name "libgeotiff") > + (version "1.4.2") > + (source > + (origin > + (method url-fetch) > + (uri (string-append > "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-" > + version ".tar.gz")) > + (sha256 > + (base32 > + "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd")) > + (modules '((guix build utils))) > + (snippet > + '(begin > + ;; Remove .csv files, distributed from EPSG under a > restricted > + ;; license. See LICENSE for full license text. > + (for-each delete-file (find-files "." "\\.csv$")) > + ;; Now that we have removed the csv files, we need to > modify the Makefile. > + (substitute* "Makefile.in" > + (("^all-am: .*$") > + "all-am: Makefile $(LTLIBRARIES) $(HEADERS) > geo_config.h\n") > + (("^install-data-am: .*$") > + "install-data-am: install-includeHEADERS")))))) > + (build-system gnu-build-system) > + (inputs > + `(("libjpeg-turbo" ,libjpeg-turbo) > + ("libtiff" ,libtiff) > + ("proj.4" ,proj.4) > + ("zlib" ,zlib))) > + (arguments > + `(#:configure-flags > + (list (string-append "--with-zlib") > + (string-append "--with-jpeg") > + (string-append "--with-libtiff=3D" (assoc-ref > %build-inputs "libtiff"))))) > + (synopsis "Library for handling GeoTIFF (geographic enabled > TIFF)") > + (description "libgeotiff is a library on top of libtiff for > reading and +writing GeoTIFF information tags.") > + (home-page "https://trac.osgeo.org/geotiff/") > + ;; This is a mixture of various contributions under different > licenses. > + ;; Note that the EPSG database is NOT "free to use" as the > LICENSE file > + ;; states, as its commercial redistribution is restricted. > Hence, we have > + ;; removed it from the package. > + (license (list license:public-domain > + license:x11 > + license:bsd-3 > + (license:non-copyleft "file://LICENSE" > + "See LICENSE in the > distribution."))))) + > (define-public proj.4 > (package > (name "proj.4")