* [PATCH 2/8] gnu: Add girara.
2015-03-02 9:53 [PATCH 1/8] gnu: check: Update version to 0.9.14 Paul van der Walt
@ 2015-03-02 9:54 ` Paul van der Walt
2015-03-02 9:54 ` [PATCH 3/8] gnu: Add djvulibre Paul van der Walt
` (5 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Paul van der Walt @ 2015-03-02 9:54 UTC (permalink / raw)
To: guix-devel
* gnu/packages/gtk.scm (girara): Add variable.
---
gnu/packages/gtk.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 81f912e..234ca6d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
+;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,6 +29,8 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix build-system waf)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages compression)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages ghostscript)
@@ -770,3 +773,42 @@ extensive documentation, including API reference and a tutorial.")
targetted at GTK 2.x, and can be used in conjunction with gnome-python to
write GNOME applications.")
(license license:lgpl2.1+)))
+
+(define-public girara
+ (package
+ (name "girara")
+ (version "0.2.3")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/girara/download/girara-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1phfmqp8y17zcy9yi6pm2f80x8ldbk60iswpm4bmjz5217jwqzxh"))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("gettext" ,gnu-gettext)))
+ (arguments
+ `(#:make-flags
+ `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
+ "COLOR=0" "CC=gcc")
+ #:test-target "test"
+ #:tests? #f ; Tests fail with "Gtk cannot open display:"
+ #:phases
+ (alist-delete
+ 'configure
+ %standard-phases)))
+ (inputs `(("gtk+" ,gtk+)
+ ("check" ,check)))
+ (build-system gnu-build-system)
+ (home-page "https://pwmt.org/projects/girara/")
+ (synopsis "Library for minimalistic gtk+3 user interfaces")
+ (description "Girara is a library that implements a user interface that
+focuses on simplicity and minimalism. Currently based on GTK+, a
+cross-platform widget toolkit, it provides an interface that focuses on three
+main components: a so-called view widget that represents the actual
+application, an input bar that is used to execute commands of the
+application and the status bar which provides the user with current
+information.")
+ (license license:zlib)))
--
2.3.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 3/8] gnu: Add djvulibre.
2015-03-02 9:53 [PATCH 1/8] gnu: check: Update version to 0.9.14 Paul van der Walt
2015-03-02 9:54 ` [PATCH 2/8] gnu: Add girara Paul van der Walt
@ 2015-03-02 9:54 ` Paul van der Walt
2015-03-02 9:54 ` [PATCH 4/8] gnu: Add zathura Paul van der Walt
` (4 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Paul van der Walt @ 2015-03-02 9:54 UTC (permalink / raw)
To: guix-devel
* gnu/packages/pdf.scm (djvulibre): New variable.
---
gnu/packages/pdf.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 7b4f2ab..5e24a43 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -143,6 +144,27 @@
(license license:gpl3) ; or gpl2, but not gpl2+
(home-page "http://www.foolabs.com/xpdf/")))
+(define-public djvulibre
+ (package
+ (name "djvulibre")
+ (version "3.5.27")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/djvu/djvulibre-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"))))
+ (build-system gnu-build-system)
+ (home-page "http://djvu.sourceforge.net/")
+ (synopsis "Implementation of DjVu, the document format")
+ (description "DjVuLibre is an implementation of DjVu,
+including viewers, browser plugins, decoders, simple encoders, and
+utilities.")
+ (license license:gpl2+)))
+
(define-public podofo
(package
(name "podofo")
--
2.3.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 4/8] gnu: Add zathura.
2015-03-02 9:53 [PATCH 1/8] gnu: check: Update version to 0.9.14 Paul van der Walt
2015-03-02 9:54 ` [PATCH 2/8] gnu: Add girara Paul van der Walt
2015-03-02 9:54 ` [PATCH 3/8] gnu: Add djvulibre Paul van der Walt
@ 2015-03-02 9:54 ` Paul van der Walt
2015-03-02 20:19 ` Mark H Weaver
2015-03-02 9:54 ` [PATCH 5/8] gnu: Add zathura PDF plugin Paul van der Walt
` (3 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Paul van der Walt @ 2015-03-02 9:54 UTC (permalink / raw)
To: guix-devel
* gnu/packages/pdf.scm (zathura): New variable.
* gnu-system.am: Add zathura-plugindir-environment-variable.patch
* gnu/packages/patches/zathura-plugindir-environment-variable.patch: Add patch
for zathura environment variable.
---
gnu-system.am | 4 +-
.../zathura-plugindir-environment-variable.patch | 44 ++++++++++++++++++++
gnu/packages/pdf.scm | 47 ++++++++++++++++++++++
3 files changed, 93 insertions(+), 2 deletions(-)
create mode 100644 gnu/packages/patches/zathura-plugindir-environment-variable.patch
diff --git a/gnu-system.am b/gnu-system.am
index e42e89a..5dda73a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -550,8 +550,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
bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
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..4c7d116
--- /dev/null
+++ b/gnu/packages/patches/zathura-plugindir-environment-variable.patch
@@ -0,0 +1,44 @@
+From f41ea6573185ec326870004e579354e5dd829672 Mon Sep 17 00:00:00 2001
+From: Paul van der Walt <paul@denknerd.org>
+Date: Sun, 1 Mar 2015 22:57:43 +0100
+Subject: [PATCH] Search for Zathura plugins (for reading different file
+ formats) in the environment variable ZATHURA_PLUGIN_DIR. Command line option
+ -p still takes precedence.
+
+Patch by Paul van der Walt <paul@denknerd.org>.
+---
+ zathura/zathura.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/zathura/zathura.c b/zathura/zathura.c
+index 589dd28..d3c9887 100644
+--- a/zathura/zathura.c
++++ b/zathura/zathura.c
+@@ -413,12 +413,24 @@ zathura_set_plugin_dir(zathura_t* zathura, const char* dir)
+ g_return_if_fail(zathura != NULL);
+ g_return_if_fail(zathura->plugins.manager != NULL);
+
++ // Get the new environment variable, if any.
++ const gchar* envvar_plugin_dir = g_getenv("ZATHURA_PLUGIN_DIR");
++
+ if (dir != NULL) {
++ // This bit sets the plugin dir from command-line.
+ girara_list_t* paths = girara_split_path_array(dir);
+ GIRARA_LIST_FOREACH(paths, char*, iter, path)
+ zathura_plugin_manager_add_dir(zathura->plugins.manager, path);
+ GIRARA_LIST_FOREACH_END(paths, char*, iter, path);
+ girara_list_free(paths);
++ } else if (envvar_plugin_dir != NULL) {
++ // Set plugins dir to the contents of environment variable
++ // ZATHURA_PLUGIN_DIR.
++ girara_list_t* paths = girara_split_path_array(envvar_plugin_dir);
++ GIRARA_LIST_FOREACH(paths, char*, iter, path)
++ zathura_plugin_manager_add_dir(zathura->plugins.manager, path);
++ GIRARA_LIST_FOREACH_END(paths, char*, iter, path);
++ girara_list_free(paths);
+ } else {
+ #ifdef ZATHURA_PLUGINDIR
+ girara_list_t* paths = girara_split_path_array(ZATHURA_PLUGINDIR);
+--
+2.3.1
+
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 5e24a43..1c5c193 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)
@@ -146,6 +149,50 @@
+
+(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)))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "ZATHURA_PLUGIN_DIR")
+ (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 highly customizable and functional document
+viewer. It provides a minimalistic and space saving interface as well as an
+easy usage that mainly focuses on keyboard interaction.")
+ (inputs `(("girara" ,girara)
+ ("sqlite" ,sqlite)
+ ("gtk+" ,gtk+)))
+ (license license:zlib)))
+
(define-public djvulibre
(package
(name "djvulibre")
--
2.3.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 4/8] gnu: Add zathura.
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
0 siblings, 1 reply; 15+ messages in thread
From: Mark H Weaver @ 2015-03-02 20:19 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
Paul van der Walt <paul@denknerd.org> writes:
> * gnu/packages/pdf.scm (zathura): New variable.
> * gnu-system.am: Add zathura-plugindir-environment-variable.patch
> * gnu/packages/patches/zathura-plugindir-environment-variable.patch: Add patch
> for zathura environment variable.
It's not important, but the way we usually write this is:
* gnu/packages/patches/zathura-plugindir-environment-variable.patch: New file.
* gnu-system.am: Add it.
We don't generally describe what new files are for in the commit log.
Such explanations belong in the files themselves.
> ---
> gnu-system.am | 4 +-
> .../zathura-plugindir-environment-variable.patch | 44 ++++++++++++++++++++
> gnu/packages/pdf.scm | 47 ++++++++++++++++++++++
> 3 files changed, 93 insertions(+), 2 deletions(-)
> create mode 100644 gnu/packages/patches/zathura-plugindir-environment-variable.patch
>
> diff --git a/gnu-system.am b/gnu-system.am
> index e42e89a..5dda73a 100644
> --- a/gnu-system.am
> +++ b/gnu-system.am
> @@ -550,8 +550,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
For consistency, please use tabs before the "\", and keep the blank line
above the MISC_DISTRO_FILES definition.
> +diff --git a/zathura/zathura.c b/zathura/zathura.c
> +index 589dd28..d3c9887 100644
> +--- a/zathura/zathura.c
> ++++ b/zathura/zathura.c
> +@@ -413,12 +413,24 @@ zathura_set_plugin_dir(zathura_t* zathura, const char* dir)
> + g_return_if_fail(zathura != NULL);
> + g_return_if_fail(zathura->plugins.manager != NULL);
> +
> ++ // Get the new environment variable, if any.
> ++ const gchar* envvar_plugin_dir = g_getenv("ZATHURA_PLUGIN_DIR");
> ++
> + if (dir != NULL) {
> ++ // This bit sets the plugin dir from command-line.
> + girara_list_t* paths = girara_split_path_array(dir);
> + GIRARA_LIST_FOREACH(paths, char*, iter, path)
> + zathura_plugin_manager_add_dir(zathura->plugins.manager, path);
> + GIRARA_LIST_FOREACH_END(paths, char*, iter, path);
> + girara_list_free(paths);
> ++ } else if (envvar_plugin_dir != NULL) {
> ++ // Set plugins dir to the contents of environment variable
> ++ // ZATHURA_PLUGIN_DIR.
> ++ girara_list_t* paths = girara_split_path_array(envvar_plugin_dir);
> ++ GIRARA_LIST_FOREACH(paths, char*, iter, path)
> ++ zathura_plugin_manager_add_dir(zathura->plugins.manager, path);
> ++ GIRARA_LIST_FOREACH_END(paths, char*, iter, path);
> ++ girara_list_free(paths);
> + } else {
Since the environment variable can hold a path with more than one
directory, it is misnamed. How about ZATHURA_PLUGIN_PATH instead?
Also the code above could be simplified.
How about something like this: (untested)
--8<---------------cut here---------------start------------->8---
g_return_if_fail(zathura != NULL);
g_return_if_fail(zathura->plugins.manager != NULL);
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)
zathura_plugin_manager_add_dir(zathura->plugins.manager, path);
GIRARA_LIST_FOREACH_END(paths, char*, iter, path);
girara_list_free(paths);
} else {
--8<---------------cut here---------------end--------------->8---
This would be just three new lines, but it depends on 'dir' not being
used for anything else further down in the function, and it not being
freed. If it is freed later, you could just wrap the 'g_getenv' with
'g_strdup'.
What do you think?
> diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
> index 5e24a43..1c5c193 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)
> @@ -146,6 +149,50 @@
>
>
>
> +
> +(define-public zathura
Too many blank lines.
> + (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)))
> + (native-search-paths
> + (list (search-path-specification
> + (variable "ZATHURA_PLUGIN_DIR")
> + (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)))
This fits easily on one line:
#:phases (alist-delete 'configure %standard-phases)
> + (home-page "https://pwmt.org/projects/zathura/")
> + (synopsis "Lightweight keyboard-driven PDF viewer")
> + (description "zathura is a highly customizable and functional document
> +viewer. It provides a minimalistic and space saving interface as well as an
> +easy usage that mainly focuses on keyboard interaction.")
Probably the description should start with a capital letter, and I would
remove "and functional" and "as well as an easy usage" which sound like
marketing-speak.
> + (inputs `(("girara" ,girara)
> + ("sqlite" ,sqlite)
> + ("gtk+" ,gtk+)))
Please move this next to 'native-inputs'.
Can you send an updated patch?
Thanks!
Mark
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 4/8] gnu: Add zathura.
2015-03-02 20:19 ` Mark H Weaver
@ 2015-03-02 21:20 ` Paul van der Walt
0 siblings, 0 replies; 15+ messages in thread
From: Paul van der Walt @ 2015-03-02 21:20 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel
On 2015-03-02 at 21:19, quoth Mark H Weaver:
> It's not important, but the way we usually write this is:
> [...]
> We don't generally describe what new files are for in the commit log.
> Such explanations belong in the files themselves.
Will fix!
> For consistency, please use tabs before the "\", and keep the blank line
> above the MISC_DISTRO_FILES definition.
Done.
> Since the environment variable can hold a path with more than one
> directory, it is misnamed. How about ZATHURA_PLUGIN_PATH instead?
>
> Also the code above could be simplified.
> How about something like this: (untested)
That looks quite elegant, will try it. Thanks for the suggestion!
> dir = g_getenv("ZATHURA_PLUGIN_PATH");
>
> What do you think?
Using your name and approach :)
> Probably the description should start with a capital letter, and I would
> remove "and functional" and "as well as an easy usage" which sound like
> marketing-speak.
True.
> Please move this next to 'native-inputs'.
I'll neaten them all up a bit.
Expect a pile of patches promptly.
Thanks,
p.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 5/8] gnu: Add zathura PDF plugin.
2015-03-02 9:53 [PATCH 1/8] gnu: check: Update version to 0.9.14 Paul van der Walt
` (2 preceding siblings ...)
2015-03-02 9:54 ` [PATCH 4/8] gnu: Add zathura Paul van der Walt
@ 2015-03-02 9:54 ` Paul van der Walt
2015-03-02 9:54 ` [PATCH 6/8] gnu: Add zathura DjVu plugin Paul van der Walt
` (2 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Paul van der Walt @ 2015-03-02 9:54 UTC (permalink / raw)
To: guix-devel
* gnu/packages/pdf.scm (zathura-pdf-poppler): New variable.
---
gnu/packages/pdf.scm | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 1c5c193..0f2fcfe 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -150,6 +150,44 @@
+(define-public zathura-pdf-poppler
+ (package
+ (name "zathura-pdf-poppler")
+ (version "0.2.5")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0"))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags
+ `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
+ "PLUGINDIR=/lib/zathura" "CC=gcc")
+ #:tests? #f ; Package does not include tests.
+ #:phases
+ (alist-delete
+ 'configure
+ %standard-phases)))
+ (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.")
+ (propagated-inputs
+ `(("girara" ,girara)))
+ (inputs
+ `(("poppler" ,poppler)
+ ("gtk+" ,gtk+)
+ ("zathura" ,zathura)
+ ("cairo" ,cairo)))
+ (license license:zlib)))
+
(define-public zathura
(package
(name "zathura")
--
2.3.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 6/8] gnu: Add zathura DjVu plugin.
2015-03-02 9:53 [PATCH 1/8] gnu: check: Update version to 0.9.14 Paul van der Walt
` (3 preceding siblings ...)
2015-03-02 9:54 ` [PATCH 5/8] gnu: Add zathura PDF plugin Paul van der Walt
@ 2015-03-02 9:54 ` Paul van der Walt
2015-03-02 9:54 ` [PATCH 7/8] gnu: Add zathura postscript plugin Paul van der Walt
2015-03-02 9:54 ` [PATCH 8/8] gnu: Add zathura comicbook plugin Paul van der Walt
6 siblings, 0 replies; 15+ messages in thread
From: Paul van der Walt @ 2015-03-02 9:54 UTC (permalink / raw)
To: guix-devel
* gnu/packages/pdf.scm (zathura-djvu): New variable.
---
gnu/packages/pdf.scm | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 0f2fcfe..72ad46f 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -150,6 +150,41 @@
+(define-public zathura-djvu
+ (package
+ (name "zathura-djvu")
+ (version "0.2.4")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1g1lafmrjbx0xv7fljdmyqxx0k334sq4q6jy4a0q5xfrgz0bh45c"))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags
+ `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
+ "PLUGINDIR=/lib/zathura" "CC=gcc")
+ #:tests? #f ; Package does not contain tests.
+ #:phases
+ (alist-delete
+ 'configure
+ %standard-phases)))
+ (home-page "https://pwmt.org/projects/zathura-djvu/")
+ (synopsis "DjVu support for zathura (DjVuLibre backend)")
+ (description "The zathura-djvu plugin adds DjVu support to zathura
+using the DjVuLibre library.")
+ (propagated-inputs
+ `(("girara" ,girara)))
+ (inputs
+ `(("djvulibre" ,djvulibre)
+ ("gtk+" ,gtk+)
+ ("zathura" ,zathura)))
+ (license license:zlib)))
+
(define-public zathura-pdf-poppler
(package
--
2.3.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 7/8] gnu: Add zathura postscript plugin.
2015-03-02 9:53 [PATCH 1/8] gnu: check: Update version to 0.9.14 Paul van der Walt
` (4 preceding siblings ...)
2015-03-02 9:54 ` [PATCH 6/8] gnu: Add zathura DjVu plugin Paul van der Walt
@ 2015-03-02 9:54 ` Paul van der Walt
2015-03-02 9:54 ` [PATCH 8/8] gnu: Add zathura comicbook plugin Paul van der Walt
6 siblings, 0 replies; 15+ messages in thread
From: Paul van der Walt @ 2015-03-02 9:54 UTC (permalink / raw)
To: guix-devel
* gnu/packages/pdf.scm (zathura-ps): New variable.
---
gnu/packages/pdf.scm | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 72ad46f..7a5c649 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -150,6 +150,42 @@
+(define-public zathura-ps
+ (package
+ (name "zathura-ps")
+ (version "0.2.2")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-ps/download/zathura-ps-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1a6ps5v1wk18qvslbkjln6w8wfzzr6fi13ls96vbdc03vdhn4m76"))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags
+ `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
+ "PLUGINDIR=/lib/zathura" "CC=gcc")
+ #:tests? #f ; Package does not contain tests.
+ #:phases
+ (alist-delete
+ 'configure
+ %standard-phases)))
+ (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
+using libspectre.")
+ (propagated-inputs
+ `(("girara" ,girara)))
+ (inputs
+ `(("libspectre" ,libspectre)
+ ("gtk+" ,gtk+)
+ ("zathura" ,zathura)))
+ (license license:zlib)))
+
(define-public zathura-djvu
(package
(name "zathura-djvu")
--
2.3.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 8/8] gnu: Add zathura comicbook plugin.
2015-03-02 9:53 [PATCH 1/8] gnu: check: Update version to 0.9.14 Paul van der Walt
` (5 preceding siblings ...)
2015-03-02 9:54 ` [PATCH 7/8] gnu: Add zathura postscript plugin Paul van der Walt
@ 2015-03-02 9:54 ` Paul van der Walt
6 siblings, 0 replies; 15+ messages in thread
From: Paul van der Walt @ 2015-03-02 9:54 UTC (permalink / raw)
To: guix-devel
* gnu/packages/pdf.scm (zathura-cb): New variable.
---
gnu/packages/pdf.scm | 37 +++++++++++++++++++++++++++++++++++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 7a5c649..baefaa4 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -147,8 +147,41 @@
(license license:gpl3) ; or gpl2, but not gpl2+
(home-page "http://www.foolabs.com/xpdf/")))
+(define-public zathura-cb
+ (package
+ (name "zathura-cb")
+ (version "0.1.4")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-cb/download/zathura-cb-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "09ln4fpjxmhcq6cw1ka7mdkmca36gyd4gzrynbw3waz0ri0b277j"))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags
+ `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
+ "PLUGINDIR=/lib/zathura" "CC=gcc")
+ #:tests? #f ; Package does not contain tests.
+ #:phases
+ (alist-delete
+ 'configure
+ %standard-phases)))
+ (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.")
+ (propagated-inputs
+ `(("girara" ,girara)))
+ (inputs
+ `(("libarchive" ,libarchive)
+ ("gtk+" ,gtk+)
+ ("zathura" ,zathura)))
+ (license license:zlib)))
+
(define-public zathura-ps
(package
--
2.3.1
^ permalink raw reply related [flat|nested] 15+ messages in thread