From patchwork Thu Feb 23 06:37:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 47277 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 0FB2216BF1; Fri, 24 Feb 2023 17:42:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 0810B16BF4 for ; Fri, 24 Feb 2023 17:42:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVc57-0000Ux-0n; Fri, 24 Feb 2023 12:42:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVc55-0000UZ-Ho for guix-patches@gnu.org; Fri, 24 Feb 2023 12:42:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVc54-0000sI-S7 for guix-patches@gnu.org; Fri, 24 Feb 2023 12:42:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVc54-0004xw-Fl for guix-patches@gnu.org; Fri, 24 Feb 2023 12:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61592] [PATCH v3 2/2] gnu: meld: Use new package style. References: <20230218021218.10783-1-atai@atai.org> In-Reply-To: <20230218021218.10783-1-atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2023 17:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61592 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61592@debbugs.gnu.org Cc: Andy Tai Received: via spool by 61592-submit@debbugs.gnu.org id=B61592.167726049619041 (code B ref 61592); Fri, 24 Feb 2023 17:42:02 +0000 Received: (at 61592) by debbugs.gnu.org; 24 Feb 2023 17:41:36 +0000 Received: from localhost ([127.0.0.1]:38193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVc4e-0004x1-D8 for submit@debbugs.gnu.org; Fri, 24 Feb 2023 12:41:36 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:33571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVc4c-0004wj-Kk for 61592@debbugs.gnu.org; Fri, 24 Feb 2023 12:41:35 -0500 Received: by mail-ed1-f65.google.com with SMTP id ck15so587057edb.0 for <61592@debbugs.gnu.org>; Fri, 24 Feb 2023 09:41:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=o7VrsvQshQR//Wie+r55TKi3ILbmGhqwN95LHI96zgQ=; b=d1DzPFRoI2/8G3e3FiiriMSMTMfSvB0L3oldps1s6clv6SyGRROEBr5huIbBOVhjjH CZSA9C6qEb9m46rxZWIB+7vy1ZmeD83lLOW7WovRR20t4gB2v1gsvnwo1Qr5X8TFrl0X M/90hzSFmX25pCHUGz+bOgg3M9iTsFLfAxTziRamS9Ne4nCemdlJykKxmXZrKHpVHG3p Re4Xn63WooaK3jsuy2zGHqBQyWpxSHIdd0QgOuHp4X2UWyoOM58RpixrWVRZa8wFJf9s mp4Y/4E+1apxrbW4inNHzt67nd8bJdMvZ19lEP7EYRKZ3Cm9wjSYguR5xLTN3Ht8OHpj Obtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=o7VrsvQshQR//Wie+r55TKi3ILbmGhqwN95LHI96zgQ=; b=lyE1wVXkJGoTtibMYqTmGGgIh+zmuo7oN2b+F5jeKtMU2bIMe3JZvdWwL4tBuPQeTJ pytsaCYHenb+91XbUAiunmZnaoilIEuvNiXO0ymZ5uu/x93P470axn/AjUgCMwKZm8id yS/xa8KmOHf+yF/fyrQSufQZto78qkRPOYAlEJMLrx2UaAvrBIpo5KaZ2cdudnPwNHJf oiC4ygfJydA/MKcHrS/NwpUZLayscdileiNwyDhOdYZCKyeDn8R/1SDu86rIUHWmFmIo 9RWX7SQWk5TBAKFmYFN2b8ovxIH80SPCVRDESUSGoNaac1rHFJWvUnQvUaeykuh3HK2U rIdg== X-Gm-Message-State: AO0yUKVWoPtzoxOWtY/4CmfveU9s8yw3pN4Bu4WakOizkkQzcJao3PA4 Qbxeh71eToop4/7ViBFGIohvJ0LFjGnq1Q== X-Google-Smtp-Source: AK7set+InI5HyjWTVRZcu6u9aglFGLg4k3p7Pc5Rqpl4uop0DID9fcgweRVTr+R/GdO+/8HwLRmwVg== X-Received: by 2002:a17:907:97c3:b0:8af:ef00:b853 with SMTP id js3-20020a17090797c300b008afef00b853mr31218541ejc.73.1677260488850; Fri, 24 Feb 2023 09:41:28 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id fi9-20020a170906da0900b008b26f3d45fbsm9925821ejb.143.2023.02.24.09.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 09:41:28 -0800 (PST) From: Andy Tai X-Google-Original-From: Andy Tai Date: Wed, 22 Feb 2023 22:37:36 -0800 Message-ID: <11e9f8f61b36762d05655ea2aafd6542cbb1bdd4.camel@atai.org> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patchutils.scm (meld)[arguments]: Convert to list of G-Expressions. <#:phases>: Drop trailing #t. [inputs, native-inputs]: Drop labels. Signed-off-by: Liliana Marie Prikler --- gnu/packages/patchutils.scm | 74 ++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index fd1ba83b3c..05a9a62dbf 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -232,50 +232,50 @@ (define-public meld (base32 "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z")))) (build-system meson-build-system) (native-inputs - `(("desktop-file-utils" ,desktop-file-utils) - ("intltool" ,intltool) - ("itstool" ,itstool) - ("xmllint" ,libxml2) - ("glib-compile-schemas" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("python" ,python))) + (list desktop-file-utils + intltool + itstool + libxml2 + `(,glib "bin") ; for glib-compile-schemas + gobject-introspection + pkg-config + python)) (inputs - `(("bash-minimal" ,bash-minimal) - ("python" ,python) - ("python-cairo" ,python-pycairo) - ("python-gobject" ,python-pygobject) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtksourceview" ,gtksourceview-4))) + (list bash-minimal + python + python-pycairo + python-pygobject + gsettings-desktop-schemas + gtksourceview-4)) (propagated-inputs (list dconf)) (arguments - `(#:glib-or-gtk? #t - #:imported-modules (,@%meson-build-system-modules + (list + #:glib-or-gtk? #t + #:imported-modules `(,@%meson-build-system-modules (guix build python-build-system)) - #:modules ((guix build meson-build-system) + #:modules '((guix build meson-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. - (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") (which "true"))))) - (add-after 'install 'copy-styles - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((styles "/share/gtksourceview-4/styles")) - (copy-recursively - (string-append (assoc-ref inputs "gtksourceview") styles) - (string-append (assoc-ref outputs "out") styles)) - #t))) - (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/meld") - `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") - ,(python:site-packages inputs outputs))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") (which "true"))))) + (add-after 'install 'copy-styles + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((styles "/share/gtksourceview-4/styles")) + (copy-recursively + (string-append (assoc-ref inputs "gtksourceview") styles) + (string-append (assoc-ref outputs "out") styles))))) + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/meld") + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") + ,(python:site-packages inputs outputs))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (home-page "https://meldmerge.org/") (synopsis "Compare files, directories and working copies") (description "Meld is a visual diff and merge tool targeted at