From patchwork Thu Sep 15 20:16:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 42690 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 4B21627BBEA; Sat, 17 Sep 2022 22:56:54 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 BAC3A27BBE9 for ; Sat, 17 Sep 2022 22:56:53 +0100 (BST) Received: from localhost ([::1]:35630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZfnw-0002dg-VB for patchwork@mira.cbaines.net; Sat, 17 Sep 2022 17:56:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZfmE-0008Rf-0q for guix-patches@gnu.org; Sat, 17 Sep 2022 17:55:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZfmD-0001ti-Bk for guix-patches@gnu.org; Sat, 17 Sep 2022 17:55:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oZfmD-0007mV-8M for guix-patches@gnu.org; Sat, 17 Sep 2022 17:55:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57889] [PATCH 7/8] gnu: gfeeds: Modernize package description. References: <406e4fd3c75650e148b7ab0a86036b4cff1206c1.camel@gmail.com> In-Reply-To: <406e4fd3c75650e148b7ab0a86036b4cff1206c1.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Sep 2022 21:55:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57889@debbugs.gnu.org Received: via spool by 57889-submit@debbugs.gnu.org id=B57889.166345169729845 (code B ref 57889); Sat, 17 Sep 2022 21:55:05 +0000 Received: (at 57889) by debbugs.gnu.org; 17 Sep 2022 21:54:57 +0000 Received: from localhost ([127.0.0.1]:47313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZfm5-0007lA-9X for submit@debbugs.gnu.org; Sat, 17 Sep 2022 17:54:57 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:34601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZflv-0007jb-8S for 57889@debbugs.gnu.org; Sat, 17 Sep 2022 17:54:47 -0400 Received: by mail-ej1-f66.google.com with SMTP id y3so56728642ejc.1 for <57889@debbugs.gnu.org>; Sat, 17 Sep 2022 14:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date; bh=fFU/GiNejwTwLejJx27z9qYrvicqFakNXhQv4c2vrX4=; b=AqV/ie60CTCaSlVqm1o728fkNBDKgWm4jzhZ9QR9TO978MQCSxU1uMRsgcqo8EOgQq T8+9yfZ4Q2WBbmV5DqbnWCvfX7LtMH2Tcohg3H3SGiegVOmIr9pYlR8Gf8gyj6HCAiYP hP6eZWS7bPgjh7tb+Xuo7zFKzbR4sDyqCNGtH9CjSqalFKUOoCk1ZWGKYSoMmmNHJIb9 uOy/4kkl2VdjDW/KP9aWo2TN0kETftLRwcUtILjmB+Blk6gByY2Hy364l0kUvw+Iln58 l4a0ubLB+vchbD1JM8aBjJd8RdTTz1GmT/4JWyVEOoh4H2njBa+X/ikiABWEfTBi6dVT cR2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date; bh=fFU/GiNejwTwLejJx27z9qYrvicqFakNXhQv4c2vrX4=; b=eU9UMnBT0AQ2cQM+05u1O7XGK/Krjq+sAly1n29DH4sIUulmQPjKoDWm38dH4Lzsaf Nq8eh3JH8OpUEjIUCEZHKi99gAoGPlzA35f9Wt8/hnewrlL/XnEztJ6UEAJ2jILi5L4E hjgpLeeFLfh3+/uMOoehElTF+EbddVj3NB/IYwyd+/v2qEtsI+JMZv7VGQMEgyULFEOc /lmlhEkuJQn162Cd/W+z2jRIcfmCEWRLEOIkarqmu3slKPuRBCvaPkYXCSegrHGER+Xq 8eOTdusAl+/4QABGgg5u5ocDnoAXsU221gpduHEXvPBSmKT2s7UNsy8e1dGSdNcw5o07 JBKQ== X-Gm-Message-State: ACrzQf3O39QJmkkW7zEPPZyE4dXQM+CJODdNCQW9h04Xgg4sRu02wFLO kwby3WfNG9zsnDpnHluKsk6v7XLnpIE= X-Google-Smtp-Source: AMsMyM545Dj6IxqsWBxIbXchjwmFxvpsF12qQzkYoDmIpVdTOkEAVVqLHDoCQmr8rYqwSPmyecxRvA== X-Received: by 2002:a17:907:2e01:b0:77e:d84d:9e07 with SMTP id ig1-20020a1709072e0100b0077ed84d9e07mr7916193ejc.674.1663451681746; Sat, 17 Sep 2022 14:54:41 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q25-20020a17090622d900b00780636a85fasm4485202eja.221.2022.09.17.14.54.41 for <57889@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Sep 2022 14:54:41 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 15 Sep 2022 22:16:55 +0200 Message-ID: <5935608763b0a309d28663bea7af6d7ab79c8b9c.camel@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/syndication.scm (gfeeds)[arguments]: Convert to list of G-Expressions. Drop trailing #t. [native-inputs]: Drop labels. [inputs]: Add bash-minimal. --- gnu/packages/syndication.scm | 52 +++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 5e204c21ad..dcd01d8933 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -26,6 +26,7 @@ (define-module (gnu packages syndication) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system cargo) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) @@ -35,6 +36,7 @@ (define-module (gnu packages syndication) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages build-tools) #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -508,33 +510,33 @@ (define-public gfeeds "045889417506w2l25j7jxx7jfdpfljbirhm1s4whvhk83xap19zb")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-mpv-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gfeeds/confManager.py" - (("mpv") (search-input-file inputs "/bin/mpv"))) - #t)) - (add-after 'unpack 'patch-webkit2-version - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "bin/gfeeds.in" - (("gi\\.require_version\\('WebKit2', '4\\.0'\\)") - "gi.require_version('WebKit2', '4.1')")))) - (add-after 'install 'wrap-gfeeds - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (string-append - (assoc-ref outputs "out") "/bin/gfeeds") - `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) - `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS")))) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-mpv-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gfeeds/confManager.py" + (("mpv") (search-input-file inputs "/bin/mpv"))))) + (add-after 'unpack 'patch-webkit2-version + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "bin/gfeeds.in" + (("gi\\.require_version\\('WebKit2', '4\\.0'\\)") + "gi.require_version('WebKit2', '4.1')")))) + (add-after 'install 'wrap-gfeeds + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (string-append + (assoc-ref outputs "out") "/bin/gfeeds") + `("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) + `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS"))))))))) (native-inputs - `(("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config))) + (list `(,glib "bin") + `(,gtk+ "bin") + gobject-introspection + pkg-config)) (inputs - (list glib + (list bash-minimal + glib gsettings-desktop-schemas gtk+ hicolor-icon-theme