From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id sAPDFdm4RWMaXgEAbAwnHQ (envelope-from ) for ; Tue, 11 Oct 2022 20:41:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 4ELMFdm4RWP20AAA9RJhRA (envelope-from ) for ; Tue, 11 Oct 2022 20:41:29 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1B97DD137 for ; Tue, 11 Oct 2022 20:41:29 +0200 (CEST) Received: from localhost ([::1]:47890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiKC0-0005ry-4E for larch@yhetil.org; Tue, 11 Oct 2022 14:41:28 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665513689; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=KtxR25Q9Bu5qPRNzGvnrV6qIJIh/6fH8CxhhSBRmLqw=; b=YnUxTAj8xuaY2xM3sJViEVwR6H/Ham5tTfZnd53OUn1lFAkLJIzkX+eigNtb2s5RSGl+K4 oA1VV2i3WhPO965WEuuqHxOsPqDiu3BMnVl+Bzi6XBsl0gt5uNKpwyivnDKlmHbcQzdZjp 2i6F2zGHqUUQXcd0/iJ2Vt7oXrIHO5XlFbM0eegzYn2IDfuEpw5jktVE6fDs2tlOobsu8z tHXyZEaRzeNspNWEw6VA1fmlKyCV/CY0WQ/QwNOeGdva9R88E0T2YKp5H+fWufGox/Zqw/ 3wBBGkAoVIDwsZ1MY/EUMPw613j77xv/3TWH7EsWXZrApg8baZ9ugZe3v5pMDw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665513689; a=rsa-sha256; cv=none; b=nIEabJIC88J1CIksEij5/Ha1OZMd/EhLcDo44pefUMn8FTQ/BQQPu20KNSOF7TBP1hmI7W WANKL28/9HSCDh4p0ox6J76Q9VbGv+/D51JKP6x2sU3JBdPaQ6wkGFPKk/mSp/jzdL+pVb KAa9en+hXUhx7TSzGPvvgMv7T52/cd7TiriIfRiSGGxxKDMSijh+RTiKbCS94C7e9w6iAt vfvdK79QRimI/M+lQUw8JqsQUefNoLGJFCQvaZEQe2xp6ToozLmJb/5/GlUIotJcID73V3 NWenRIYCmFBaTt+VDFp27Mj76W+NxdDaGniseKZPFQr0a449TFgqo41k538ZHA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.59 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 1B97DD137 X-Spam-Score: -0.59 X-Migadu-Scanner: scn0.migadu.com X-TUID: INDwxk7KXMDG 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 -- 2.37.2