GNU bug report logs - #32887
[PATCH] gnu: Audacity: Use glib-or-gtk-build-system instead of a wrapper.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Leo Famulari <leo <at> famulari.name>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#32887: closed ([PATCH] gnu: Audacity: Use glib-or-gtk-build-system
 instead of a wrapper.)
Date: Tue, 02 Oct 2018 18:36:03 +0000

[Message part 1 (text/plain, inline)]

Your message dated Tue, 2 Oct 2018 14:35:16 -0400
with message-id <20181002183516.GA15069 <at> jasmine.lan>
and subject line Re: [bug#32887] [v2] gnu: Audacity: Use glib-or-gtk-build-system instead of a wrapper.
has caused the debbugs.gnu.org bug report #32887,
regarding [PATCH] gnu: Audacity: Use glib-or-gtk-build-system instead of a wrapper.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
32887: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=32887
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Audacity: Use glib-or-gtk-build-system instead of a
 wrapper.
Date: Sun, 30 Sep 2018 13:11:04 -0400

The wrapper was added to prevent a crash when using the "open file"
dialog on foreign distros. Using the glib-or-gtk-build-system works,
too, and should be simpler to maintain in the long run. However, with
this change, the build fails unless we patch the translation Makefile.
I'm not sure why that is.

Thoughts?

* gnu/packages/audio.scm (audacity)[build-system]: Use glib-or-gtk-build-system.
[arguments]: Remove the 'wrap-program' phase and add a
'patch-translation-makefile' phase.
---
 gnu/packages/audio.scm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 446587273..ee57f172e 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -321,7 +321,7 @@ engineers, musicians, soundtrack editors and composers.")
               ;; "sbsms"
               ))
            #t))))
-    (build-system gnu-build-system)
+    (build-system glib-or-gtk-build-system)
     (inputs
      `(("wxwidgets" ,wxwidgets)
        ("gtk+" ,gtk+)
@@ -411,14 +411,11 @@ engineers, musicians, soundtrack editors and composers.")
              (substitute* "src/prefs/MidiIOPrefs.cpp"
                (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h"))
              #t))
-         (add-after 'install 'wrap-program
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (wrap-program (string-append (assoc-ref outputs "out")
-                                          "/bin/audacity")
-               ;; For GtkFileChooserDialog.
-               `("GSETTINGS_SCHEMA_DIR" =
-                 (,(string-append (assoc-ref inputs "gtk+")
-                                  "/share/glib-2.0/schemas"))))
+         (add-after 'unpack 'patch-translation-makefile
+           (lambda _
+             (substitute* "po/Makefile.in.in"
+               (("SHELL = /bin/sh")
+                (string-append "SHELL = " (which "sh"))))
              #t)))
        ;; The test suite is not "well exercised" according to the developers,
        ;; and fails with various errors.  See
-- 
2.19.0

[Message part 3 (message/rfc822, inline)]

From: Leo Famulari <leo <at> famulari.name>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 32887-done <at> debbugs.gnu.org
Subject: Re: [bug#32887] [v2] gnu: Audacity: Use glib-or-gtk-build-system
 instead of a wrapper.
Date: Tue, 2 Oct 2018 14:35:16 -0400

[Message part 4 (text/plain, inline)]

On Tue, Oct 02, 2018 at 11:54:27AM +0200, Ludovic Courtès wrote:
> I think this patch is definitely OK, and I suppose we could even switch
> ‘glib-or-gtk-build-system’ to default to #:out-of-source #f.  I don’t
> think there was any justification, it could have been cut-n-paste.

Okay, I pushed the patch as b0f43001195c69f730b49b0bf9de516edd53baed.
I'll follow up with a similar fix for LibreOffice shortly.

As for the change to glib-or-gtk-build-system, I'll put it on its own
Savannah branch, 'wip-glib-or-gtk'.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.