From: Paul van der Walt <paul@denknerd.org>
To: guix-devel@gnu.org
Subject: [PATCH 4/8] gnu: Add zathura.
Date: Mon, 2 Mar 2015 22:26:32 +0100 [thread overview]
Message-ID: <1425331596-19897-4-git-send-email-paul@denknerd.org> (raw)
In-Reply-To: <1425331596-19897-1-git-send-email-paul@denknerd.org>
* gnu/packages/pdf.scm (zathura): New variable.
* gnu/packages/patches/zathura-plugindir-environment-variable.patch: New file.
* gnu-system.am: Add it.
---
gnu-system.am | 3 +-
.../zathura-plugindir-environment-variable.patch | 35 ++++++++++++++++++
gnu/packages/pdf.scm | 43 ++++++++++++++++++++++
3 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/zathura-plugindir-environment-variable.patch
diff --git a/gnu-system.am b/gnu-system.am
index a500ec7..c98cb14 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -551,7 +551,8 @@ dist_patch_DATA = \
gnu/packages/patches/xf86-video-trident-remove-mibstore.patch \
gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \
gnu/packages/patches/xfce4-panel-plugins.patch \
- gnu/packages/patches/xmodmap-asprintf.patch
+ gnu/packages/patches/xmodmap-asprintf.patch \
+ gnu/packages/patches/zathura-plugindir-environment-variable.patch
MISC_DISTRO_FILES = gnu/packages/javac.in
diff --git a/gnu/packages/patches/zathura-plugindir-environment-variable.patch b/gnu/packages/patches/zathura-plugindir-environment-variable.patch
new file mode 100644
index 0000000..2e3ea52
--- /dev/null
+++ b/gnu/packages/patches/zathura-plugindir-environment-variable.patch
@@ -0,0 +1,35 @@
+From ae8e4cc9ab57ff25d2ba6c4b369e8531ce43a6d2 Mon Sep 17 00:00:00 2001
+From: Paul van der Walt <paul@denknerd.org>
+Date: Mon, 2 Mar 2015 22:15:39 +0100
+Subject: [PATCH] Search path environment variable for Zathura.
+
+Adds a search path environment variable for zathura plugins (for reading
+different file formats) called ZATHURA_PLUGIN_PATH. Command line option
+-p still takes precedence.
+
+Patch by Paul van der Walt <paul@denknerd.org>
+---
+ zathura/zathura.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/zathura/zathura.c b/zathura/zathura.c
+index 589dd28..375ec54 100644
+--- a/zathura/zathura.c
++++ b/zathura/zathura.c
+@@ -413,6 +413,13 @@ zathura_set_plugin_dir(zathura_t* zathura, const char* dir)
+ g_return_if_fail(zathura != NULL);
+ g_return_if_fail(zathura->plugins.manager != NULL);
+
++ /* Added for Guix: check if environment variable
++ * is set to specify location of zathura plugins.
++ */
++
++ if (dir == NULL)
++ dir = g_getenv("ZATHURA_PLUGIN_PATH");
++
+ if (dir != NULL) {
+ girara_list_t* paths = girara_split_path_array(dir);
+ GIRARA_LIST_FOREACH(paths, char*, iter, path)
+--
+2.3.1
+
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 4cf1089..100a799 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -29,6 +29,9 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages databases)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages backup)
#:use-module (gnu packages lesstif)
#:use-module (gnu packages image)
#:use-module (gnu packages pkg-config)
@@ -144,6 +147,46 @@
(license license:gpl3) ; or gpl2, but not gpl2+
(home-page "http://www.foolabs.com/xpdf/")))
+(define-public zathura
+ (package
+ (name "zathura")
+ (version "0.3.2")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura/download/zathura-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1qk5s7cyqp4l673yhma5igk9g24p5jyqyy81fdk7q7xjqlym19px"))
+ (patches
+ (list
+ (search-patch "zathura-plugindir-environment-variable.patch")))))
+ (native-inputs `(("pkg-config" ,pkg-config)
+ ("gettext" ,gnu-gettext)))
+ (inputs `(("girara" ,girara)
+ ("sqlite" ,sqlite)
+ ("gtk+" ,gtk+)))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "ZATHURA_PLUGIN_PATH")
+ (files '("lib/zathura")))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags
+ `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
+ "CC=gcc" "COLOR=0")
+ #:tests? #f ; Tests fail: "Gtk cannot open display".
+ #:test-target "test"
+ #:phases
+ (alist-delete 'configure %standard-phases)))
+ (home-page "https://pwmt.org/projects/zathura/")
+ (synopsis "Lightweight keyboard-driven PDF viewer")
+ (description "Zathura is a customizable document viewer. It provides a
+minimalistic interface and an interface that mainly focuses on keyboard
+interaction.")
+ (license license:zlib)))
+
(define-public djvulibre
(package
(name "djvulibre")
--
2.3.1
next prev parent reply other threads:[~2015-03-02 21:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-02 21:26 [PATCH 1/8] gnu: check: Update version to 0.9.14 Paul van der Walt
2015-03-02 21:26 ` [PATCH 2/8] gnu: Add girara Paul van der Walt
2015-03-02 22:47 ` Mark H Weaver
2015-03-02 21:26 ` [PATCH 3/8] gnu: Add djvulibre Paul van der Walt
2015-03-02 23:21 ` Mark H Weaver
2015-03-02 23:40 ` Paul van der Walt
2015-03-03 12:19 ` Ludovic Courtès
2015-03-03 12:33 ` Paul van der Walt
2015-03-02 21:26 ` Paul van der Walt [this message]
2015-03-02 21:26 ` [PATCH 5/8] gnu: Add zathura PDF plugin Paul van der Walt
2015-03-02 21:26 ` [PATCH 6/8] gnu: Add zathura DjVu plugin Paul van der Walt
2015-03-02 21:26 ` [PATCH 7/8] gnu: Add zathura postscript plugin Paul van der Walt
2015-03-02 21:26 ` [PATCH 8/8] gnu: Add zathura comicbook plugin Paul van der Walt
2015-03-02 22:42 ` [PATCH 1/8] gnu: check: Update version to 0.9.14 Mark H Weaver
-- strict thread matches above, loose matches on Subject: below --
2015-03-02 9:53 Paul van der Walt
2015-03-02 9:54 ` [PATCH 4/8] gnu: Add zathura Paul van der Walt
2015-03-02 20:19 ` Mark H Weaver
2015-03-02 21:20 ` Paul van der Walt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425331596-19897-4-git-send-email-paul@denknerd.org \
--to=paul@denknerd.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.