From patchwork Wed Mar 13 11:06:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 61774 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 BF0DC27BBEA; Wed, 13 Mar 2024 11:57:42 +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=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 B30A627BBE2 for ; Wed, 13 Mar 2024 11:57:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkNDA-0002ia-Od; Wed, 13 Mar 2024 07:55:58 -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 1rkNCi-0002Up-HI for guix-patches@gnu.org; Wed, 13 Mar 2024 07:55:34 -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 1rkNCg-0004jH-RC for guix-patches@gnu.org; Wed, 13 Mar 2024 07:55:26 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkNDF-00016x-SA for guix-patches@gnu.org; Wed, 13 Mar 2024 07:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69772] [PATCH gnome-team 1/2] gnu: zathura: Update to 0.5.4. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Mar 2024 11:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69772 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69772@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 69772-submit@debbugs.gnu.org id=B69772.17103309034184 (code B ref 69772); Wed, 13 Mar 2024 11:56:01 +0000 Received: (at 69772) by debbugs.gnu.org; 13 Mar 2024 11:55:03 +0000 Received: from localhost ([127.0.0.1]:44879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkNCI-00015Q-M8 for submit@debbugs.gnu.org; Wed, 13 Mar 2024 07:55:03 -0400 Received: from planete-kraus.eu ([89.234.140.182]:33158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkNCG-00014n-NC for 69772@debbugs.gnu.org; Wed, 13 Mar 2024 07:55:01 -0400 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 933e5843; Wed, 13 Mar 2024 11:54:18 +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=uEOJyyTzXSrcun9bxCIBPhEVgXw=; b=d RuPZAByljnYdqAPZPr7zOQZ1+8p9WY6E+I14/CGXs2UAjBpHAnWNIL1HY46AQbtx JkOsTXEp+Yf43QGJOV4qf4UpS0/biWu+5ccQukjxDcdIlH/p//ArQbEGfuy+dA3J IymIaUqeKN7z5NuNepXgmVF/pFhL1TpDq3mVDVY8Mlz/D4ihiFd7VJhcra41l+Dx Q8P0uojoR9S/Obvi3TJ7hqO57RYFgWPYHFv97xV0XcqDukREJxXI6QlQL6q3bEmj p0kCzbpZYpKYb4g24SsjrLGa+5PKi4koGWOGB+oDIZ8SXfI2LLqeJ62Cxu10lFqF tKvQUVEDk7XCrQnDVeyoQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 51ce1308 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 13 Mar 2024 11:54:18 +0000 (UTC) Message-ID: <258d6c6f003e51bea84b34904f44d7753902a817.1710328294.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Wed, 13 Mar 2024 12:06:56 +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/pdf.scm (zathura): Update to 0.5.4. * gnu/packages/patches/zathura-use-struct-initializers.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/pdf.scm (zathura): Use it here. Change-Id: I5975d993b92a1a77ed35df2206acb93219138cff --- gnu/local.mk | 1 + .../zathura-use-struct-initializers.patch | 68 +++++++++++++++++++ gnu/packages/pdf.scm | 5 +- 3 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/zathura-use-struct-initializers.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5546e33465..64f52c2501 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2224,6 +2224,7 @@ dist_patch_DATA = \ %D%/packages/patches/xygrib-fix-finding-data.patch \ %D%/packages/patches/xygrib-newer-proj.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ + %D%/packages/patches/zathura-use-struct-initializers.patch \ %D%/packages/patches/zig-0.9-riscv-support.patch \ %D%/packages/patches/zig-do-not-link-against-librt.patch \ %D%/packages/patches/zig-use-baseline-cpu-by-default.patch \ diff --git a/gnu/packages/patches/zathura-use-struct-initializers.patch b/gnu/packages/patches/zathura-use-struct-initializers.patch new file mode 100644 index 0000000000..9a808a4bc3 --- /dev/null +++ b/gnu/packages/patches/zathura-use-struct-initializers.patch @@ -0,0 +1,68 @@ +From c05328185292d6f6a4459024cdb563c63bfad230 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Sebastian Ramacher +Date: Mon, 29 Jan 2024 21:05:22 +0100 +Subject: [PATCH] Use struct initializers + +--- + zathura/page-widget.c | 4 ++-- + zathura/shortcuts.c | 12 +++++------- + 2 files changed, 7 insertions(+), 9 deletions(-) + +diff --git a/zathura/page-widget.c b/zathura/page-widget.c +index 216381e..ac85dcf 100644 +--- a/zathura/page-widget.c ++++ b/zathura/page-widget.c +@@ -1426,8 +1426,8 @@ cb_menu_image_save(GtkMenuItem* item, ZathuraPage* page) + } + + /* set command */ +- char* export_command = g_strdup_printf(":export image-p%d-%d ", page_id, image_id); +- girara_argument_t argument = { 0, export_command }; ++ char* export_command = g_strdup_printf(":export image-p%d-%d ", page_id, image_id); ++ girara_argument_t argument = {.n = 0, .data = export_command}; + sc_focus_inputbar(priv->zathura->ui.session, &argument, NULL, 0); + g_free(export_command); + +diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c +index 8836cd2..35b5990 100644 +--- a/zathura/shortcuts.c ++++ b/zathura/shortcuts.c +@@ -513,7 +513,7 @@ sc_rotate(girara_session_t* session, girara_argument_t* argument, + zathura_document_set_rotation(zathura->document, (rotation + angle * t) % 360); + + /* update scale */ +- girara_argument_t new_argument = { zathura_document_get_adjust_mode(zathura->document), NULL }; ++ girara_argument_t new_argument = {.n = zathura_document_get_adjust_mode(zathura->document), .data = NULL}; + sc_adjust_window(zathura->ui.session, &new_argument, NULL, 0); + + /* render all pages again */ +@@ -1372,7 +1372,7 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* + zathura->shortcut.toggle_presentation_mode.zoom = zathura_document_get_zoom(zathura->document); + + /* adjust window */ +- girara_argument_t argument = { ZATHURA_ADJUST_BESTFIT, NULL }; ++ girara_argument_t argument = {.n = ZATHURA_ADJUST_BESTFIT, .data = NULL}; + sc_adjust_window(session, &argument, NULL, 0); + + /* hide status and inputbar */ +@@ -1390,13 +1390,11 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* + return false; + } + +-bool +-sc_quit(girara_session_t* session, girara_argument_t* UNUSED(argument), +- girara_event_t* UNUSED(event), unsigned int UNUSED(t)) +-{ ++bool sc_quit(girara_session_t* session, girara_argument_t* UNUSED(argument), girara_event_t* UNUSED(event), ++ unsigned int UNUSED(t)) { + g_return_val_if_fail(session != NULL, false); + +- girara_argument_t arg = { GIRARA_HIDE, NULL }; ++ girara_argument_t arg = {.n = GIRARA_HIDE, .data = NULL}; + girara_isc_completion(session, &arg, NULL, 0); + + cb_destroy(NULL, NULL); +-- +2.41.0 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index f32403b954..6b09cbb5db 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -716,7 +716,7 @@ (define-public zathura-pdf-poppler (define-public zathura (package (name "zathura") - (version "0.5.2") + (version "0.5.4") (source (origin (method url-fetch) (uri @@ -724,7 +724,8 @@ (define-public zathura version ".tar.xz")) (sha256 (base32 - "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6")))) + "0ckgamf98sydq543arp865jg1afwzhpzcsbhv6zrch2dm5x7y0x3")) + (patches (search-patches "zathura-use-struct-initializers.patch")))) (native-inputs (list pkg-config gettext-minimal From patchwork Wed Mar 13 11:10:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 61773 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 1B46827BBE9; Wed, 13 Mar 2024 11:56:58 +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 66DFC27BBE2 for ; Wed, 13 Mar 2024 11:56:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkNDF-0002oV-06; Wed, 13 Mar 2024 07:56:01 -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 1rkNCk-0002Us-6y for guix-patches@gnu.org; Wed, 13 Mar 2024 07:55:34 -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 1rkNCh-0004jJ-AL for guix-patches@gnu.org; Wed, 13 Mar 2024 07:55:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rkNDG-000174-AP for guix-patches@gnu.org; Wed, 13 Mar 2024 07:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69772] [PATCH gnome-team 2/2] gnu: zathura: Update style. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Mar 2024 11:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69772 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69772@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 69772-submit@debbugs.gnu.org id=B69772.17103309144208 (code B ref 69772); Wed, 13 Mar 2024 11:56:02 +0000 Received: (at 69772) by debbugs.gnu.org; 13 Mar 2024 11:55:14 +0000 Received: from localhost ([127.0.0.1]:44882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkNCU-00015o-6F for submit@debbugs.gnu.org; Wed, 13 Mar 2024 07:55:14 -0400 Received: from planete-kraus.eu ([89.234.140.182]:52482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rkNCR-00015a-I1 for 69772@debbugs.gnu.org; Wed, 13 Mar 2024 07:55:12 -0400 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1c7e2447; Wed, 13 Mar 2024 11:54:28 +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=IpzeYx48XJWcXk11OSgrIMtLpx0=; b=N 3pTreqPtzbemDlKv0ZwnMuWF9X+3vBVIckxklZt8+Qp5jQJPtSVnbSs9DTwylOg8 Z/X0zNRcAdXlNSN/Q7o/uNX0uukvBvNKAtMdZb06lRUvH40OWKicjw9g5XiwaOiq eOcok63Lob5X10cdxT6CBisYm1taqBiPdNVDXpN1vz98auGL5rXHc5n79RFGI1y5 nGeDYQK3B1fxXHgXhBqOqUJJOwSeF1ch/K0fqSXMWG6GIRZ7Wrqy2XxBEXvtVEIA H7iOpWXT/Ld9Ha0o3vDIf5IX3VWAXxmRQtEVjxNSIP2Fagy3PD88ye44FA9P+YVl 7J1HLbuWBKGQpsadz9V3Q== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id fefefed6 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 13 Mar 2024 11:54:28 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Wed, 13 Mar 2024 12:10:18 +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/pdf.scm (zathura) [arguments]: Convert to list of G-Expressions. (zathura): Reorder fields. Change-Id: Icb1e983570c6ba3d391c2ee49c1b102246c8080f --- gnu/packages/pdf.scm | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6b09cbb5db..b922ac7cf5 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -726,6 +726,26 @@ (define-public zathura (base32 "0ckgamf98sydq543arp865jg1afwzhpzcsbhv6zrch2dm5x7y0x3")) (patches (search-patches "zathura-use-struct-initializers.patch")))) + (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 @@ -747,24 +767,6 @@ (define-public zathura (list (search-path-specification (variable "ZATHURA_PLUGINS_PATH") (files '("lib/zathura"))))) - (build-system meson-build-system) - (arguments - `(#: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 " &"))))))))) (home-page "https://pwmt.org/projects/zathura/") (synopsis "Lightweight keyboard-driven PDF viewer") (description "Zathura is a customizable document viewer. It provides a