From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42512)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dZEyZ-0002O4-8k
	for guix-patches@gnu.org; Sun, 23 Jul 2017 07:23:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dZEyU-0002DK-Fl
	for guix-patches@gnu.org; Sun, 23 Jul 2017 07:23:07 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:50231)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1dZEyU-0002DC-Bx
	for guix-patches@gnu.org; Sun, 23 Jul 2017 07:23:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dZEyU-0007Lp-2e
	for guix-patches@gnu.org; Sun, 23 Jul 2017 07:23:02 -0400
Subject: [bug#27774] [PATCH] gnu: add libgeotiff
Resent-Message-ID: <handler.27774.B27774.150080896928237@debbugs.gnu.org>
Date: Sun, 23 Jul 2017 13:22:44 +0200
From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?=
	<bjoern.hoefling@bjoernhoefling.de>
Message-ID: <20170723132244.3868972d@alma-ubu>
In-Reply-To: <87379o63mn.fsf@fastmail.com>
References: <20170720175018.49ec09ac@alma-ubu>
	<87379o63mn.fsf@fastmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Marius Bakke <mbakke@fastmail.com>
Cc: 27774@debbugs.gnu.org

On Sat, 22 Jul 2017 14:46:24 +0200
Marius Bakke <mbakke@fastmail.com> wrote:

> Hi Bj=C3=B6rn!
>=20
> Bj=C3=B6rn H=C3=B6fling <bjoern.hoefling@bjoernhoefling.de> writes:
>=20
> > From 4e96405382258d0aa3a1760ac77dd0ac72706786 Mon Sep 17 00:00:00
> > 2001 From: =3D?UTF-8?q?Bj=3DC3=3DB6rn=3D20H=3DC3=3DB6fling?=3D
> >  <bjoern.hoefling@bjoernhoefling.de>
> > Date: Tue, 24 Jan 2017 09:00:07 +0100
> > Subject: [PATCH] gnu: add libgeotiff
> >
> > * gnu/packages/geo.scm (libgeotiff): New variable. =20
>=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/libgeotiff/"
> > +                                "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"))) =20
>=20
> I think this can be reduced to...
>=20
> #:configure-flags
> (list "--with-zlib" "--with-jpeg"
>       (string-append "--with-libtiff" (assoc-ref ....)))

Of cause!


> > +    #: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 Makefile:
> > +          (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-includeHEADERS")
> > +             "install-data-am: install-includeHEADERS"))
> > +          #t))))) =20
>=20
> 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.

I didn't know of the 'snippet' until now. I will rework it with a origin->s=
nippet
and send it in again.

> The rest LGTM!