From b94a6ca074f00b3f769933d074853d3c3ca50d00 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Sun, 25 Sep 2016 10:33:02 +0300
Subject: gnu: Add and use gettext-minimal.

* gnu/packages/gettext.scm (gnu-gettext): Rename to...
(gettext-minimal): ... this.  Adjust synopsis and description.
(gnu-gettext): Inherit from it.
(po4a): Use 'gettext-minimal' instead of 'gnu-gettext'.
* gnu/packages/acl.scm: Likewise.
* gnu/packages/admin.scm: Likewise.
* gnu/packages/apl.scm: Likewise.
* gnu/packages/attr.scm: Likewise.
* gnu/packages/audio.scm: Likewise.
* gnu/packages/base.scm: Likewise.
* gnu/packages/cdrom.scm: Likewise.
* gnu/packages/commencement.scm: Likewise.
* gnu/packages/crypto.scm: Likewise.
* gnu/packages/databases.scm: Likewise.
* gnu/packages/disk.scm: Likewise.
* gnu/packages/documentation.scm: Likewise.
* gnu/packages/education.scm: Likewise.
* gnu/packages/engineering.scm: Likewise.
* gnu/packages/enlightenment.scm: Likewise.
* gnu/packages/fcitx.scm: Likewise.
* gnu/packages/fontutils.scm: Likewise.
* gnu/packages/freedesktop.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/gkrellm.scm: Likewise.
* gnu/packages/glib.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/grub.scm: Likewise.
* gnu/packages/gtk.scm: Likewise.
* gnu/packages/guile.scm: Likewise.
* gnu/packages/ibus.scm: Likewise.
* gnu/packages/irc.scm: Likewise.
* gnu/packages/iso-codes.scm: Likewise.
* gnu/packages/kde-frameworks.scm: Likewise.
* gnu/packages/kodi.scm: Likewise.
* gnu/packages/linux.scm: Likewise.
* gnu/packages/man.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/mono.scm: Likewise.
* gnu/packages/mp3.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/nano.scm: Likewise.
* gnu/packages/networking.scm: Likewise.
* gnu/packages/package-management.scm: Likewise.
* gnu/packages/pdf.scm: Likewise.
* gnu/packages/sawfish.scm: Likewise.
* gnu/packages/statistics.scm: Likewise.
* gnu/packages/terminals.scm: Likewise.
* gnu/packages/version-control.scm: Likewise.
* gnu/packages/vpn.scm: Likewise.
* gnu/packages/w3m.scm: Likewise.
* gnu/packages/webkit.scm: Likewise.
* gnu/packages/wicd.scm: Likewise.
* gnu/packages/wine.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
* gnu/packages/xorg.scm: Likewise.
---
 gnu/packages/audio.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/audio.scm')

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 67701a0f37..594b8d005b 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -358,7 +358,7 @@ tools (analyzer, mono/stereo tools, crossovers).")
        ("liblo" ,liblo)
        ("ladspa" ,ladspa)
        ("jack" ,jack-1)
-       ("gettext" ,gnu-gettext)))
+       ("gettext" ,gettext-minimal)))
     (native-inputs
      `(("bison" ,bison)
        ("flex" ,flex)
@@ -909,7 +909,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
      `(("gperf" ,gperf)
        ("faust" ,faust)
        ("intltool" ,intltool)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
     (native-search-paths
      (list (search-path-specification
-- 
cgit v1.2.3


From 469142805925e4cdaf8bb6969cd3f101666fa745 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 24 Oct 2016 01:49:27 -0400
Subject: gnu: twolame: Make the test suite compatible with Perl 5.24.

* gnu/packages/audio.scm (twolame)[source]: Add snippet to fix test.
---
 gnu/packages/audio.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/audio.scm')

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index db32b6f1ae..8ec8330b57 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2134,7 +2134,15 @@ conversion.  It may be used, for example, to resample PCM-encoded audio.")
        (uri (string-append "mirror://sourceforge/twolame/twolame/" version
                            "/twolame-" version ".tar.gz"))
        (sha256
-        (base32 "0ahiqqng5pidwhj1wzph4vxxgxxgcfa3gl0gywipzx2ii7s35wwq"))))
+        (base32 "0ahiqqng5pidwhj1wzph4vxxgxxgcfa3gl0gywipzx2ii7s35wwq"))
+       (modules '((guix build utils)))
+       ;; The tests break with Perl 5.24:
+       ;; https://github.com/njh/twolame/issues/21
+       ;; TODO: Remove this snippet when upgrading twolame.
+       (snippet
+        '(begin
+           (substitute* "tests/test.pl" (("\\(@_\\)") "($_[0])"))
+           #t))))
     (build-system gnu-build-system)
     (inputs
      `(("libsndfile" ,libsndfile)))
-- 
cgit v1.2.3