From ba3bff132eba8eeaf032e69cade548910bb8c3fd Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 5 Dec 2019 01:47:47 +0530 Subject: [PATCH 5/9] gnu: libgeotiff: Update to 1.5.1. * gnu/packages/geo.scm (libgeotiff): Update to 1.5.1. [inputs]: Replace proj.4 with proj. --- gnu/packages/geo.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ad138d6578..8fe48367b9 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -225,35 +225,30 @@ and driving.") (define-public libgeotiff (package (name "libgeotiff") - (version "1.4.3") + (version "1.5.1") (source (origin (method url-fetch) (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-" version ".tar.gz")) (sha256 - (base32 "0rbjqixi4c8yz19larlzq6jda0px2gpmpp9c52cyhplbjsdhsldq")) + (base32 "0b31mlzcv5b1y7jdvb7p0pa3xradrg3x5g32ym911lbhq4rrgsgr")) (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")) #t)))) (build-system gnu-build-system) (inputs `(("libjpeg-turbo" ,libjpeg-turbo) ("libtiff" ,libtiff) - ("proj.4" ,proj.4) + ("proj" ,proj) ("zlib" ,zlib))) (arguments - `(#:configure-flags + `(#:tests? #f + #:configure-flags (list (string-append "--with-zlib") (string-append "--with-jpeg") (string-append "--with-libtiff=" (assoc-ref %build-inputs "libtiff"))))) -- 2.23.0