From unknown Sat Jun 21 12:35:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#32887] [PATCH] gnu: Audacity: Use glib-or-gtk-build-system instead of a wrapper. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Sep 2018 17:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 32887 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 32887@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.153832749931674 (code B ref -1); Sun, 30 Sep 2018 17:12:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Sep 2018 17:11:39 +0000 Received: from localhost ([127.0.0.1]:60166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g6fFr-0008Eo-1W for submit@debbugs.gnu.org; Sun, 30 Sep 2018 13:11:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g6fFp-0008Ea-15 for submit@debbugs.gnu.org; Sun, 30 Sep 2018 13:11:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6fFg-0007yM-Hd for submit@debbugs.gnu.org; Sun, 30 Sep 2018 13:11:31 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42356) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g6fFf-0007xy-AI for submit@debbugs.gnu.org; Sun, 30 Sep 2018 13:11:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6fFe-000636-He for guix-patches@gnu.org; Sun, 30 Sep 2018 13:11:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6fFX-0007vO-3C for guix-patches@gnu.org; Sun, 30 Sep 2018 13:11:23 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:46483) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g6fFT-0007te-4G for guix-patches@gnu.org; Sun, 30 Sep 2018 13:11:15 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 2CA613DD; Sun, 30 Sep 2018 13:11:11 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 30 Sep 2018 13:11:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=content-transfer-encoding:date:from:message-id:mime-version :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=5EI H2EG5JJFH1fyeslScKERf7ifXaf+uN03hQF4MZQQ=; b=WiZkto8AgMBZT8HhvNI aGjia2a+OuoAdK2XP7DTPfNPPwwN1mSD4IU0rzlMTlRhR9jeN4a7sdDJPRc6tzMz g0KdNg240dpM//Ggl0SYDmAUW0Jecyzy7n0bfOZ2dBKSLyNcf8I5vpq72wyETIlx LNJ4qjFh7OeWDSLUlRtAT/Ps= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=5EIH2EG5JJFH1fyeslScKERf7ifXaf+uN03hQF4MZ QQ=; b=SUkZtQBAaU+za2HYIYovtOatdVEDV4wB4e3GaDu6pjthW45GtKVYsbxaN 04d7iTxtFFgzoachN9ybeD2R82quHHBMCWNyH9X6j1HEiomUjZRRhwzJGv2e6qYp G0uw65tNJP8cgLHJBxArq3ZN+ZuD/XS64FwVzecg5MVqCa8r+KrqRsW/GGe/Z1j8 6jvF9rryqPi5qAzkKBjSj+prgFWhIZgXwrZlvJ0VkRqPeRuQXrmItgONMjnLiTUh zJQHKJ60upbWhXUhQojB4Psnk3H/IiHMjKHvG7RF8eQT0PfGj6EGFSeo73aPA/jo JHx+sa7rxkYKxiBIHCXQ9HdXiuAaw== X-ME-Proxy: X-ME-Sender: Received: from jasmine.lan (unknown [172.58.201.134]) by mail.messagingengine.com (Postfix) with ESMTPA id 61EA2102D6 for ; Sun, 30 Sep 2018 13:11:09 -0400 (EDT) From: Leo Famulari Date: Sun, 30 Sep 2018 13:11:04 -0400 Message-Id: <3482c0f2e1bd188df59bf7d6d3a7522914e5e19b.1538327381.git.leo@famulari.name> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) 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 From unknown Sat Jun 21 12:35:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#32887] [v2] gnu: Audacity: Use glib-or-gtk-build-system instead of a wrapper. References: <3482c0f2e1bd188df59bf7d6d3a7522914e5e19b.1538327381.git.leo@famulari.name> In-Reply-To: <3482c0f2e1bd188df59bf7d6d3a7522914e5e19b.1538327381.git.leo@famulari.name> Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Oct 2018 21:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32887 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 32887@debbugs.gnu.org Received: via spool by 32887-submit@debbugs.gnu.org id=B32887.153842813327918 (code B ref 32887); Mon, 01 Oct 2018 21:09:02 +0000 Received: (at 32887) by debbugs.gnu.org; 1 Oct 2018 21:08:53 +0000 Received: from localhost ([127.0.0.1]:33550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g75Qx-0007GC-FG for submit@debbugs.gnu.org; Mon, 01 Oct 2018 17:08:51 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:45983) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g75Qv-0007G3-2d for 32887@debbugs.gnu.org; Mon, 01 Oct 2018 17:08:50 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id B716A21FB0; Mon, 1 Oct 2018 17:08:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 01 Oct 2018 17:08:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=content-transfer-encoding:date:from:message-id:mime-version :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=Eiq S8K5VzIsqCU8kkopO0np77AVNVRBR0NEPq+b4VYs=; b=XOx26rxKECxGuha8JG+ jnCALzrTgt93/YQoUH5ZwgeJAL8OjZjtTXOH4i/067J3xU/aRm3dlisa5sgujziL VUs63ouQzvAU0ZTYS4fBv7Xk/tKMGYiv4EO8n8vfPgeyTHe1t5qavY/nsfkmJ69K LoJOOt4O4EYiHzX42QEUfaBw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=EiqS8K5VzIsqCU8kkopO0np77AVNVRBR0NEPq+b4V Ys=; b=QZ+m3W7dwaNkWgUf0iHPhNFXGbwR0s1z34RSRiRfamwf7On+K10b5Oy3o sSSS0s9VNnf+YGMBTMsb3v4AKSm8VYqUoY8u8z0fCoHEZh9PZFaa/h6YpRE5ZRJF vbLrofDGZ37HDd2XNULiUGgCPxnJOzmfy7SStl2kegnnMaa8HGCzNzGX/yYvZr0T cY7O/l+eDyLdzIfI53MGNji8cxfX4t+0Vg305gRbGVyCjDiyqMcAJkfAPCombE6F 4MXNiTouMLSDe14dT14/iWLW/uhyWsMNwBj6bgmssle6Cmc+shT7qkUvQFhINzY9 NVFZOm5pqn2LaYojGfAFsUEJu3e5g== X-ME-Sender: X-ME-Proxy: Received: from jasmine.lan (c-76-124-202-137.hsd1.pa.comcast.net [76.124.202.137]) by mail.messagingengine.com (Postfix) with ESMTPA id 0BBCEE47CA for <32887@debbugs.gnu.org>; Mon, 1 Oct 2018 17:08:45 -0400 (EDT) From: Leo Famulari Date: Mon, 1 Oct 2018 17:08:41 -0400 Message-Id: <60f388a7c808d2751e7cd80956558182807a5b0b.1538428084.git.leo@famulari.name> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) The reason the build failed unexpectedly with glib-or-gtk-build-system is that that build system sets #:out-of-source #t by default, unlike the gnu-build-system. The Audacity build process doesn't handle this properly when generating Makefiles for the translations. Audacity works for me with this patch. I haven't pushed yet because I don't know why glib-or-gtk-build-system builds out of source by default, so I don't know if it's really a good idea to do it this way. * gnu/packages/audio.scm (audacity)[build-system]: Use glib-or-gtk-build-system. [arguments]: Remove the 'wrap-program' phase. Set #:out-of-source #f. --- gnu/packages/audio.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 446587273..933138e11 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+) @@ -410,16 +410,10 @@ engineers, musicians, soundtrack editors and composers.") (("../lib-src/portmidi/porttime/porttime.h") "porttime.h")) (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")))) #t))) + ;; The translation Makefile generation is performed improperly for + ;; out-of-tree builds. + #:out-of-source? #f ;; The test suite is not "well exercised" according to the developers, ;; and fails with various errors. See ;; . -- 2.19.0 From unknown Sat Jun 21 12:35:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#32887] [v2] gnu: Audacity: Use glib-or-gtk-build-system instead of a wrapper. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Oct 2018 09:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32887 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 32887@debbugs.gnu.org Received: via spool by 32887-submit@debbugs.gnu.org id=B32887.153847409011410 (code B ref 32887); Tue, 02 Oct 2018 09:55:01 +0000 Received: (at 32887) by debbugs.gnu.org; 2 Oct 2018 09:54:50 +0000 Received: from localhost ([127.0.0.1]:33810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g7HOE-0002xx-Fx for submit@debbugs.gnu.org; Tue, 02 Oct 2018 05:54:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44967) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g7HOC-0002xl-UG for 32887@debbugs.gnu.org; Tue, 02 Oct 2018 05:54:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7HNt-0006g9-9l for 32887@debbugs.gnu.org; Tue, 02 Oct 2018 05:54:38 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7HNs-0006g1-T2; Tue, 02 Oct 2018 05:54:29 -0400 Received: from [193.50.110.166] (port=57860 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1g7HNs-0004oT-IZ; Tue, 02 Oct 2018 05:54:28 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <3482c0f2e1bd188df59bf7d6d3a7522914e5e19b.1538327381.git.leo@famulari.name> <60f388a7c808d2751e7cd80956558182807a5b0b.1538428084.git.leo@famulari.name> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 11 =?UTF-8?Q?Vend=C3=A9miaire?= an 227 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 02 Oct 2018 11:54:27 +0200 In-Reply-To: <60f388a7c808d2751e7cd80956558182807a5b0b.1538428084.git.leo@famulari.name> (Leo Famulari's message of "Mon, 1 Oct 2018 17:08:41 -0400") Message-ID: <87ftxor7vw.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hello, Leo Famulari skribis: > The reason the build failed unexpectedly with glib-or-gtk-build-system > is that that build system sets #:out-of-source #t by default, unlike the= =20 > gnu-build-system. > > The Audacity build process doesn't handle this properly when generating > Makefiles for the translations. Good catch! > Audacity works for me with this patch. I haven't pushed yet because I > don't know why glib-or-gtk-build-system builds out of source by default, > so I don't know if it's really a good idea to do it this way. > > * gnu/packages/audio.scm (audacity)[build-system]: Use glib-or-gtk-build-= system. > [arguments]: Remove the 'wrap-program' phase. Set #:out-of-source #f. I think this patch is definitely OK, and I suppose we could even switch =E2=80=98glib-or-gtk-build-system=E2=80=99 to default to #:out-of-source #f= . I don=E2=80=99t think there was any justification, it could have been cut-n-paste. Thanks, Ludo=E2=80=99. From unknown Sat Jun 21 12:35:56 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Leo Famulari Subject: bug#32887: closed (Re: [bug#32887] [v2] gnu: Audacity: Use glib-or-gtk-build-system instead of a wrapper.) Message-ID: References: <20181002183516.GA15069@jasmine.lan> <3482c0f2e1bd188df59bf7d6d3a7522914e5e19b.1538327381.git.leo@famulari.name> X-Gnu-PR-Message: they-closed 32887 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 32887@debbugs.gnu.org Date: Tue, 02 Oct 2018 18:36:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1538505363-32639-1" This is a multi-part message in MIME format... ------------=_1538505363-32639-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #32887: [PATCH] gnu: Audacity: Use glib-or-gtk-build-system instead of a wr= apper. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 32887@debbugs.gnu.org. --=20 32887: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32887 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1538505363-32639-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 32887-done) by debbugs.gnu.org; 2 Oct 2018 18:35:21 +0000 Received: from localhost ([127.0.0.1]:34631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g7PVx-0008TB-6J for submit@debbugs.gnu.org; Tue, 02 Oct 2018 14:35:21 -0400 Received: from wnew1-smtp.messagingengine.com ([64.147.123.26]:53067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g7PVv-0008T4-Sa for 32887-done@debbugs.gnu.org; Tue, 02 Oct 2018 14:35:20 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id C17879B9; Tue, 2 Oct 2018 14:35:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 02 Oct 2018 14:35:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= mesmtp; bh=NueIkzej5zfTvC6QYXVZvs3ytJkv2GhWoJgz5+nJnsc=; b=ZEhTn d+UY6PNmAH5+6Vs7haXKynTcAQeolgr5lk5D5WtR+BO3i0z/KuYnz2OFhbvt0oWp NcVONKUVi+/O2blxtYQ6yZeFsgGR/9kYIPCtSEB+LLWBxdCcPgVArSHhZkLVKzK1 oF1opVs0G8udZWtJDqgOMlrCvp4/8QnkwmX9U4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=NueIkzej5zfTvC6QYXVZvs3ytJkv2 GhWoJgz5+nJnsc=; b=ZGD4aTPO4OCjA3f5PgAlH6LV//kI5oS1hwDbhyfcSanIM k44CHmybBRYX3nyqBk6m2A2VJeAc3Bqt+m8KmS7okm9FHFXxCdASAeSwRybvZLO/ op4Kc8WFeIl2byuP6jDYmtNqDKdSzCzBebc+eY14fIjRVXJ9ZhwUt8YfH5Vviv+b oX3wVFjruj6+v3UN7Mj8D7vnZ6ynvSwd99QskZRkd3+A7CiWd4B1hXVWaFPSELxg 5W7D9Djvr/npJcAfoDxEVYlVdkHoiCQ68CfPqfmK2BhMMBi5puZZOmPNC+jwevGm l1u8J3KcCKXifxOqFZdyY0hiMuzVN7ooplQYbJG3g== X-ME-Sender: X-ME-Proxy: Received: from localhost (unknown [172.58.201.36]) by mail.messagingengine.com (Postfix) with ESMTPA id F0853E4074; Tue, 2 Oct 2018 14:35:16 -0400 (EDT) Date: Tue, 2 Oct 2018 14:35:16 -0400 From: Leo Famulari To: Ludovic =?iso-8859-1?Q?Court=E8s?= Subject: Re: [bug#32887] [v2] gnu: Audacity: Use glib-or-gtk-build-system instead of a wrapper. Message-ID: <20181002183516.GA15069@jasmine.lan> References: <3482c0f2e1bd188df59bf7d6d3a7522914e5e19b.1538327381.git.leo@famulari.name> <60f388a7c808d2751e7cd80956558182807a5b0b.1538428084.git.leo@famulari.name> <87ftxor7vw.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7JfCtLOvnd9MIVvH" Content-Disposition: inline In-Reply-To: <87ftxor7vw.fsf@gnu.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 32887-done Cc: 32887-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 02, 2018 at 11:54:27AM +0200, Ludovic Court=C3=A8s wrote: > I think this patch is definitely OK, and I suppose we could even switch > =E2=80=98glib-or-gtk-build-system=E2=80=99 to default to #:out-of-source = #f. I don=E2=80=99t > 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'. --7JfCtLOvnd9MIVvH Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAluzumMACgkQJkb6MLrK fwixrA/8DXyNL4tVn5kTarYOPes7THrneOlfc750LG3KMTCbsqaFHVxb45OfRxzI Afs7lx8p7lfWDV8ZyhkkCOIjng4Tgn0kaiVS9z1Vvnyk+7Fd41ckg2VqO8Hqmuxe bpWUOi7LG3DVSR9YmI5YDE6PdoBTg9QvXDkItskBUN91zCzNNBqMHdqEwoJJleCc CvVK3qUSFKiMeFvXGiNxHg8oR2ZtjGDXT7muQuEaJXitEguEF2ZSdQkVp8ipeJK3 zvjsocjekWZkFU8UFp9qr03XVdyAW7oI5Yz3IhI7x+5TnYo0JD3sJGKeM5zYmwZM 4wbhew4Ch4rteaIiH2iEtIanrZp1z1vI8/lTUxW/up4t0KTnXjPGOhOw8aPZXq+u aKdw5kAplNHOakP+ELgQltjvCGc1ClUbgj5/14QfdF4R5Yfy/RlP1U7uPwVKY1dR 2zp5xjkqA0sP/8zd5Lh/T3Fmdf/xnvCppjuY1AsZw94d9oOElGlFdfpJjVPTo6Ly VrltkdBtGMulpUGk7OROMD6Fy0qTdMaz9ILiLbeg5IME24uGyNghNVyIgtb31tSm zL+o3IhnFEMmGRUc3dgWdvQ5Mt/YQVI/VrQH8OMiSOTvAtAgGkDdxeyhrSVI8Vbb +QcDzFsi69KnFsWxPQLV8gUrKwjOUcgw39uEUb+U8VhXQhuZxk0= =nhbR -----END PGP SIGNATURE----- --7JfCtLOvnd9MIVvH-- ------------=_1538505363-32639-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 30 Sep 2018 17:11:39 +0000 Received: from localhost ([127.0.0.1]:60166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g6fFr-0008Eo-1W for submit@debbugs.gnu.org; Sun, 30 Sep 2018 13:11:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g6fFp-0008Ea-15 for submit@debbugs.gnu.org; Sun, 30 Sep 2018 13:11:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6fFg-0007yM-Hd for submit@debbugs.gnu.org; Sun, 30 Sep 2018 13:11:31 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42356) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g6fFf-0007xy-AI for submit@debbugs.gnu.org; Sun, 30 Sep 2018 13:11:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6fFe-000636-He for guix-patches@gnu.org; Sun, 30 Sep 2018 13:11:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6fFX-0007vO-3C for guix-patches@gnu.org; Sun, 30 Sep 2018 13:11:23 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:46483) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g6fFT-0007te-4G for guix-patches@gnu.org; Sun, 30 Sep 2018 13:11:15 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 2CA613DD; Sun, 30 Sep 2018 13:11:11 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 30 Sep 2018 13:11:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=content-transfer-encoding:date:from:message-id:mime-version :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=5EI H2EG5JJFH1fyeslScKERf7ifXaf+uN03hQF4MZQQ=; b=WiZkto8AgMBZT8HhvNI aGjia2a+OuoAdK2XP7DTPfNPPwwN1mSD4IU0rzlMTlRhR9jeN4a7sdDJPRc6tzMz g0KdNg240dpM//Ggl0SYDmAUW0Jecyzy7n0bfOZ2dBKSLyNcf8I5vpq72wyETIlx LNJ4qjFh7OeWDSLUlRtAT/Ps= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=5EIH2EG5JJFH1fyeslScKERf7ifXaf+uN03hQF4MZ QQ=; b=SUkZtQBAaU+za2HYIYovtOatdVEDV4wB4e3GaDu6pjthW45GtKVYsbxaN 04d7iTxtFFgzoachN9ybeD2R82quHHBMCWNyH9X6j1HEiomUjZRRhwzJGv2e6qYp G0uw65tNJP8cgLHJBxArq3ZN+ZuD/XS64FwVzecg5MVqCa8r+KrqRsW/GGe/Z1j8 6jvF9rryqPi5qAzkKBjSj+prgFWhIZgXwrZlvJ0VkRqPeRuQXrmItgONMjnLiTUh zJQHKJ60upbWhXUhQojB4Psnk3H/IiHMjKHvG7RF8eQT0PfGj6EGFSeo73aPA/jo JHx+sa7rxkYKxiBIHCXQ9HdXiuAaw== X-ME-Proxy: X-ME-Sender: Received: from jasmine.lan (unknown [172.58.201.134]) by mail.messagingengine.com (Postfix) with ESMTPA id 61EA2102D6 for ; Sun, 30 Sep 2018 13:11:09 -0400 (EDT) From: Leo Famulari To: guix-patches@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 Message-Id: <3482c0f2e1bd188df59bf7d6d3a7522914e5e19b.1538327381.git.leo@famulari.name> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) 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 ------------=_1538505363-32639-1-- From unknown Sat Jun 21 12:35:56 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#32887] [v2] gnu: Audacity: Use glib-or-gtk-build-system instead of a wrapper. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Oct 2018 09:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32887 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 32887-done@debbugs.gnu.org Received: via spool by 32887-done@debbugs.gnu.org id=D32887.15386447816123 (code D ref 32887); Thu, 04 Oct 2018 09:20:03 +0000 Received: (at 32887-done) by debbugs.gnu.org; 4 Oct 2018 09:19:41 +0000 Received: from localhost ([127.0.0.1]:36334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g7znJ-0001ah-8Z for submit@debbugs.gnu.org; Thu, 04 Oct 2018 05:19:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46071) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1g7znH-0001aS-Ir for 32887-done@debbugs.gnu.org; Thu, 04 Oct 2018 05:19:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7zn9-0006gn-4p for 32887-done@debbugs.gnu.org; Thu, 04 Oct 2018 05:19:34 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7zn4-0006ce-Fy; Thu, 04 Oct 2018 05:19:28 -0400 Received: from [193.50.110.126] (port=51536 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1g7zn4-0008BB-7i; Thu, 04 Oct 2018 05:19:26 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <3482c0f2e1bd188df59bf7d6d3a7522914e5e19b.1538327381.git.leo@famulari.name> <60f388a7c808d2751e7cd80956558182807a5b0b.1538428084.git.leo@famulari.name> <87ftxor7vw.fsf@gnu.org> <20181002183516.GA15069@jasmine.lan> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 13 =?UTF-8?Q?Vend=C3=A9miaire?= an 227 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 04 Oct 2018 11:19:24 +0200 In-Reply-To: <20181002183516.GA15069@jasmine.lan> (Leo Famulari's message of "Tue, 2 Oct 2018 14:35:16 -0400") Message-ID: <87woqyxe5f.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Leo Famulari skribis: > On Tue, Oct 02, 2018 at 11:54:27AM +0200, Ludovic Court=C3=A8s wrote: >> I think this patch is definitely OK, and I suppose we could even switch >> =E2=80=98glib-or-gtk-build-system=E2=80=99 to default to #:out-of-source= #f. I don=E2=80=99t >> 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'. Excellent, thanks! Ludo'.