From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 6BFnJjkm7GW6QQEAe85BDQ:P1 (envelope-from ) for ; Sat, 09 Mar 2024 10:04:57 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 6BFnJjkm7GW6QQEAe85BDQ (envelope-from ) for ; Sat, 09 Mar 2024 10:04:57 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="W r9yG3I"; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709975097; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=YKJYM8B7N68p64h3vz693phMHAVC0UcLZbaAzpcOdzI=; b=Oo8m9tNb+mZc90+QSJWE7SbZpDGQn4ZmlbWEoIgNWhrKvJ+60fdYDVNiQwndkdpqRVkZcq y5HAZNTgm6hxdjoRvLYvX+MbIefJuP6wSpDj1BDAN3781rD2vheXFyq5sGz8MsHOfJFbz8 xMpuw6ydKc1KpSYG7f43L/28eFzoF04GC6+zrHOLIBBahh17G7I1d0pjk5Ru7aAb+UG4d1 p9Zrihv+2PO9tNeM4oA5B9Q2cdGIp8bu9udwEbdXkUR/E62DfiJG+SJmBfIJ47JTGTgmk4 0rjOdrnxHm9CSmUgv7NqcvFM8FruI6ciQJ1+c5uqf1A6D2Zmvl4aBIU9eeeoEw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709975097; a=rsa-sha256; cv=none; b=Rj/EAYUTE1MUbyCINS1bvw5KVqF1+Yrbmlc8ymHzw29uDMU8rEfUMnzXFN7XO1f4avyqb2 8381pio3QazQJYnFGr9A1lOgpLpJ8UCg7BJetfkWLih3vq6HZnTh9VgRRR7jGnFRrhibzq UCtqRHtnNYBzeH0z7FDBqdjmelov2tKcf3gpummMhqziS3/ZfH5SvckBVymqjfr0sh2iXl Nzb7skAZZm5kz2PS4cqp1FiYH9eMdU6ZDWRFRgiH7AwB5PhEeHPXqplYYEZQwWn7fNhmeY m3ELVdGhYPHFJESOSnPJRDMTpD3G8xooO5PYe9byF3nxvG+aD+pbpM8DjY5pLA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=albinoniA header.b="W r9yG3I"; 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"; dmarc=pass (policy=none) header.from=gnu.org 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 59A5F58F79 for ; Sat, 9 Mar 2024 10:04:57 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1risd8-0005Rb-8b; Sat, 09 Mar 2024 04:04:34 -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 1risd5-0005QT-M5 for guix-patches@gnu.org; Sat, 09 Mar 2024 04:04:31 -0500 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 1risd4-0001m5-Qm for guix-patches@gnu.org; Sat, 09 Mar 2024 04:04:31 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1risdb-0006oH-B4 for guix-patches@gnu.org; Sat, 09 Mar 2024 04:05:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69669] [PATCH gnome-team v2 1/3] gnu: girara: Update style. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Mar 2024 09:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69669@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 69669-submit@debbugs.gnu.org id=B69669.170997510226156 (code B ref 69669); Sat, 09 Mar 2024 09:05:03 +0000 Received: (at 69669) by debbugs.gnu.org; 9 Mar 2024 09:05:02 +0000 Received: from localhost ([127.0.0.1]:60647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1risdZ-0006nZ-J2 for submit@debbugs.gnu.org; Sat, 09 Mar 2024 04:05:01 -0500 Received: from planete-kraus.eu ([89.234.140.182]:41858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1risdV-0006mo-Rb for 69669@debbugs.gnu.org; Sat, 09 Mar 2024 04:04:58 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id baee513e; Sat, 9 Mar 2024 09:04:20 +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=albinoniA; bh=pboMrtcoHrwfAai77UEQk/C48Ew=; b=W r9yG3I0rc89JmyLCPEo4AXgxrhFU4/Z8NmK8KmKdbmW/H9jE1SfXmcjYQR8iew7G 34oh57gBh327HhAEYp7Lqco8csaUGizJohwcUvwzGt+FYvHTVkfGY0CZAAy9TBRX cfUh69RyxctgDynx1m5dn91lzFNauCiarAZJQ2eA+knu8MPTWqnjo8phBIqg1n+d WdSQg1wa5LSAXKxDfmKrj1TJxIqIKq0xFvek0ONmwjGW1IKQPFRZCdEwbx1ojkXc kS5HYTTWCjrrH/aVhDTHgPLb+5WDm8OOGCJnRQYxmxT8WWRX233pfjvGcWu8Othr /GyZvubpn16q847OQnJrg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 958ec202 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 9 Mar 2024 09:04:19 +0000 (UTC) Message-ID: <1a4864e2e1936be6053ca1330483a44da985730f.1709974804.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 9 Mar 2024 09:54:40 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.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 From: Vivien Kraus via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.28 X-Spam-Score: -5.28 X-Migadu-Queue-Id: 59A5F58F79 X-Migadu-Scanner: mx11.migadu.com X-TUID: q+BOL2D+LgQA * gnu/packages/gtk.scm (girara)[arguments]: Convert to list of G-Expressions. [native-inputs]: Move after arguments. [propagated-inputs]: Move after arguments. Change-Id: I79a6f59f6ea671433f1a66a10cb79203f0b9bbae --- gnu/packages/gtk.scm | 47 +++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a00ce71b81..033c5aee0f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2142,30 +2142,33 @@ (define-public girara (file-name (git-file-name name version)) (sha256 (base32 "0k93pi0lkf941vanvh1habm6n5wl1n63726j5kqxh34wdlv4mv4s")))) - (native-inputs `(("pkg-config" ,pkg-config) - ("check" ,check) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("xorg-server" ,xorg-server-for-tests))) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'start-xserver + ;; Tests require a running X server. + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server")) + (display ":1")) + (setenv "DISPLAY" display) + + ;; On busy machines, tests may take longer than + ;; the default of four seconds. + (setenv "CK_DEFAULT_TIMEOUT" "20") + + ;; Don't fail due to missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system (string-append xorg-server "/bin/Xvfb " + display " &"))))))))) + (native-inputs + (list pkg-config + check + gettext-minimal + `(,glib "bin") + xorg-server-for-tests)) ;; Listed in 'Requires.private' of 'girara.pc'. (propagated-inputs (list gtk+)) - (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'check 'start-xserver - ;; Tests require a running X server. - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server")) - (display ":1")) - (setenv "DISPLAY" display) - - ;; On busy machines, tests may take longer than - ;; the default of four seconds. - (setenv "CK_DEFAULT_TIMEOUT" "20") - - ;; Don't fail due to missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system (string-append xorg-server "/bin/Xvfb " - display " &"))))))))) (build-system meson-build-system) (home-page "https://pwmt.org/projects/girara/") (synopsis "Library for minimalistic gtk+3 user interfaces") -- 2.41.0