[bug#40994] 4-zathura-pdf-poppler-v1

[Raghav Gururajan <raghavgururajan@disroot.org>]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: 4-zathura-pdf-poppler-v1.patch --]
[-- Type: text/x-patch, Size: 4560 bytes --]

From e857c3eb891831dd3916e2103652416f5fabb2ef Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 04:11:49 -0400
Subject: [PATCH 4/4] gnu: zathura-pdf-poppler: 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.
Removed phase 'patch-plugin-directory'.
Added configure-flag 'plugindir'.
Updated synopsis and description.
Made some cosmetic changes in the definition.

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

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index c5539c7df5..0aca1e707a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -506,42 +506,6 @@ using the DjVuLibre library.")
 by using the @code{mupdf} rendering library.")
     (license license:zlib)))
 
-(define-public zathura-pdf-poppler
-  (package
-    (name "zathura-pdf-poppler")
-    (version "0.3.0")
-    (source (origin
-              (method url-fetch)
-              (uri
-               (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
-                              version ".tar.xz"))
-              (sha256
-               (base32
-                "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("poppler" ,poppler)
-       ("zathura" ,zathura)))
-    (build-system meson-build-system)
-    (arguments
-     `(#:tests? #f                      ; package does not include tests
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-plugin-directory
-           ;; Something of a regression in 0.2.9: 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-pdf-poppler/")
-    (synopsis "PDF support for zathura (poppler backend)")
-    (description "The zathura-pdf-poppler plugin adds PDF support to zathura
-by using the poppler rendering engine.")
-    (license license:zlib)))
-
 (define-public podofo
   (package
     (name "podofo")
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 8b177e3e7a..fa973cea17 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -34,6 +34,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages pdf)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
@@ -224,3 +225,39 @@ DjVu and ComicBook) via plugins.")
 using the libspectre library.")
     (home-page "https://pwmt.org/projects/zathura-ps/")
     (license license:zlib)))
+
+(define-public zathura-pdf-poppler
+  (package
+    (name "zathura-pdf-poppler")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "https://pwmt.org/projects/" name "/download/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#: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
+     `(("glib:bin" ,glib "bin")
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("cairo" ,cairo)
+       ("girara" ,girara)
+       ("glib" ,glib)
+       ("poppler" ,poppler)
+       ("zathura" ,zathura)))
+    (synopsis "PDF support (poppler backend) for zathura")
+    (description "The zathura-pdf-poppler plugin adds PDF support to zathura by
+using the poppler rendering library.")
+    (home-page "https://pwmt.org/projects/zathura-pdf-poppler/")
+    (license license:zlib)))
-- 
2.26.2