From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul van der Walt Subject: [PATCH 3/7] gnu: Add zathura. Date: Mon, 2 Mar 2015 00:47:49 +0100 Message-ID: <1425253673-32604-3-git-send-email-paul@denknerd.org> References: <1425253673-32604-1-git-send-email-paul@denknerd.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSDal-0001xW-47 for guix-devel@gnu.org; Sun, 01 Mar 2015 18:48:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSDaf-0004aP-I5 for guix-devel@gnu.org; Sun, 01 Mar 2015 18:48:11 -0500 Received: from mx02.posteo.de ([89.146.194.165]:39617) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSDaf-0004a6-9y for guix-devel@gnu.org; Sun, 01 Mar 2015 18:48:05 -0500 In-Reply-To: <1425253673-32604-1-git-send-email-paul@denknerd.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * 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 | 50 ++++++++++++++++++++++ 3 files changed, 96 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 +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 . +--- + 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 76c77d9..834ba6d 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,53 @@ + +(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))) + (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") + #:phases + (alist-delete + 'check + (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 `(("glib" ,glib) + ("girara" ,girara) + ("gettext" ,gnu-gettext) + ("sqlite" ,sqlite) + ("gtk+" ,gtk+))) + (license license:zlib))) + + + (define-public djvulibre (package (name "djvulibre") -- 2.3.1