From patchwork Tue Oct 11 18:40:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Streit X-Patchwork-Id: 43331 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 9E73E27BBE9; Tue, 11 Oct 2022 19:41:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E8E5A27BBEA for ; Tue, 11 Oct 2022 19:41:26 +0100 (BST) Received: from localhost ([::1]:47890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiKBy-0005ry-1F for patchwork@mira.cbaines.net; Tue, 11 Oct 2022 14:41:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiKBb-0005px-1I for guix-patches@gnu.org; Tue, 11 Oct 2022 14:41:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55748) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiKBa-00076g-Pd for guix-patches@gnu.org; Tue, 11 Oct 2022 14:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiKBa-0005Bm-Jr for guix-patches@gnu.org; Tue, 11 Oct 2022 14:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58450] [PATCH] gnu: mcg: Update to 3.1. Resent-From: simon@netpanic.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Oct 2022 18:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58450 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58450@debbugs.gnu.org Cc: Simon Streit X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166551362819866 (code B ref -1); Tue, 11 Oct 2022 18:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Oct 2022 18:40:28 +0000 Received: from localhost ([127.0.0.1]:54824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiKB1-0005AM-Uw for submit@debbugs.gnu.org; Tue, 11 Oct 2022 14:40:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:40730) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiKAz-0005AA-Re for submit@debbugs.gnu.org; Tue, 11 Oct 2022 14:40:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiKAz-0005ZF-Ku for guix-patches@gnu.org; Tue, 11 Oct 2022 14:40:25 -0400 Received: from smtprelay02.ispgateway.de ([80.67.31.25]:43792) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiKAx-0006yF-Rh for guix-patches@gnu.org; Tue, 11 Oct 2022 14:40:25 -0400 Received: from [91.40.240.114] (helo=motorball.wh6.home.arpa) by smtprelay02.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1oiKB1-0001Cn-Vx; Tue, 11 Oct 2022 20:40:28 +0200 From: simon@netpanic.org Date: Tue, 11 Oct 2022 20:40:15 +0200 Message-Id: <20221011184015.24143-1-simon@netpanic.org> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn Received-SPF: none client-ip=80.67.31.25; envelope-from=simon@netpanic.org; helo=smtprelay02.ispgateway.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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: Simon Streit * gnu/packages/mpd.scm (mcg): Update to 3.1. [native-inputs]: Use the new inputs style. Add "desktop-file-utils", "gettext-minimal". [inputs]: Add "python". [build-system]: Change to meson-build-system. [arguments]<#:imported-modules,#:modules>: Remove. <#:glib-or-gtk?>: Add #t. Delete custom phase 'glib-or-gtk-wrap. --- gnu/packages/mpd.scm | 53 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index edec855fff..9a7bbbfd1d 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -483,31 +483,32 @@ (define-public cantata (define-public mcg (package (name "mcg") - (version "2.1.2") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://gitlab.com/coderkun/mcg") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01iqxydssxyi4s644dwl64vm7xhn0szd99hdpywbipvb7kwp5196")))) - (build-system python-build-system) - (native-inputs - `(("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) - (inputs - (list avahi dconf gsettings-desktop-schemas gtk+ python-pygobject)) + (version "3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/coderkun/mcg") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "087d3gvx8z1yj7rg9d9h1x02vkw57h4v6xf5pxqyhqyk2435kk17")))) + (build-system meson-build-system) + (native-inputs (list desktop-file-utils + gettext-minimal + `(,glib "bin") + gobject-introspection + `(,gtk+ "bin") + pkg-config)) + (inputs (list avahi + bash-minimal + dconf + gsettings-desktop-schemas + gtk+ + python + python-pygobject)) (arguments - `(#:imported-modules ((guix build glib-or-gtk-build-system) - ,@%python-build-system-modules) - #:modules ((guix build python-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) - (guix build utils)) + `(#:glib-or-gtk? #t #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program @@ -516,9 +517,7 @@ (define-public mcg "/bin/mcg"))) (wrap-program prog `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))) - (add-after 'wrap-program 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) (synopsis "Covergrid for the MPD") (description "mcg (CoverGrid) is a client for the Music Player Daemon (MPD), focusing