Subject: [bug#40994] 7-zathura-cb-v1

From: Raghav Gururajan <[email-masked]>
Date: Sat, 2 May 2020 05:58:54 -0400

>From 60c6f623546f09070e0397395cc2b44920d99549 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Sat, 2 May 2020 05:56:43 -0400
Subject: [PATCH 7/7] gnu: zathura-cb: Move to pwmt module.

Moved variable from pdf.scm to pwmt.scm, for being part of pwmt project.
Added extra dependencies and arguments for additional features.
Updated synopsis and description.
Made some cosmetic changes in the definition.

* gnu/packages/pdf.scm (zathura-cb): Remove variable.
* gnu/packages/pwmt.scm (zathura-cb): Add variable.
---
 gnu/packages/pdf.scm  | 35 --------------------------------
 gnu/packages/pwmt.scm | 46 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 6949ca4750..caae864979 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -391,41 +391,6 @@ reading and editing of existing PDF files.")
    (license license:gpl3)             ; or gpl2, but not gpl2+
    (home-page "https://www.xpdfreader.com/")))
 
-(define-public zathura-cb
-  (package
-    (name "zathura-cb")
-    (version "0.1.8")
-    (source (origin
-              (method url-fetch)
-              (uri
-               (string-append "https://pwmt.org/projects/zathura-cb/download/zathura-cb-"
-                              version ".tar.xz"))
-              (sha256
-               (base32
-                "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"))))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("libarchive" ,libarchive)
-              ("zathura" ,zathura)))
-    (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.1.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-cb/")
-    (synopsis "Comic book support for zathura (libarchive backend)")
-    (description "The zathura-cb plugin adds comic book support to zathura
-using libarchive.")
-    (license license:zlib)))
-
 (define-public podofo
   (package
     (name "podofo")
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 173a35d892..a67a707faa 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -24,6 +24,7 @@
 
 (define-module (gnu packages pwmt)
   #:use-module (gnu packages)
+  #:use-module (gnu packages backup)
   #:use-module (gnu packages check)
   #:use-module (gnu packages djvu)
   #:use-module (gnu packages documentation)
@@ -357,3 +358,48 @@ using the mupdf rendering library.")
 using the DjVu library.")
     (home-page "https://pwmt.org/projects/zathura-djvu/")
     (license license:zlib)))
+
+(define-public zathura-cb
+  (package
+    (name "zathura-cb")
+    (version "0.1.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://pwmt.org/projects/" name "/download/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:tests? #f                      ; No target
+       #:glib-or-gtk? #t                ; To compile schemas
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-plugin-directory
+           ;; This package tries to install into directory of Zathura.
+           ;; That cannot be allowed. 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)))))
+    (native-inputs
+     `(("glib:bin" ,glib "bin")
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("cairo" ,cairo)
+       ("girara" ,girara)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("json-c" ,json-c)          ; For configuration dumping support
+       ("libarchive" ,libarchive)
+       ("libnotify" ,libnotify)         ; For notification support
+       ("zathura" ,zathura)))
+    (synopsis "Comic book support for zathura")
+    (description "The zathura-cb plugin adds comic book support to zathura.")
+    (home-page "https://pwmt.org/projects/zathura-cb/")
+    (license license:zlib)))
-- 
2.26.2