nckx pushed a commit to branch staging
in repository guix.
commit 6321610d41e48cbce4d8737a16fb01747b3ba086
Author: Tobias Geerinckx-Rice <m...@tobias.gr>
Date: Mon Jun 18 01:23:43 2018 +0200
gnu: zathura: Fix plugin path regression.
eb6a5dab5cf0f85fbc4eda4b6f7956eed464c3cf (gnu: zathura: Update to 0.3.9)
silently broke Zathura's (Guix-specific) ZATHURA_PLUGIN_PATH mechanism.
My environment was so filthy that all happened to work just fine, but as
usual Marius was right and the patch needed tweaking.
* gnu/packages/patches/zathura-plugindir-environment-variable.patch:
Tweak.
---
.../patches/zathura-plugindir-environment-variable.patch | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/patches/zathura-plugindir-environment-variable.patch
b/gnu/packages/patches/zathura-plugindir-environment-variable.patch
index 2e3ea52..a8ffff9 100644
--- a/gnu/packages/patches/zathura-plugindir-environment-variable.patch
+++ b/gnu/packages/patches/zathura-plugindir-environment-variable.patch
@@ -8,15 +8,15 @@ different file formats) called ZATHURA_PLUGIN_PATH. Command
line option
-p still takes precedence.
Patch by Paul van der Walt <p...@denknerd.org>
+Adjusted for Zathura 0.3.9 by Tobias Geerinckx-Rice <m...@tobias.gr>
---
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)
+@@ -597,6 +597,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);
@@ -28,8 +28,5 @@ index 589dd28..375ec54 100644
+ 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
-
+ set_plugin_dir(zathura, dir);
+ #ifdef ZATHURA_PLUGINDIR
