From patchwork Fri Mar 21 21:11:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Wong X-Patchwork-Id: 40574 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 A50C027BBEA; Fri, 21 Mar 2025 21:13:47 +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 18D9B27BBE9 for ; Fri, 21 Mar 2025 21:13:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvjfv-0007ji-Ar; Fri, 21 Mar 2025 17:13:07 -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-0007i7-SE 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-0003yN-Ao 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=wwYBSLmLHvhV7n0L8YFQdfihgYDI01CDjYyr/Wvajho=; b=envuHgz4EUCaMTT4kH0hChlMhoybrNutWTA3e546NzrIP1eYVnoxfBSYdkYutThqTZ+tH+jIVaBZeB0tlgjeiVrb0BC0dvP4tEKYM62ePiJ2RYIu8ABh1M/Vhd7eZM5hNJSxQJ93fi1LJNoTnWCZxpKuK1iz/Z593bH8dGinWuf4J699VAlU89ul9HLeuNKazSEJLsNikrO9ryJGcE4UsCCOMNkh+gMsQn4Yrh1viyYS9RLHnyUA41T4AtWU7b+aGbsqP+xgcrtijzBwX67E/HlEKPmjabnxP4qHAcRXEZN2SHIo8aHqBNS+t0t5wnACU6XVVBh4HnPdhDP21+adaw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvjfq-0004D5-4o for guix-patches@gnu.org; Fri, 21 Mar 2025 17:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77159] [PATCH 2/7] gnu: zathura: Update to 0.5.11. Resent-From: Andrew Wong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Mar 2025 21:13:02 +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 Received: via spool by 77159-submit@debbugs.gnu.org id=B77159.174259154916086 (code B ref 77159); Fri, 21 Mar 2025 21:13:02 +0000 Received: (at 77159) by debbugs.gnu.org; 21 Mar 2025 21:12:29 +0000 Received: from localhost ([127.0.0.1]:39765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvjfJ-0004BJ-5o for submit@debbugs.gnu.org; Fri, 21 Mar 2025 17:12:29 -0400 Received: from qs51p00im-qukt01080102.me.com ([17.57.155.19]:4527) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tvjfG-0004Ah-Ho for 77159@debbugs.gnu.org; Fri, 21 Mar 2025 17:12:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=wwYBSLmLHvhV7n0L8YFQdfihgYDI01CDjYyr/Wvajho=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=REXwuChscFbqUtOhHe1QcI/BTYztJLtIEzHsBN87wTaxf7L8r9eEP7vdCN7+tTiWt 2pQ4zSc1+D/zpzFmFnkt0Pt2NMMRsQBTLeOY7ldVUToxEvQEo5Qcqh02y7bMOnfq0w MRrij4UfDE02uxOXYSUCcfA7GQORmKybEeShcTPk9MKW5SSAKVIfRKyW3g2LQ5F/fE azGYPcPXZ7lljsY2GxQO91VFqKPx/KTG5lQ9UkeFRX8S0pXacBfFWloLKks2o4/m/t 0aJF9OR+QAKS0+ik3JdygvPhmubCMYuGjPFIIX7KhFwnevnMQqJRXQi8fssU5Ldhd9 MqY1pioaFMBvQ== Received: from wongworks.lan (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01080102.me.com (Postfix) with ESMTPSA id 6DFCB1CC014C; Fri, 21 Mar 2025 21:12:20 +0000 (UTC) Date: Fri, 21 Mar 2025 17:11:54 -0400 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: Bt6ojlCDMLS2ucNlq_9UJr6di_aeEARA X-Proofpoint-ORIG-GUID: Bt6ojlCDMLS2ucNlq_9UJr6di_aeEARA 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=791 bulkscore=0 clxscore=1015 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/pdf.scm (zathura): Update to 0.5.11. [arguments] <#:phases>: Refactor. Change-Id: I343c46cb3787f19b5c6dfa531ced01d86b957883 --- gnu/packages/pdf.scm | 69 ++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 44 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 23348e49d5..ce23c8bf7a 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -693,56 +693,37 @@ (define-public zathura-pdf-poppler (define-public zathura (package (name "zathura") - (version "0.5.6") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura/download/zathura-" - version ".tar.xz")) - (sha256 - (base32 - "1nhhdww8z6i2cmj7n6qjgyh49dy4jf0xq4j13djpvrfchxgf6y5l")))) + (version "0.5.11") + (source + (origin (method url-fetch) + (uri (string-append "https://pwmt.org/projects/zathura" + "/download/zathura-" version ".tar.xz")) + (sha256 + (base32 "0g5ms7rna8zkp34d5p461iwlpgkv2a0lm4rfxzxbh3xgk2cqlial")))) (build-system meson-build-system) (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 ((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 - (search-input-file inputs "/bin/Xvfb") - " " display " &"))))))))) - (native-inputs - (list pkg-config - gettext-minimal - (list glib "bin") - - ;; For building documentation. - python-sphinx - - ;; For building icons. - (librsvg-for-system) - - ;; For tests. - check - xorg-server-for-tests)) + (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 (list glib "bin") + python-sphinx ; For building documentation. + (librsvg-for-system) ; For building icons. + check xorg-server-for-tests)) ; For tests. (inputs (list sqlite)) ;; Listed in 'Requires.private' of 'zathura.pc'. (propagated-inputs (list cairo girara)) (native-search-paths - (list (search-path-specification - (variable "ZATHURA_PLUGINS_PATH") - (files '("lib/zathura"))))) + (list (search-path-specification (variable "ZATHURA_PLUGINS_PATH") + (files '("lib/zathura"))))) (home-page "https://pwmt.org/projects/zathura/") (synopsis "Lightweight keyboard-driven PDF viewer") (description "Zathura is a customizable document viewer. It provides a