From patchwork Tue Oct 24 15:30:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55346 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 ADB65172C9; Tue, 24 Oct 2023 20:49:04 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 BE9C216F2C for ; Tue, 24 Oct 2023 20:49:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvNOL-0006oM-4P; Tue, 24 Oct 2023 15:48:41 -0400 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 1qvNOE-0006m7-OE for guix-patches@gnu.org; Tue, 24 Oct 2023 15:48:38 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvNOC-0006rA-8q for guix-patches@gnu.org; Tue, 24 Oct 2023 15:48:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvNOf-0005An-W9 for guix-patches@gnu.org; Tue, 24 Oct 2023 15:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66689] [PATCH gnome-team v3 05/17] gnu: appstream-glib: Update style. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 19:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66689 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: rg@raghavgururajan.name, 66689@debbugs.gnu.org, Maxim Cournoyer Received: via spool by 66689-submit@debbugs.gnu.org id=B66689.169817690419639 (code B ref 66689); Tue, 24 Oct 2023 19:49:01 +0000 Received: (at 66689) by debbugs.gnu.org; 24 Oct 2023 19:48:24 +0000 Received: from localhost ([127.0.0.1]:56713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvNO3-00056e-Ex for submit@debbugs.gnu.org; Tue, 24 Oct 2023 15:48:23 -0400 Received: from planete-kraus.eu ([89.234.140.182]:51092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvNO1-00056H-1S for 66689@debbugs.gnu.org; Tue, 24 Oct 2023 15:48:21 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 9f1d1885; Tue, 24 Oct 2023 19:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=UZufrAhG2mGM1mLMRy21rKfbsrg=; b=i DTGspox5gA1EMf4GLKpEeRlTbFAT8ISQJuqg40CsXhDPgCPN76O20gL8UEywI9Yw Wqr4ssV4IC60T805WJ8xFijwcWpy2UeRCsAQkVTxVhFWQuE7ATnCyb0RYE4NTg5S BDKm9qKWWHksBc9BNkQ+goah0CrltG8A2xOqUcsuPHWXojr7qfIbZ00J/0yfrMHI 12DelGiZLMXey0seea6TsikQ4H3VygpWk6Mjz5vZIfs/fm5blvcOkepc3qRnRxg0 jJB3UURs0yssnDNBiOdQb1MPrAxC8Q4TtoA6AttdQQ7FeALLxyTiF8WQANDOXLAx Rw7gAicRz/Xt91tLe5pgQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 307669c8 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 24 Oct 2023 19:47:50 +0000 (UTC) Message-ID: In-Reply-To: <944a7bb37c5834ccea88f249d24ea2ef2f07af4c.1698176625.git.vivien@planete-kraus.eu> References: <0fcb25771d437004f34bc5ec7847f924cf3241d8.camel@gmail.com> <93e58d54d96967219264d0d8a3cca379c3675bca.1698176625.git.vivien@planete-kraus.eu> <246a9dcaaec0d2ba0c72816316bb49cdc0379c31.1698176625.git.vivien@planete-kraus.eu> <944a7bb37c5834ccea88f249d24ea2ef2f07af4c.1698176625.git.vivien@planete-kraus.eu> Date: Tue, 24 Oct 2023 17:30:56 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/glib.scm (appstream-glib) [native-inputs]: Drop labels, sort. [propagated-inputs]: Drop labels. [inputs]: Drop labels, sort. [arguments]: Use gexp. [#:phases 'patch-tests]: Remove trailing #t. [description]: Break long line. Change-Id: I504df11ec6fc5b9d9fe70e4e32e7910f93eeb81e --- gnu/packages/glib.scm | 64 ++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 40de477d75..3f70808e3c 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1305,42 +1305,44 @@ (define-public appstream-glib "15lbrmyx94cf6p6svq02yiskh31xidq092c711pqs16mml06a9bi")))) (build-system meson-build-system) (native-inputs - `(("gettext" ,gettext-minimal) - ("gsettings" ,gsettings-desktop-schemas) ; for ‘org.gnome.system.proxy’ - ("glib:bin" ,glib "bin") ; for glib-compile-resources - ("pkg-config" ,pkg-config))) + (list gettext-minimal + `(,glib "bin") ;for glib-compile-resources + gsettings-desktop-schemas ;for ‘org.gnome.system.proxy’ + pkg-config)) (propagated-inputs - `(("gcab" ,gcab) ; for .pc file - ("gdk-pixbuf" ,gdk-pixbuf) ; for .pc file - ("libuuid" ,util-linux "lib"))) ; for .pc file + (list gcab ;for .pc file + gdk-pixbuf ;same + `(,util-linux "lib"))) ;libuuid, for .pc file (inputs - `(("glib" ,glib) - ("gperf" ,gperf) - ("gtk+" ,gtk+) - ("json-glib" ,json-glib) - ("libarchive" ,libarchive) - ("curl" ,curl))) + (list curl + gperf + gtk+ + json-glib + libarchive + glib)) (arguments - `(#:configure-flags - (list "-Ddep11=false" - "-Dintrospection=false" ; avoid g-ir-scanner dependency - "-Drpm=false" - "-Dstemmer=false") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - (substitute* "libappstream-glib/as-self-test.c" - (("g_test_add_func.*as_test_store_local_appdata_func);") "")) - #t)) - (add-before 'check 'set-home - (lambda _ - ;; Some tests want write access there. - (setenv "HOME" "/tmp")))))) + (list + #:configure-flags + #~(list "-Ddep11=false" + "-Dintrospection=false" ; avoid g-ir-scanner dependency + "-Drpm=false" + "-Dstemmer=false") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + (substitute* "libappstream-glib/as-self-test.c" + (("g_test_add_func.*as_test_store_local_appdata_func);") "")))) + (add-before 'check 'set-home + (lambda _ + ;; Some tests want write access there. + (setenv "HOME" "/tmp")))))) (home-page "https://github.com/hughsie/appstream-glib") (synopsis "Library for reading and writing AppStream metadata") - (description "This library provides objects and helper methods to help -reading and writing @uref{https://www.freedesktop.org/wiki/Distributions/AppStream,AppStream} + (description + "This library provides objects and helper methods to help +reading and writing +@uref{https://www.freedesktop.org/wiki/Distributions/AppStream,AppStream} metadata.") (license license:lgpl2.1+)))