Re: [PATCH] gnu: Add gzstream.

[Marius Bakke <mbakke@fastmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1657 bytes --]

Eric Bavier <ericbavier@openmailbox.org> writes:

> Thanks for the patch!  Comments below:
>
> On Tue, 30 Aug 2016 19:17:14 +0100
> Marius Bakke <mbakke@fastmail.com> wrote:
>
>> From 5e96b895c1ed77a6bfdcbe5c6dbd68220fd5a8dc Mon Sep 17 00:00:00 2001
>> From: Marius Bakke <m.bakke@warwick.ac.uk>
>> Date: Fri, 12 Aug 2016 02:29:51 +0100
>> Subject: [PATCH 1/1] gnu: Add gzstream.
>> 
>> * gnu/packages/compression.scm (gzstream): New variable.
>> ---
>> [...]
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri
>> +               ;; No versioned URL, but last release was in 2003.
>> +               "http://www.cs.unc.edu/Research/compgeom/gzstream/gzstream.tgz")
>> +              (file-name (string-append name "-" version ".tar.gz"))
>> +              (sha256
>> +               (base32
>> +                "00y19pqjsdj5zcrx4p9j56pl73vayfwnb7y2hvp423nx0cwv5b4r"))))
>
> There's a gzstream.o file in the tarball.  Could you remove it an origin
> snippet?
>
>> [...]
>> +    (home-page "http://www.cs.unc.edu/Research/compgeom/gzstream/")
>> +    (synopsis "C++ library that provides the functionality of zlib in a C++ iostream")
>
> Maybe: "Compressed C++ iostream"
>
>> +    (description "gzstream is a small library for providing zlib functionality in a C++
>> +iostream.  It is basically just a wrapper.")
>
> The second sentence may be left off, IMO.
>
>> +    (license license:lgpl2.1)))
>                         ^
> This should be lgpl2.1+ because of the "or later" in the file headers.
>
> Could you send an updated patch?

Hi Eric,

Thanks for the quick feedback! Correct on all accounts.

Updated patch below.


[-- Attachment #2: 0001-gnu-Add-gzstream.patch --]
[-- Type: text/x-patch, Size: 2642 bytes --]

From a8aae7f44289c75f67f2bea1046206f79acbdbdb Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Fri, 12 Aug 2016 02:29:51 +0100
Subject: [PATCH] gnu: Add gzstream.

* gnu/packages/compression.scm (gzstream): New variable.
---
 gnu/packages/compression.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index c239d16..3f60c5b 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
+;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -895,3 +896,41 @@ compared to the fastest mode of zlib, Snappy is an order of magnitude faster
 for most inputs, but the resulting compressed files are anywhere from 20% to
 100% bigger.")
     (license license:asl2.0)))
+
+(define-public gzstream
+  (package
+    (name "gzstream")
+    (version "1.5")
+    (source (origin
+              (method url-fetch)
+              (uri
+               ;; No versioned URL, but last release was in 2003.
+               "http://www.cs.unc.edu/Research/compgeom/gzstream/gzstream.tgz")
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "00y19pqjsdj5zcrx4p9j56pl73vayfwnb7y2hvp423nx0cwv5b4r"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Remove pre-compiled object.
+               '(delete-file "gzstream.o"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:test-target "test"
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (lib (string-append out "/lib"))
+                    (include (string-append out "/include")))
+               (install-file "libgzstream.a" lib)
+               (install-file "gzstream.h" include)
+               #t))))))
+    (propagated-inputs `(("zlib" ,zlib)))
+    (home-page "http://www.cs.unc.edu/Research/compgeom/gzstream/")
+    (synopsis "Compressed C++ iostream")
+    (description "gzstream is a small library for providing zlib
+functionality in a C++ iostream.")
+    (license license:lgpl2.1+)))
-- 
2.9.3