[bug#63193] [PATCH 0/2] Update mupdf

[bug#63193] [PATCH 0/2] Update mupdf

[Timotej Lazar]

Hi, this updates and slightly simplifies the mupdf package. Thanks!

Timotej Lazar (2):
  gnu: mupdf: Update to 1.22.0.
  gnu: mupdf: Simplify snippet.

 gnu/packages/pdf.scm | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)


base-commit: a34348967e032acfab2aa0b512d318a70f5543dd
-- 
2.39.2

[bug#63193] [PATCH 1/2] gnu: mupdf: Update to 1.22.0.

[Timotej Lazar]

* gnu/packages/pdf.scm (mupdf): Update to 1.22.0.
---
 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 ff7d895774..6c44952583 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -796,14 +796,14 @@ (define-public python-pydyf
 (define-public mupdf
   (package
     (name "mupdf")
-    (version "1.21.1")
+    (version "1.22.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://mupdf.com/downloads/archive/"
                            "mupdf-" version "-source.tar.lz"))
        (sha256
-        (base32 "0876sn5nd8vyw9d3d3bmripm119jy6734rs0ywppqzvccy839936"))
+        (base32 "0ghwam1c1izks1n2zq2pr8z67nvrx4njk5rla86b75l4pw58mmxy"))
        (modules '((guix build utils)))
        (snippet
         #~(begin
-- 
2.39.2

[bug#63193] [PATCH 2/2] gnu: mupdf: Simplify snippet.

[Timotej Lazar]

* gnu/packages/pdf.scm (mupdf)[source]: Simplify code to remove unused
thirdparty libs.
---
 gnu/packages/pdf.scm | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 6c44952583..1608c49127 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -804,20 +804,17 @@ (define-public mupdf
                            "mupdf-" version "-source.tar.lz"))
        (sha256
         (base32 "0ghwam1c1izks1n2zq2pr8z67nvrx4njk5rla86b75l4pw58mmxy"))
-       (modules '((guix build utils)))
+       (modules '((guix build utils)
+                  (ice-9 ftw)
+                  (srfi srfi-1)))
        (snippet
-        #~(begin
-            ;; Remove bundled software.  Keep patched variants.
-            (let* ((keep (list "extract" "freeglut" "lcms2"))
-                   (from "thirdparty")
-                   (kept (string-append from "~temp")))
-              (mkdir-p kept)
-              (for-each (lambda (file)
-                          (rename-file (string-append from "/" file)
-                                       (string-append kept "/" file)))
-                        keep)
-              (delete-file-recursively from)
-              (rename-file kept from))))))
+        ;; Remove bundled software.  Keep patched variants.
+        #~(with-directory-excursion "thirdparty"
+            (let ((keep '("README" "extract" "freeglut" "lcms2")))
+              (for-each delete-file-recursively
+                        (lset-difference string=?
+                                         (scandir ".")
+                                         (cons* "." ".." keep))))))))
     (build-system gnu-build-system)
     (inputs
      (list curl
-- 
2.39.2

bug#63193: [PATCH 0/2] Update mupdf

[Ludovic Courtès]

Hi,

Timotej Lazar <timotej.lazar@araneo.si> skribis:

>   gnu: mupdf: Update to 1.22.0.
>   gnu: mupdf: Simplify snippet.

Applied, thanks!

Ludo’.