[PATCH] gnu: audacity: Update to 2.1.2.

[PATCH] gnu: audacity: Update to 2.1.2.

[Kei Kebreau]

[-- Attachment #1.1: Type: text/plain, Size: 69 bytes --]

If this reproducibly builds for someone else, I will push it master.

[-- Attachment #1.2: 0001-gnu-audacity-Update-to-2.1.2.patch --]
[-- Type: text/plain, Size: 2316 bytes --]

From daf80af2ea435f27b4d2fbc5fab2a4d451d6a36f Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
Date: Wed, 11 Jan 2017 16:18:49 -0500
Subject: [PATCH] gnu: audacity: Update to 2.1.2.

* gnu/packages/audacity.scm (audacity): Update to 2.1.2.
[source](uri): Update source URL.
[inputs]: Replace wxwidgets-2 with wxwidgets-gtk2.
[native-inputs]: Add gettext-minimal.
---
 gnu/packages/audacity.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm
index 0f9554deb..a70d0e3a6 100644
--- a/gnu/packages/audacity.scm
+++ b/gnu/packages/audacity.scm
@@ -24,6 +24,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages mp3)
@@ -38,20 +39,20 @@
 (define-public audacity
   (package
     (name "audacity")
-    (version "2.1.0")
+    (version "2.1.2")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://sourceforge/audacity/audacity/" version
-                           "/audacity-minsrc-" version ".tar.xz"))
+       (uri (string-append "https://github.com/audacity/audacity/archive"
+                           "/Audacity-" version ".zip"))
        (sha256
-        (base32 "1cs2w3fwqylpqmfwkvlgdx5lhclpckfil7pqibl37qlbnf4qvndh"))
+        (base32 "1642i9d5cdmqzj6r0qdl2ldnqsvpb08znnczncysi72x6zpvb5qq"))
        (patches (search-patches "audacity-fix-ffmpeg-binding.patch"))))
     (build-system gnu-build-system)
     (inputs
      ;; TODO: Add portSMF and libwidgetextra once they're packaged.  In-tree
      ;; versions shipping with Audacity are used for now.
-     `(("wxwidgets" ,wxwidgets-2)
+     `(("wxwidgets" ,wxwidgets-gtk2)
        ("gtk" ,gtk+-2)
        ("alsa-lib" ,alsa-lib)
        ("jack" ,jack-1)
@@ -72,7 +73,8 @@
        ("lilv" ,lilv)
        ("portaudio" ,portaudio)))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
