Merge branch 'master' into core-updates

1 files changed, 6 insertions, 9 deletions

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 72f46f903a..0175024047 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -291,12 +291,14 @@ engineers, musicians, soundtrack editors and composers.")
     (version "2.2.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/audacity/audacity/archive"
-                           "/Audacity-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/audacity/audacity.git")
+             (commit (string-append "Audacity-" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km"))
+         "10maxmjxbmjybj7n4m7a9bbm7g8xxw8f8vbsf7c9ih5j2gr15ihs"))
        (patches (search-patches "audacity-build-with-system-portaudio.patch"))
        (modules '((guix build utils)))
        (snippet
@@ -411,11 +413,6 @@ engineers, musicians, soundtrack editors and composers.")
              (substitute* "src/prefs/MidiIOPrefs.cpp"
                (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h"))
              #t)))
-       ;; The translation Makefile generation is performed improperly for
-       ;; out-of-tree builds.
-       ;; XXX This can be removed if the glib-or-gkt-build-system
-       ;; switches to #:out-of-source? #t. See <https://bugs.gnu.org/32887>.
-       #:out-of-source? #f
        ;; The test suite is not "well exercised" according to the developers,
        ;; and fails with various errors.  See
        ;; <http://sourceforge.net/p/audacity/mailman/message/33524292/>.