From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYtoH-0007bm-MZ for guix-patches@gnu.org; Sat, 22 Jul 2017 08:47:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYtoE-0002H5-J6 for guix-patches@gnu.org; Sat, 22 Jul 2017 08:47:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49324) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dYtoE-0002Gx-FA for guix-patches@gnu.org; Sat, 22 Jul 2017 08:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dYtoE-0007ia-2O for guix-patches@gnu.org; Sat, 22 Jul 2017 08:47:02 -0400 Subject: [bug#27774] [PATCH] gnu: add libgeotiff Resent-Message-ID: From: Marius Bakke In-Reply-To: <20170720175018.49ec09ac@alma-ubu> References: <20170720175018.49ec09ac@alma-ubu> Date: Sat, 22 Jul 2017 14:46:24 +0200 Message-ID: <87379o63mn.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= , 27774@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Bj=C3=B6rn! Bj=C3=B6rn H=C3=B6fling writes: > From 4e96405382258d0aa3a1760ac77dd0ac72706786 Mon Sep 17 00:00:00 2001 > From: =3D?UTF-8?q?Bj=3DC3=3DB6rn=3D20H=3DC3=3DB6fling?=3D > > Date: Tue, 24 Jan 2017 09:00:07 +0100 > Subject: [PATCH] gnu: add libgeotiff > > * gnu/packages/geo.scm (libgeotiff): New variable. [...] =20=20 > +(define-public libgeotiff > + (package > + (name "libgeotiff") > + (version "1.4.2") > + (source (origin > + (method url-fetch) > + (uri (string-append "http://download.osgeo.org/geotiff/libge= otiff/" > + "libgeotiff-" > + version ".tar.gz")) > + (sha256 > + (base32 > + "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd")))) > + (build-system gnu-build-system) > + (arguments > + `(#:configure-flags > + `( ,(string-append "--with-zlib") > + ,(string-append "--with-jpeg") > + ,(string-append "--with-libtiff=3D" > + (assoc-ref %build-inputs "libtiff"))) I think this can be reduced to... #:configure-flags (list "--with-zlib" "--with-jpeg" (string-append "--with-libtiff" (assoc-ref ....))) > + #:phases > + (modify-phases %standard-phases > + (add-after > + 'unpack 'delete-nonfree-files > + (lambda _ > + ;; Remove .csv-files, distributed from > + ;; EPSG under a restricted license. > + ;; See LICENSE.txt for full license text. > + (for-each delete-file (find-files "." "\\.csv$")) > + ;; Now that we remove the csv-files, we need to modify the Mak= efile: > + (substitute* "Makefile.in" > + (("all-am: Makefile \\$\\(LTLIBRARIES\\) \\$\\(DATA\\) \\$\\= (HEADERS\\) geo_config.h") > + "all-am: Makefile $(LTLIBRARIES) $(HEADERS) geo_config.h") > + (("install-data-am: install-dist_csvDATA install-includeHEAD= ERS") > + "install-data-am: install-includeHEADERS")) > + #t))))) Thanks for finding this. Can you move this section to a 'snippet' instead? Otherwise these restricted files will show up in `guix build -S libgeotiff`, which we can not allow. The rest LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAllzSSAACgkQoqBt8qM6 VPrneQf9Gy1y0CgqL835sYl1KdBpmW7gRD3lzycBDiYysPRcr6sFvnOkOgwVSrrB DYiZq7YQgCi6PkU9iqvQz8mu7LKHYQCpUoSEuVQXUcJSvs1fyYK2uh8oq3opMP2Y Yvtls5nbfC8u/ZO+xjeMVVHru8ZCHm7MZzip06Tm88L7N+Oe7jvPfJhhxK8py6ax HglbQTOrH7GyDBlVsbx+6tinvnkL26/UHWKNh3clYfN7MbLZOamF0CyJAvNlWLNQ TkmnhFbbJDeB2m/FX75Urv0pvMYNcBJwcrRMHdVBa4ct4Bjm4c1cZrA68+YL1Oml ek+EfaxdTyyRLOQOvJ1Q/crmeJgTPg== =2mmv -----END PGP SIGNATURE----- --=-=-=--