all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Brendan Tildesley <brendan.tildesley@gmail.com>
To: 33671@debbugs.gnu.org
Subject: [bug#33671] [PATCH 1/3] gnu: ardour: Add a phase to install Freedesktop files.
Date: Sat, 8 Dec 2018 19:00:29 +1100	[thread overview]
Message-ID: <79055647-0d66-755e-1220-d55e42aa55a7@gmail.com> (raw)

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



[-- Attachment #2: 0001-gnu-ardour-Add-a-phase-to-install-Freedesktop-files.patch --]
[-- Type: text/x-patch, Size: 2543 bytes --]

From 8139a2013cdbb81c8b332ed7cd6e88212d6354d5 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
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


             reply	other threads:[~2018-12-08  8:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-08  8:00 Brendan Tildesley [this message]
     [not found] ` <handler.33671.B.15442560546076.ack@debbugs.gnu.org>
2018-12-08  8:02   ` [bug#33671] [PATCH 2/3] gnu: ardour: Add libusb input Brendan Tildesley
2018-12-08  8:03   ` [bug#33671] [PATCH 3/3] gnu: ardour: Sort inputs and native-inputs Brendan Tildesley
2018-12-24 10:08 ` bug#33671: [PATCH 1/3] gnu: ardour: Add a phase to install Freedesktop files Efraim Flashner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=79055647-0d66-755e-1220-d55e42aa55a7@gmail.com \
    --to=brendan.tildesley@gmail.com \
    --cc=33671@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.