From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gVXXv-0000jS-8G for guix-patches@gnu.org; Sat, 08 Dec 2018 03:01:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gVXXr-0007jA-6g for guix-patches@gnu.org; Sat, 08 Dec 2018 03:01:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:33280) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gVXXp-0007ij-V6 for guix-patches@gnu.org; Sat, 08 Dec 2018 03:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gVXXp-0001aP-Ra for guix-patches@gnu.org; Sat, 08 Dec 2018 03:01:01 -0500 Subject: [bug#33671] [PATCH 1/3] gnu: ardour: Add a phase to install Freedesktop files. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gVXXX-0000gZ-5d for guix-patches@gnu.org; Sat, 08 Dec 2018 03:00:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gVXXT-0007cS-2x for guix-patches@gnu.org; Sat, 08 Dec 2018 03:00:43 -0500 Received: from mail-it1-x136.google.com ([2607:f8b0:4864:20::136]:32943) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gVXXS-0007c2-RG for guix-patches@gnu.org; Sat, 08 Dec 2018 03:00:39 -0500 Received: by mail-it1-x136.google.com with SMTP id m8so3383912itk.0 for ; Sat, 08 Dec 2018 00:00:38 -0800 (PST) Received: from [10.1.1.62] ([14.2.153.161]) by smtp.googlemail.com with ESMTPSA id a12sm2894656ita.17.2018.12.08.00.00.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Dec 2018 00:00:37 -0800 (PST) From: Brendan Tildesley Message-ID: <79055647-0d66-755e-1220-d55e42aa55a7@gmail.com> Date: Sat, 8 Dec 2018 19:00:29 +1100 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------ED79EE307940EABF83FE1BC2" Content-Language: en-AU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33671@debbugs.gnu.org This is a multi-part message in MIME format. --------------ED79EE307940EABF83FE1BC2 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit --------------ED79EE307940EABF83FE1BC2 Content-Type: text/x-patch; name="0001-gnu-ardour-Add-a-phase-to-install-Freedesktop-files.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-gnu-ardour-Add-a-phase-to-install-Freedesktop-files.pat"; filename*1="ch" >From 8139a2013cdbb81c8b332ed7cd6e88212d6354d5 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Fri, 7 Dec 2018 22:00:14 +1100 Subject: [PATCH 1/3] gnu: ardour: Add a phase to install Freedesktop files. * gnu/packages/audio.scm (ardour): [arguments]: - Correct comment about --freedesktop flag. - Adjust pretty printing for consistency. - Add 'install-free-desktop-files phase to actually install the files that were build. Fixes bug#33585 reported by baconicsynergy. --- gnu/packages/audio.scm | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index a65cfa238e..3d77987062 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -229,13 +229,28 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")) (arguments `(#:configure-flags '("--cxx11" ; required by gtkmm "--no-phone-home" ; don't contact ardour.org - "--freedesktop" ; install .desktop file + "--freedesktop" ; build .desktop file "--test") ; build unit tests #:phases (modify-phases %standard-phases - (add-after - 'unpack 'set-rpath-in-LDFLAGS - ,(ardour-rpath-phase (version-major version)))) + (add-after 'unpack 'set-rpath-in-LDFLAGS + ,(ardour-rpath-phase (version-major version))) + (add-after 'install 'install-freedesktop-files + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (v ,(version-major version))) + (for-each + (lambda (s) + (let ((d (string-append out "/share/icons/hicolor/" s "x" s "/apps"))) + (mkdir-p d) + (copy-file + (string-append "gtk2_ardour/resources/Ardour-icon_" s "px.png") + (string-append d "/ardour" v ".png")))) + '("16" "22" "32" "48" "256")) + (install-file (string-append "build/gtk2_ardour/ardour" v ".desktop") + (string-append out "/share/applications/")) + (install-file (string-append "build/gtk2_ardour/ardour" v ".appdata.xml") + (string-append out "/share/appdata/")))))) #:test-target "test" #:python ,python-2)) (inputs -- 2.19.2 --------------ED79EE307940EABF83FE1BC2--