From patchwork Sat Sep 21 14:53:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dan X-Patchwork-Id: 68269 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 78F3527BBE2; Sat, 21 Sep 2024 15:55:25 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 0ACF927BBE9 for ; Sat, 21 Sep 2024 15:55:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ss1VV-0001JW-Ht; Sat, 21 Sep 2024 10:54:45 -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 1ss1VT-0001Ig-9P for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:43 -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 1ss1VT-0006Ul-0S for guix-patches@gnu.org; Sat, 21 Sep 2024 10:54:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=QGbYOVTgEAEA++dkmyV9LXc11I2nMEo6zsWRQwY5Jk2eZ6L3FWL9J3M7EcHYuq/3+rfYQV5WtYMAJ8srdNKMcJKkuvFjhxOtYBaAmXxUuL2BkdcqXj8xAjHbSHj0vf1rIWwSjDfhz15fr8+ryaHcE29ySSOAkI5q6DYEUxi4RCTCJ5hGKNxGyyp8l963U0FUpKehquONo7UPRqhFS8Z7bJtimirjDD5lRf5fOZKn02rYa17SJZA8j7VDy9aX2g+ZkOSm0EwNlm+ZPXIA6WqjqAn2sqoX2Qj/xqgvJS9TGnH0NkdDICeg7u8esmX05YRHEUWxtYrey+/7JtHgZPLdpw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ss1Vn-0004dE-2L; Sat, 21 Sep 2024 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71897] [PATCH v8 2/8] gnu: xdg-desktop-portal: Improve style. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: i@dan.games, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 14:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71897 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71897@debbugs.gnu.org Cc: Liliana Marie Prikler , Maxim Cournoyer , dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher X-Debbugs-Original-Xcc: dan , Maxim Cournoyer , Liliana Marie Prikler , Sharlatan Hellseher Received: via spool by 71897-submit@debbugs.gnu.org id=B71897.172693044917628 (code B ref 71897); Sat, 21 Sep 2024 14:55:03 +0000 Received: (at 71897) by debbugs.gnu.org; 21 Sep 2024 14:54:09 +0000 Received: from localhost ([127.0.0.1]:40142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Uv-0004aG-6U for submit@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:09 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:41739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ss1Us-0004ZR-Ll for 71897@debbugs.gnu.org; Sat, 21 Sep 2024 10:54:06 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfhigh.phl.internal (Postfix) with ESMTP id 352771140176; Sat, 21 Sep 2024 10:53:41 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Sat, 21 Sep 2024 10:53:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1726930421; x= 1727016821; bh=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=s iQ7UsHgRbzjZC77wLRixSVqFAFPQvYz52Hz71igR4vwk0XxR4m2bscSsd4er30F4 rFpNMYG0g07mYf+zAQXl1gAtcAQ5G7UYwz9rDxpZGUc2CWPfWRaLXzuj/csGa5ps FuF46Fbo+QoitbQU+bTCrkxGBFR4PwM5dO4dTa2xlAfwRuUpe/dKXY7bbab/rzAw 2UjEuLpIGBs071QCXE9b9+7uRLytHfqmskNJJtsqDBjIPQY4sOi1eMhJhTpYadX4 0sIB6qaq01MDD0OQA/EU8ifkgdIZNgkPPORNFbvLD4Gg3p3dAeeUf4c4b4DCtsG8 m/32qPZilO+60bWU164Fg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1726930421; x= 1727016821; bh=PjRv13WVoLXsDBl8YiHekQ1g5nLCBIkZ1hYpujGR5v4=; b=J sbn8aHgzEhuacJK7HXRGgIRPSK3JU3hOrLjAp1KEDsUzxREn4cAU2yrxdQlO1j1J ehMzQt5uq8hxz5J+AbibntM9Osqh/eJoIzReT3wh/uglYeDfeeK0Kg3raSYz3P8x uMx+KpNSKLZk3TFOOw9ZWYC8pZdUbYz6DiMilQrbjBPkvRFcgJPqakinmlansScZ lQVBqvyJorVH7T4oRo22bU2BsDw/eZVeyvqvyAvZPWKf37F94vPhcY3bF9Z/2M3e TLE7TyA2oKn5uBRUyqtKtftZifJrYJ495MjdTQrxN0l2LTzhMHxYpUf4HKj7Y2of Li84bV97z8PPf1MmI7v9w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredttden ucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgvrhhnpe dtgeekheeggeettdevtedufedtfffhuddtvedtueeugfegtdettddutedtgedtleenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghspdhnsggprhgtphhtthhopeefpdhmohguvgepshhmthhpohhuthdprhgtphht thhopeejudekleejseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtoheplhhilh hirghnrgdrphhrihhklhgvrhesghhmrghilhdrtghomhdprhgtphhtthhopehmrgigihhm rdgtohhurhhnohihvghrsehgmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 21 Sep 2024 10:53:39 -0400 (EDT) From: dan Date: Sat, 21 Sep 2024 22:53:08 +0800 Message-ID: <1a93898a36b7b639bb04e077c717c170abe3a05d.1726930328.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> References: <5fddf9f718d95467cd90d9d2625d749af580205c.1726930328.git.i@dan.games> 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 From: Liliana Marie Prikler * gnu/packages/freedesktop.scm (xdg-desktop-portal) [inputs]: Move after arguments. Drop labels. [native-inputs]: Move after inputs. Drop labels. Reviewed-by: Maxim Cournoyer --- gnu/packages/freedesktop.scm | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index f00f4b3956..664adf0cb2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3001,26 +3001,6 @@ (define-public xdg-desktop-portal ;; Disable portal tests since they try to use fuse. (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch")))) (build-system meson-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib:bin" ,glib "bin") - ("gettext" ,gettext-minimal) - ("python" ,python) - ("python-dbusmock" ,python-dbusmock) - ("python-pytest" ,python-pytest) - ("python-pytest-xdist" ,python-pytest-xdist))) - (inputs - `(("bubblewrap" ,bubblewrap) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("flatpak" ,flatpak) - ("fontconfig" ,fontconfig) - ("json-glib" ,json-glib) - ("libportal" ,libportal) - ("dbus" ,dbus) - ("geoclue" ,geoclue) - ("pipewire" ,pipewire) - ("fuse" ,fuse))) (arguments `(#:configure-flags (list "-Dsystemd=disabled") @@ -3034,6 +3014,26 @@ (define-public xdg-desktop-portal (find-files "po" "\\.po$")))) (add-after 'unpack 'set-home-directory (lambda _ (setenv "HOME" "/tmp")))))) + (inputs + (list bubblewrap + dbus + flatpak + fontconfig + fuse + gdk-pixbuf + geoclue + glib + json-glib + libportal + pipewire)) + (native-inputs + (list gettext-minimal + `(,glib "bin") + pkg-config + python + python-dbusmock + python-pytest + python-pytest-xdist)) (native-search-paths (list (search-path-specification (variable "XDG_DESKTOP_PORTAL_DIR")