From patchwork Fri Mar 21 21:11:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Wong X-Patchwork-Id: 40570 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 37F4327BBEA; Fri, 21 Mar 2025 21:13:38 +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=-6.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 B0C7127BBE2 for ; Fri, 21 Mar 2025 21:13:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvjfu-0007j7-56; Fri, 21 Mar 2025 17:13:06 -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 1tvjfr-0007i8-Sj for guix-patches@gnu.org; Fri, 21 Mar 2025 17:13:04 -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 1tvjfr-0003yO-DM for guix-patches@gnu.org; Fri, 21 Mar 2025 17:13:03 -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=FyWIVhZk/YLYqbNPe1o8+NazN7t4pja2pRjnFsWDik4=; b=mru0VICxjCZjYpjfcH5ylXjZgZ71JRXpOndCU19sDdLltKJ+Wdps6aZxHt9EoSHqnzmYYlsxyQIKnzp5Mt5whtqDNg1YJS9xDRhXKU9quxTpYP+Hs8BaBzpl5rfik7NoqXgh9V8VnMWSyw7xOg3cMtLM+yttwWNl7IX+cv6/3nMof+2WFvU5fQN5qRyNUn3P/jDNTU1WNDNaKbESu3Xy9Hw4CaSsgGx8hUjKpMYv3xcDSwbaP7TJ/+sHulmtxx46ojKYt6N4E+RS9Uhj2v6uwmkglOUVizJnoHybApw0Gs7TUs1TUDAwyXafIN8PIZzBlm6m/RVLCG8ABtuBAyrznA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvjfp-0004Cz-MQ; Fri, 21 Mar 2025 17:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77159] [PATCH 1/7] gnu: girara: Update to 0.4.5. Resent-From: Andrew Wong Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Fri, 21 Mar 2025 21:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77159 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77159@debbugs.gnu.org Cc: Andrew Wong , Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by 77159-submit@debbugs.gnu.org id=B77159.174259154916080 (code B ref 77159); Fri, 21 Mar 2025 21:13:01 +0000 Received: (at 77159) by debbugs.gnu.org; 21 Mar 2025 21:12:29 +0000 Received: from localhost ([127.0.0.1]:39763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvjfI-0004BB-I2 for submit@debbugs.gnu.org; Fri, 21 Mar 2025 17:12:29 -0400 Received: from qs51p00im-qukt01080102.me.com ([17.57.155.19]:45191) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tvjfF-0004Af-IS for 77159@debbugs.gnu.org; Fri, 21 Mar 2025 17:12:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=FyWIVhZk/YLYqbNPe1o8+NazN7t4pja2pRjnFsWDik4=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=m+oCKpphaa1VDSXyrbrbhgc7Ggp9HewMiRsbWeiivIVIp3m/z246YxlX0tNa8zqWb bljFwJTWoaMZgtuoJH1cRtWppdlA78BHUSC2pbdcyHjG3jDwnlGElyw3/HA5kZZbgA Y2dUOXb8HYLKskG00s7I690aMGRX9Gvx6iccRMNzlJeDyeupci+PIl++G+YYMF87Yv It2npTXnALhbLFg18t4rtaSX2uNlEH5nN6pfmGPZDHXoCjWW37j413cfJH+TUexOQi xSgfoBpFIeLiXDP3TBWKYqrXE2SNg9RB4V3/UZjBC1/1bdiuFEhsywrZrvtZShtrJq bpC5YUhOxaaRg== Received: from wongworks.lan (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01080102.me.com (Postfix) with ESMTPSA id D72881CC011E; Fri, 21 Mar 2025 21:12:18 +0000 (UTC) Date: Fri, 21 Mar 2025 17:11:53 -0400 Message-ID: <49de5f9484fc7da5a017a8670bcbaf546e2ba28c.1742591224.git.wongandj@icloud.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: CWv-wD-fqd6ErZAg8k7PcokJVWx5Qakl X-Proofpoint-ORIG-GUID: CWv-wD-fqd6ErZAg8k7PcokJVWx5Qakl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_07,2025-03-21_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 bulkscore=0 clxscore=1011 spamscore=0 phishscore=0 suspectscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2503210154 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 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: Andrew Wong X-ACL-Warn: , Andrew Wong via Guix-patches X-Patchwork-Original-From: Andrew Wong via Guix-patches via From: Andrew Wong 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.5. [arguments] <#:phases>: Refactor. [source]: Switch to url-fetch. Change-Id: I8e7b512d7f398540855ac00813d71eba59044bb4 --- gnu/packages/gtk.scm | 55 ++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 846103ff9e..ef2ec7ed84 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2261,45 +2261,34 @@ (define-public perl-pango (define-public girara ;; TODO: Move propagated inputs to inputs after core-updates is merged (as ;; of 2024-03) + ;; N: Attempted, doing so causes failure to locate girara-gtk3 in packages + ;; that depend on it (as of 2025-03) (package (name "girara") - (version "0.4.3") + (version "0.4.5") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.pwmt.org/pwmt/girara") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://pwmt.org/projects/girara/download/girara-" + version ".tar.xz")) (sha256 - (base32 "0cbcs3810frgdmal5ia9pf3rk3k5h4xyzw1d2ia3rcg4nms5gcpx")))) + (base32 "14fspmblgqcc67dsn4lxc45pxbzsky3jnmrna16qb5i7z29pjzvb")))) (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+ json-glib)) + (list #:phases #~(modify-phases %standard-phases + (add-before 'check 'start-xserver-for-tests + (lambda* (#:key inputs #:allow-other-keys) + (setenv "DISPLAY" ":1") + ;; 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") + ((compose zero? system) + (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 &"))))))) + (native-inputs (list pkg-config gettext-minimal `(,glib "bin") ; build + check xorg-server-for-tests)) ; test + (propagated-inputs (list gtk+ json-glib));See girara.pc 'Requires.private' (build-system meson-build-system) (home-page "https://pwmt.org/projects/girara/") (synopsis "Library for minimalistic gtk+3 user interfaces")