guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/07: gnu: zathura-djvu: Update to 0.2.8.


From: Tobias Geerinckx-Rice
Subject: 05/07: gnu: zathura-djvu: Update to 0.2.8.
Date: Tue, 1 May 2018 01:14:57 -0400 (EDT)

nckx pushed a commit to branch staging
in repository guix.

commit 7d475dd4ece966faae71323f309b65314b27a5a3
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Mon Mar 19 20:37:01 2018 +0100

    gnu: zathura-djvu: Update to 0.2.8.
    
    * gnu/packages/pdf.scm (zathura-djvu): Update to 0.2.8.
    [build-system]: Switch to the Meson build system.
    [arguments]: Trim accordingly.  Add a new ‘patch-plugin-directory’
    phase.
---
 gnu/packages/pdf.scm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 77d78bb..151143a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -384,27 +384,33 @@ using libspectre.")
 (define-public zathura-djvu
   (package
     (name "zathura-djvu")
-    (version "0.2.7")
+    (version "0.2.8")
     (source (origin
               (method url-fetch)
               (uri
                (string-append 
"https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-";
-                              version ".tar.gz"))
+                              version ".tar.xz"))
               (sha256
                (base32
-                "1sbfdsyp50qc85xc4458sn4w1rv1qbygdwmcr5kjlfpsmdq98vhd"))))
+                "0axkv1crdxn0z44whaqp2ibkdqcykhjnxk7qzms0dp1b67an9rnh"))))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs
      `(("djvulibre" ,djvulibre)
        ("zathura" ,zathura)))
-    (build-system gnu-build-system)
+    (build-system meson-build-system)
     (arguments
-     `(#:make-flags (list (string-append "PREFIX=" %output)
-                          (string-append "PLUGINDIR=" %output "/lib/zathura")
-                          "CC=gcc")
-       #:tests? #f ; Package does not contain tests.
+     `(#:tests? #f                      ; package does not contain tests
        #:phases
-       (modify-phases %standard-phases (delete 'configure))))
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-plugin-directory
+           ;; Something of a regression in 0.2.8: 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)))))
     (home-page "https://pwmt.org/projects/zathura-djvu/";)
     (synopsis "DjVu support for zathura (DjVuLibre backend)")
     (description "The zathura-djvu plugin adds DjVu support to zathura



reply via email to

[Prev in Thread] Current Thread [Next in Thread]