+     `(("gettext" ,gettext-minimal)     ;for msgfmt
+       ("pkg-config" ,pkg-config)
        ("python" ,python-2)
        ("which" ,which)))
     (arguments
-- 
2.11.0


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

Re: [PATCH] gnu: audacity: Update to 2.1.2.

[Leo Famulari]

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

On Wed, Jan 11, 2017 at 04:33:10PM -0500, Kei Kebreau wrote:
> -       (uri (string-append "mirror://sourceforge/audacity/audacity/" version
> -                           "/audacity-minsrc-" version ".tar.xz"))
> +       (uri (string-append "https://github.com/audacity/audacity/archive"
> +                           "/Audacity-" version ".zip"))

It looks like they recommend another URL:

http://www.audacityteam.org/download/source/

which points to

https://www.fosshub.com/Audacity.html/audacity-minsrc-2.1.2.tar.xz

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

Re: [PATCH] gnu: audacity: Update to 2.1.2.

[Kei Kebreau]

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

Leo Famulari <leo@famulari.name> writes:

> On Wed, Jan 11, 2017 at 04:33:10PM -0500, Kei Kebreau wrote:
>> -       (uri (string-append "mirror://sourceforge/audacity/audacity/" version
>> -                           "/audacity-minsrc-" version ".tar.xz"))
>> +       (uri (string-append "https://github.com/audacity/audacity/archive"
>> +                           "/Audacity-" version ".zip"))
>
> It looks like they recommend another URL:
>
> http://www.audacityteam.org/download/source/
>
> which points to
>
> https://www.fosshub.com/Audacity.html/audacity-minsrc-2.1.2.tar.xz

I got a 403 error and Access Denied when I tried to download the source
code from that page. Did you have better luck?

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

Re: [PATCH] gnu: audacity: Update to 2.1.2.

[Leo Famulari]

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

On Wed, Jan 11, 2017 at 06:48:58PM -0500, Kei Kebreau wrote:
> Leo Famulari <leo@famulari.name> writes:
> 
> > On Wed, Jan 11, 2017 at 04:33:10PM -0500, Kei Kebreau wrote:
> >> -       (uri (string-append "mirror://sourceforge/audacity/audacity/" version
> >> -                           "/audacity-minsrc-" version ".tar.xz"))
> >> +       (uri (string-append "https://github.com/audacity/audacity/archive"
> >> +                           "/Audacity-" version ".zip"))
> >
> > It looks like they recommend another URL:
> >
> > http://www.audacityteam.org/download/source/
> >
> > which points to
> >
> > https://www.fosshub.com/Audacity.html/audacity-minsrc-2.1.2.tar.xz
> 
> I got a 403 error and Access Denied when I tried to download the source
> code from that page. Did you have better luck?

Yeah, it works fine for me. Weird! Anyone else?

If it only fails for you, do you want me to finish the patch with the
fosshub URL?

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

Re: [PATCH] gnu: audacity: Update to 2.1.2.

[Kei Kebreau]

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

Leo Famulari <leo@famulari.name> writes:

> On Wed, Jan 11, 2017 at 06:48:58PM -0500, Kei Kebreau wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> 
>> > On Wed, Jan 11, 2017 at 04:33:10PM -0500, Kei Kebreau wrote:
>> >> - (uri (string-append "mirror://sourceforge/audacity/audacity/"
>> >> version
>> >> -                           "/audacity-minsrc-" version ".tar.xz"))
>> >> +       (uri (string-append "https://github.com/audacity/audacity/archive"
>> >> +                           "/Audacity-" version ".zip"))
>> >
>> > It looks like they recommend another URL:
>> >
>> > http://www.audacityteam.org/download/source/
>> >
>> > which points to
>> >
>> > https://www.fosshub.com/Audacity.html/audacity-minsrc-2.1.2.tar.xz
>> 
>> I got a 403 error and Access Denied when I tried to download the source
>> code from that page. Did you have better luck?
>
> Yeah, it works fine for me. Weird! Anyone else?
>
> If it only fails for you, do you want me to finish the patch with the
> fosshub URL?

Yes please! download.fosshub.com denies access from both of my PCs. Very
strange.

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

Re: [PATCH] gnu: audacity: Update to 2.1.2.

[Leo Famulari]

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

On Fri, Jan 13, 2017 at 02:56:59PM -0500, Kei Kebreau wrote:
> Yes please! download.fosshub.com denies access from both of my PCs. Very
> strange.

Huh, the Guix downloader ends up with the wrong file when using the link
to fosshub from the Audacity site, and the actual fosshub URLs contain
expiration tokens. I guess this is why we have zero packages hosted on
fosshub.

We should use the GitHub source after all.

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

Re: [PATCH] gnu: audacity: Update to 2.1.2.

[Kei Kebreau]

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

Leo Famulari <leo@famulari.name> writes:

> On Fri, Jan 13, 2017 at 02:56:59PM -0500, Kei Kebreau wrote:
>> Yes please! download.fosshub.com denies access from both of my PCs. Very
>> strange.
>
> Huh, the Guix downloader ends up with the wrong file when using the link
> to fosshub from the Audacity site, and the actual fosshub URLs contain
> expiration tokens. I guess this is why we have zero packages hosted on
> fosshub.
>
> We should use the GitHub source after all.

So should I just push the patch to master then?

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

Re: [PATCH] gnu: audacity: Update to 2.1.2.

[Leo Famulari]

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

On Fri, Jan 13, 2017 at 04:22:05PM -0500, Kei Kebreau wrote:
> Leo Famulari <leo@famulari.name> writes:
> 
> > On Fri, Jan 13, 2017 at 02:56:59PM -0500, Kei Kebreau wrote:
> >> Yes please! download.fosshub.com denies access from both of my PCs. Very
> >> strange.
> >
> > Huh, the Guix downloader ends up with the wrong file when using the link
> > to fosshub from the Audacity site, and the actual fosshub URLs contain
> > expiration tokens. I guess this is why we have zero packages hosted on
> > fosshub.
> >
> > We should use the GitHub source after all.
> 
> So should I just push the patch to master then?

Yes, please :)

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

Re: [PATCH] gnu: audacity: Update to 2.1.2.

[Kei Kebreau]

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

Leo Famulari <leo@famulari.name> writes:

> On Fri, Jan 13, 2017 at 04:22:05PM -0500, Kei Kebreau wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> 
>> > On Fri, Jan 13, 2017 at 02:56:59PM -0500, Kei Kebreau wrote:
>> >> Yes please! download.fosshub.com denies access from both of my PCs. Very
>> >> strange.
>> >
>> > Huh, the Guix downloader ends up with the wrong file when using the link
>> > to fosshub from the Audacity site, and the actual fosshub URLs contain
>> > expiration tokens. I guess this is why we have zero packages hosted on
>> > fosshub.
>> >
>> > We should use the GitHub source after all.
>> 
>> So should I just push the patch to master then?
>
> Yes, please :)

Pushed to master as cb4d70f46e3fd0c87df8fbee2832f72bbeba4b61. Thanks for
checking the package! :)

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