[bug#72256] [PATCH 0/5] mupdf and zathura updates

[bug#72256] [PATCH 0/5] mupdf and zathura updates

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

Here are some updates for mupdf and zathura.

Sou Bunnbu (宋文武) (5):
  gnu: mujs: Update to 1.3.5.
  gnu: mupdf: Update to 1.24.7.
  gnu: zathura: Update to 0.5.6.
  gnu: zathura-pdf-mupdf: Update to 0.4.3.
  gnu: zathura-pdf-poppler: Update to 0.3.2.

 gnu/local.mk                                  |  1 -
 gnu/packages/javascript.scm                   |  4 +-
 .../zathura-use-struct-initializers.patch     | 68 -------------------
 gnu/packages/pdf.scm                          | 33 ++++-----
 4 files changed, 14 insertions(+), 92 deletions(-)
 delete mode 100644 gnu/packages/patches/zathura-use-struct-initializers.patch


base-commit: ad97f1bdb67015cffe92adba3b94c3b3df576008
-- 
2.45.2

[bug#72256] [PATCH 1/5] gnu: mujs: Update to 1.3.5.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/javascript.scm (mujs): Update to 1.3.5.

Change-Id: I15580d589cf3163ea669adfd93848ad893f0e124
---
 gnu/packages/javascript.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index fba96b06a8..4f97dcfef6 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -778,7 +778,7 @@ (define-public js-scianimator
 (define-public mujs
   (package
     (name "mujs")
-    (version "1.3.2")
+    (version "1.3.5")
     (source
      (origin
        (method git-fetch)
@@ -787,7 +787,7 @@ (define-public mujs
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1kfp2246pzmrb65c0gfcy130zd7sbniclpjx2jv6jbkmpkjs8kb1"))
+        (base32 "1p90cb830li6y38m748s4kz2pkimxarbcaym3bwrxnk3jaqcf69q"))
        (snippet
         #~(begin
             (use-modules (guix build utils))
-- 
2.45.2

[bug#72256] [PATCH 2/5] gnu: mupdf: Update to 1.24.7.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/pdf.scm (mupdf): Update to 1.24.7.

Change-Id: Ic325aeb43933bfdcbe779623c49805ce48bdb7e0
---
 gnu/packages/pdf.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 458300529c..68a6c54d1d 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -840,14 +840,14 @@ (define-public python-pydyf
 (define-public mupdf
   (package
     (name "mupdf")
-    (version "1.23.11")
+    (version "1.24.7")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://mupdf.com/downloads/archive/"
                            "mupdf-" version "-source.tar.lz"))
        (sha256
-        (base32 "1kv44zqijkvljc9fcqmgb8zqkj7hmasga70fsz98aimmrfc2rmyv"))
+        (base32 "0hydmp8sdnkrkpqyysa6klkxbwv9awf1xc753r27gcj7ds7375fj"))
        (modules '((guix build utils)
                   (ice-9 ftw)
                   (srfi srfi-1)))
@@ -899,6 +899,7 @@ (define-public mupdf
               "USE_SYSTEM_CURL=yes"
               "USE_SYSTEM_LEPTONICA=yes"
               "USE_SYSTEM_TESSERACT=yes"
+              "USE_SONAME=no"           ;install as libmupdf.so
               "shared=yes"
               (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")
               (string-append "prefix=" #$output))
-- 
2.45.2

[bug#72256] [PATCH 3/5] gnu: zathura: Update to 0.5.6.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* 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: <c05328185292d6f6a4459024cdb563c63bfad230.1710315308.git.vivien@planete-kraus.eu>
-From: Sebastian Ramacher <sebastian@ramacher.at>
-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

[bug#72256] [PATCH 4/5] gnu: zathura-pdf-mupdf: Update to 0.4.3.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/pdf.scm (zathura-pdf-mupdf): Update to 0.4.3.

Change-Id: Ib13b98b597516938caf17cf3470565b460367464
---
 gnu/packages/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 376a817443..3be620339e 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -625,7 +625,7 @@ (define-public zathura-djvu
 (define-public zathura-pdf-mupdf
   (package
     (name "zathura-pdf-mupdf")
-    (version "0.4.1")
+    (version "0.4.3")
     (source (origin
               (method url-fetch)
               (uri
@@ -633,7 +633,7 @@ (define-public zathura-pdf-mupdf
                               "/download/zathura-pdf-mupdf-" version ".tar.xz"))
               (sha256
                (base32
-                "0bxc0b2bkzfc3mqv1g8wjvbvzv95lq34q641jdk2byi3clfs10pr"))))
+                "0xk7fxgx5fiafczwqlpb3hkfmfhhq2ljabxvi272m9vy13p89kwc"))))
     (native-inputs (list pkg-config))
     (inputs
      (list gumbo-parser
-- 
2.45.2

[bug#72256] [PATCH 5/5] gnu: zathura-pdf-poppler: Update to 0.3.2.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/pdf.scm (zathura-pdf-poppler): Update to 0.3.2.
[arguments]: Use G-Expressions.  Pass "-Dplugindir=..." to configure-flags.

Change-Id: Ib76c87267c342007ad8b26e5a9efbcd17a2f488b
---
 gnu/packages/pdf.scm | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 3be620339e..c22c4248bc 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -675,7 +675,7 @@ (define-public zathura-pdf-mupdf
 (define-public zathura-pdf-poppler
   (package
     (name "zathura-pdf-poppler")
-    (version "0.3.1")
+    (version "0.3.2")
     (source (origin
               (method url-fetch)
               (uri
@@ -683,24 +683,15 @@ (define-public zathura-pdf-poppler
                               version ".tar.xz"))
               (sha256
                (base32
-                "12qhkshpp1wjfpjmjccsyi6wscqyqvaa19j85prjpyf65i9jg0gf"))))
+                "049h8m9swxni7ar6fsbm0hb3fg4ffmjc3m6vyg78ilfi3kayxavi"))))
     (native-inputs (list pkg-config))
     (inputs
      (list poppler zathura))
     (build-system meson-build-system)
     (arguments
-     `(#:tests? #f                      ; package does not include tests
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-plugin-directory
-           ;; Something of a regression in 0.2.9: the new Meson build system
-           ;; now hard-codes an incorrect plugin directory.  Fix it.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "meson.build"
-               (("(install_dir:).*" _ key)
-                (string-append key
-                               "'" (assoc-ref outputs "out") "/lib/zathura'\n")))
-             #t)))))
+     (list #:tests? #f                ; package does not include tests
+           #:configure-flags
+           #~(list (string-append "-Dplugindir=" #$output "/lib/zathura"))))
     (home-page "https://pwmt.org/projects/zathura-pdf-poppler/")
     (synopsis "PDF support for zathura (poppler backend)")
     (description "The zathura-pdf-poppler plugin adds PDF support to zathura
-- 
2.45.2

bug#72256: [PATCH 0/5] mupdf and zathura updates

[宋文武 via Guix-patches via]

Pushed now, close.