Subject: [PATCH 3/5] gnu: zathura: Update to 0.5.6.

From: [email-masked]
Date: Tue, 23 Jul 2024 22:27:32 +0800

From: 宋文武 <[email-masked]>

* gnu/packages/patches/zathura-use-struct-initializers.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/pdf.scm (zathura): Update to 0.5.6.
[source]: Remove patch.

Change-Id: Ibe49294891f1adccfcfb6996674602535c8bd842
---
 gnu/local.mk                                  |  1 -
 .../zathura-use-struct-initializers.patch     | 68 -------------------
 gnu/packages/pdf.scm                          |  5 +-
 3 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 gnu/packages/patches/zathura-use-struct-initializers.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index ef1e82eb04..df4e32add7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2277,7 +2277,6 @@ 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
deleted file mode 100644
index 9a808a4bc3..0000000000
--- a/gnu/packages/patches/zathura-use-struct-initializers.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From c05328185292d6f6a4459024cdb563c63bfad230 Mon Sep 17 00:00:00 2001
-Message-ID: <[email-masked]>
-From: Sebastian Ramacher <[email-masked]>
-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 68a6c54d1d..376a817443 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -710,7 +710,7 @@ (define-public zathura-pdf-poppler
 (define-public zathura
   (package
     (name "zathura")
-    (version "0.5.4")
+    (version "0.5.6")
     (source (origin
               (method url-fetch)
               (uri
@@ -718,8 +718,7 @@ (define-public zathura
                               version ".tar.xz"))
               (sha256
                (base32
-                "0ckgamf98sydq543arp865jg1afwzhpzcsbhv6zrch2dm5x7y0x3"))
-              (patches (search-patches "zathura-use-struct-initializers.patch"))))
+                "1nhhdww8z6i2cmj7n6qjgyh49dy4jf0xq4j13djpvrfchxgf6y5l"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
2.45.2