[PATCH 1/3] gnu: Add dotconf.

[PATCH 1/3] gnu: Add dotconf.

[Marius Bakke]

* gnu/packages/textutils.scm (dotconf): New variable.
---
 gnu/packages/textutils.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 2259a16..db6e5a1 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -459,3 +460,35 @@ categories.")
     ;;   GNU General Public License, (c) by the Free Software Foundation.
     ;;   Guix excludes this file.
     (license (list license:gpl3+ license:public-domain))))
+
+(define-public dotconf
+  (package
+    (name "dotconf")
+    (version "1.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/williamh/dotconf/archive/v"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0lsnh0yaw44psmx59hq94cj1932gscp5h8d3cnh05l0svr0cy7kz"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; FIXME maketest.sh does not work.
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'autoreconf
+           (lambda _
+             (zero? (system* "autoreconf" "-vif")))))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
+    (home-page "https://github.com/williamh/dotconf")
+    (synopsis "Configuration file parser library")
+    (description
+     "C library for creating and parsing configuration files.")
+    (license (list license:lgpl2.1         ; Main distribution.
+                   license:asl1.1))))      ; src/readdir.{c,h}
-- 
2.10.1

[PATCH 2/3] licenses: Export fdl1.2+.

[Marius Bakke]

Follow-up to 59b2034787909cf7efa4e8d672a815b466d7d09d.

* guix/licenses.scm (define-module): Export fdl1.2+.
---
 guix/licenses.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index ff214cf..1e19300 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -48,7 +48,7 @@
             giftware
             gpl1 gpl1+ gpl2 gpl2+ gpl3 gpl3+
             gfl1.0
-            fdl1.1+ fdl1.3+
+            fdl1.1+ fdl1.2+ fdl1.3+
             opl1.0+
             isc
             ijg
-- 
2.10.1

[PATCH 3/3] gnu: Add speech-dispatcher.

[Marius Bakke]

* gnu/packages/speech.scm (speech-dispatcher): New variable.
---
 gnu/packages/speech.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm
index 95c7591..39a940d 100644
--- a/gnu/packages/speech.scm
+++ b/gnu/packages/speech.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 David Thompson <davet@gnu.org>
+;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,7 +23,12 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
-  #:use-module (gnu packages gcc))
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages textutils))
 
 (define-public mitlm
   (package
@@ -49,3 +55,40 @@ models involving iterative parameter estimation.  It achieves much of its
 efficiency through the use of a compact vector representation of n-grams.")
     (home-page "https://github.com/mitlm/mitlm")
     (license license:expat)))
+
+(define-public speech-dispatcher
+  (package
+    (name "speech-dispatcher")
+    (version "0.8.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://devel.freebsoft.org/pub/"
+                                  "projects/speechd/speech-dispatcher-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "18jlxnhlahyi6njc6l6576hfvmzivjjgfjyd2n7vvrvx9inphjrb"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("dotconf" ,dotconf)
+       ("glib" ,glib)
+       ("libltdl" ,libltdl)
+       ("libsndfile" ,libsndfile)))
+    (synopsis "Common interface to speech synthesizers")
+    (description "The Speech Dispatcher project provides a high-level
+device independent layer for access to speech synthesis through a simple,
+stable and well documented interface.")
+    (home-page "https://devel.freebsoft.org/speechd")
+    ;; The software is distributed under GPL2+, but includes a number
+    ;; of files covered by other licenses.
+    (license (list license:gpl2+
+                   license:fdl1.2+ ; Most files in doc/ are dual gpl2+/fdl1.2+.
+                   license:lgpl2.1+
+                   license:gpl2
+                   (license:non-copyleft
+                    ;; festival_client.{c,h} carries an expat-style license.
+                    "See src/modules/festival_client.c in the distribution.")
+                   license:gpl3+)))) ; doc/texinfo.tex -- with TeX exception.
-- 
2.10.1

Re: [PATCH 1/3] gnu: Add dotconf.

[Leo Famulari]

On Mon, Oct 31, 2016 at 10:49:26AM +0000, Marius Bakke wrote:
> * gnu/packages/textutils.scm (dotconf): New variable.

LGTM

Re: [PATCH 2/3] licenses: Export fdl1.2+.

[Leo Famulari]

On Mon, Oct 31, 2016 at 10:49:27AM +0000, Marius Bakke wrote:
> Follow-up to 59b2034787909cf7efa4e8d672a815b466d7d09d.

"This is a follow-up to 59b2034787909cf7efa4e8d672a815b466d7d09d."

Let's use complete sentences :)

LGTM, thanks for fixing this!

Re: [PATCH 3/3] gnu: Add speech-dispatcher.

[Leo Famulari]

On Mon, Oct 31, 2016 at 10:49:28AM +0000, Marius Bakke wrote:
> * gnu/packages/speech.scm (speech-dispatcher): New variable.

Funny, we will ship a WAV file that says "Yo!" :)

http://git.freebsoft.org/?p=speechd.git;a=tree;f=src/tests;h=c271f62e94fed0d9c37a43cb31bf1793f4bc9db9;hb=HEAD

Anyways, it looks good to me!

Dave Thompson recently sent me some Festival packaging that he'd been
working on, but I haven't done anything with it yet. Maybe it's time!

Re: [PATCH 3/3] gnu: Add speech-dispatcher.

[Marius Bakke]

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

Leo Famulari <leo@famulari.name> writes:

> On Mon, Oct 31, 2016 at 10:49:28AM +0000, Marius Bakke wrote:
>> * gnu/packages/speech.scm (speech-dispatcher): New variable.
>
> Funny, we will ship a WAV file that says "Yo!" :)
>
> http://git.freebsoft.org/?p=speechd.git;a=tree;f=src/tests;h=c271f62e94fed0d9c37a43cb31bf1793f4bc9db9;hb=HEAD
>
> Anyways, it looks good to me!

Ha, nice catch! :) Thanks for checking!

I pushed the series with the commit message fix.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 454 bytes --]