From patchwork Sat Mar 9 07:33:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 61564 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 4FADD27BBE9; Sat, 9 Mar 2024 07:46:52 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 705EB27BBE2 for ; Sat, 9 Mar 2024 07:46:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rirPc-0004X9-ED; Sat, 09 Mar 2024 02:46:32 -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 1rirPa-0004X1-QF for guix-patches@gnu.org; Sat, 09 Mar 2024 02:46:30 -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 1rirPZ-00082f-HY for guix-patches@gnu.org; Sat, 09 Mar 2024 02:46:29 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rirQ6-0001l1-0H for guix-patches@gnu.org; Sat, 09 Mar 2024 02:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69669] [PATCH gnome-team 1/1] gnu: girara: Update to 0.4.3. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Mar 2024 07:47:01 +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.17099703876704 (code B ref 69669); Sat, 09 Mar 2024 07:47:01 +0000 Received: (at 69669) by debbugs.gnu.org; 9 Mar 2024 07:46:27 +0000 Received: from localhost ([127.0.0.1]:60421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rirPW-0001k4-Ir for submit@debbugs.gnu.org; Sat, 09 Mar 2024 02:46:26 -0500 Received: from planete-kraus.eu ([89.234.140.182]:60616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rirPU-0001jr-Ou for 69669@debbugs.gnu.org; Sat, 09 Mar 2024 02:46:25 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 15323072; Sat, 9 Mar 2024 07:45:46 +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=g2brvFCqrSOHZxuftSPKxgQEmM8=; b=F Dbvk1Yq/MljBrUZG0OypHEDJGM2+BKVsM/C0pZJUjGjxJCnyNDUup9jza3k1Lu44 b3J9bK2hMhXNZ4fvRmY5wau1rVyi5dN1AKQgqAaLcFye/OTPrEj+a2K8XoBFz+nr R7bho1Y8UCXddh4S44RVEUSL51oREj/dYpodyw/wGr5iOi1EWzhHkPYeFlmxN9p7 m3f3NjW2O/1xCcIR329aaZwF4UixM6pgrL4Y4wFxS/EFyrv7dJoNDwWtIAiIFhFK UBkKN6t6AOHXjNEYBHAnvFWBYtBe8ab1Pd2zPipWq2qWqkUPq0pyQADH0WcD5N59 nUIp5z3DQ+VXsN6mWKULg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 2d0bef42 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 9 Mar 2024 07:45:46 +0000 (UTC) Message-ID: <47c1519438f47449ee0f44ecbb4f5d8e443d627f.1709969886.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 9 Mar 2024 08:33:09 +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 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/gtk.scm (girara): Update to 0.4.3. [native-inputs]: Drop labels. [propagated-inputs]: Add pango and json-glib. [arguments]: Convert to list of G-Expressions. Change-Id: I3c977cd33fa6d20fce3bb575ae2ad887b3061966 --- gnu/packages/gtk.scm | 53 +++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a00ce71b81..0c1b7fb5a0 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2132,7 +2132,7 @@ (define-public perl-pango (define-public girara (package (name "girara") - (version "0.3.7") + (version "0.4.3") (source (origin (method git-fetch) @@ -2141,31 +2141,34 @@ (define-public girara (commit version))) (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))) - ;; Listed in 'Requires.private' of 'girara.pc'. - (propagated-inputs (list gtk+)) + (base32 "0cbcs3810frgdmal5ia9pf3rk3k5h4xyzw1d2ia3rcg4nms5gcpx")))) + (native-inputs + (list pkg-config + check + gettext-minimal + `(,glib "bin") + xorg-server-for-tests)) + ;; Listed in 'Requires.private' or 'Requires' of 'girara.pc'. + (propagated-inputs (list gtk+ pango json-glib)) (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 " &"))))))))) + (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 " &"))))))))) (build-system meson-build-system) (home-page "https://pwmt.org/projects/girara/") (synopsis "Library for minimalistic gtk+3 user interfaces")