guix-commits
[Top][All Lists]
Advanced

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

04/07: gnu: zathura-ps: Update to 0.2.6.


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

nckx pushed a commit to branch staging
in repository guix.

commit 06dbfb5d197db7502ed65c1019e96f3f02c34b7a
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Mon Mar 19 20:33:34 2018 +0100

    gnu: zathura-ps: Update to 0.2.6.
    
    * gnu/packages/pdf.scm (zathura-ps): Update to 0.2.6.
    [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 1054bc2..77d78bb 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -349,26 +349,32 @@ using libarchive.")
 (define-public zathura-ps
   (package
     (name "zathura-ps")
-    (version "0.2.5")
+    (version "0.2.6")
     (source (origin
               (method url-fetch)
               (uri
                (string-append 
"https://pwmt.org/projects/zathura-ps/download/zathura-ps-";
-                              version ".tar.gz"))
+                              version ".tar.xz"))
               (sha256
                (base32
-                "1x4knqja8pw2a5cb3y2209nr3iddj1z8nwasy48v5nprj61fdxqj"))))
+                "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"))))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs `(("libspectre" ,libspectre)
               ("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.6: 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-ps/";)
     (synopsis "PS support for zathura (libspectre backend)")
     (description "The zathura-ps plugin adds PS support to zathura



reply via email to

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