>From 806ae5789545cda66ff544e2c5e943fc1bb9fa28 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <address@hidden>
Date: Sun, 3 May 2020 00:11:35 -0400
Subject: [PATCH 13/14] gnu: zathura-djvu: Update package definition.

* gnu/packages/pwmt.scm (zathura-djvu):
[arguments]<#:glib-or-gtk?>: New argument.
<#:phases>['patch-plugin-directory]: Removed.
<#:configure-flags>[-Dplugindir]: New flag.
[inputs]<cairo,girara,glib,gtk+,json-c,libnotify>: New inputs.
[synopsis]: Updated.
[description]: Updated.
---
 gnu/packages/pwmt.scm | 56 ++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 7c734c2111..5ad4cbe7f7 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -320,36 +320,38 @@ using the mupdf rendering library.")
   (package
     (name "zathura-djvu")
     (version "0.2.9")
-    (source (origin
-              (method url-fetch)
-              (uri
-               (string-append "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-"
-                              version ".tar.xz"))
-              (sha256
-               (base32
-                "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln"))))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("djvulibre" ,djvulibre)
-       ("zathura" ,zathura)))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://pwmt.org/projects/zathura-djvu/download/"
+                       "zathura-djvu-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln"))))
     (build-system meson-build-system)
     (arguments
-     `(#:tests? #f                      ; package does not contain tests
-       #:phases
-       (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)")
+     `(#:tests? #f                      ; No target
+       #:glib-or-gtk? #t                ; To compile schemas
+       #:configure-flags
+       (list
+        (string-append "-Dplugindir="
+                       (assoc-ref %outputs "out") "/lib/zathura"))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("cairo" ,cairo)
+       ("djvulibre" ,djvulibre)
+       ("girara" ,girara)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("json-c" ,json-c)              ; To generate cargs for zathura
+       ("libnotify" ,libnotify)        ; To generate cargs for zathura
+       ("zathura" ,zathura)))
+    (synopsis "DjVu support for zathura")
     (description "The zathura-djvu plugin adds DjVu support to zathura
-using the DjVuLibre library.")
+using the DjVu library.")
+    (home-page "https://pwmt.org/projects/zathura-djvu/")
     (license license:zlib)))
 
 (define-public zathura-cb
-- 
2.26.2