From patchwork Sat Dec 8 08:00:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 404 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3DD0316749; Sat, 8 Dec 2018 08:01:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,SINGLE_HEADER_3K,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id C49C516431 for ; Sat, 8 Dec 2018 08:01:10 +0000 (GMT) Received: from localhost ([::1]:49906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gVXXy-0000kC-3N for patchwork@mira.cbaines.net; Sat, 08 Dec 2018 03:01:10 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33671] [PATCH 1/3] gnu: ardour: Add a phase to install Freedesktop files. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Dec 2018 08:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33671 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33671@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15442560546076 (code B ref -1); Sat, 08 Dec 2018 08:01:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Dec 2018 08:00:54 +0000 Received: from localhost ([127.0.0.1]:37538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gVXXi-0001Zu-C5 for submit@debbugs.gnu.org; Sat, 08 Dec 2018 03:00:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gVXXg-0001Zi-Fj for submit@debbugs.gnu.org; Sat, 08 Dec 2018 03:00:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gVXXZ-0007eQ-5z for submit@debbugs.gnu.org; Sat, 08 Dec 2018 03:00:46 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:41397) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gVXXY-0007e4-CI for submit@debbugs.gnu.org; Sat, 08 Dec 2018 03:00:45 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:openpgp:autocrypt:message-id:date:user-agent :mime-version:content-language; bh=WNgSwbLpTjPg6yVvTSdH/dw7i4ZB7L36YmgktvW0RBE=; b=DNkaIz+G6W19krOKf7xpBi3jiQMiVZLz190H+Unv3YjPAK392irtY6bh1oFWlQCQQD Oz6Jiq/N+HaYXCynTTc8LAFH2VWszWTOJ5+mF/dfW/v3z+7ghih+a9Du9h5LRFMOSq2m HkbYtdGRJjYaBXuR1SoZxl3xYc4yqClhMT5Q2nZoT/9ibYaA4Qwf8lC4EID2rD+OcAIA PUz8MMoeA2Ck3S6udIatOxUHT3WtWNL0OqcqzjYj3iqXc3aFFPr7HwXsIs+4VnqGVkEv w1HzLJGxyhCfoZ2ITh9q2o5JzL9FJWeiY2oIcpDO+U/GCOdUa6nKtpI0yiEi823njocf aBvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:openpgp:autocrypt:message-id :date:user-agent:mime-version:content-language; bh=WNgSwbLpTjPg6yVvTSdH/dw7i4ZB7L36YmgktvW0RBE=; b=cBdTOqpw42L3HIXfsEMuH7kiwFQRBRCYbXsW2coAOm+JwvBLzTR52nFsZ6nTaN8XBQ 6/WWACZNf9Tr6zhnR3ZvQME20o9SCA3R0K38DBQ2u3pWIMDDPt9/+jkLmnjJQTgK/++L Dd0k2lRF6KnQWO8xppfSOLnNpXhSbE8ffzAtEKGvLQDx3TRKx1KzDPbPEmw0nnNJ+Zs7 8BZzkCapIweFNAY2e4kOFlF3VFMBzHetvnmnodmpOtwRl2BWjdC7Nfzashx++05Gyo3V JY+mcr+7ZE7EilXffoUpWQQa5AFYtWsRj2+DZLGN+R9z5AUF3S8FgM/fbYtWTbMPPiCe He0g== X-Gm-Message-State: AA+aEWbF2yf2qHlHgBxkdkwTx157X1/e7A2WEj4tklI4HkZdElDiFQDr 0NGqfhR1e/LR3Zsy2NqZogzAPmQ3 X-Google-Smtp-Source: AFSGD/XTWHDPLuOLn1pVwSUeuCuhcvyj9jZuwhXFrUPnrOmXTLxr+/WdBdxsj0NbV/KUulU/JzYr8A== X-Received: by 2002:a24:6c46:: with SMTP id w67mr4433380itb.112.1544256037733; Sat, 08 Dec 2018 00:00:37 -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 Openpgp: preference=signencrypt Autocrypt: addr=brendan.tildesley@gmail.com; keydata= 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 e3R83sKQE9go9gSgDEAIZs6YlQ== Message-ID: <79055647-0d66-755e-1220-d55e42aa55a7@gmail.com> Date: Sat, 8 Dec 2018 19:00:29 +1100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.0 MIME-Version: 1.0 Content-Language: en-AU X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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