diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-07-13 00:25:45 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-13 00:25:45 +0200 |
commit | 49b6dc2b4e02269850dacc71d9e7ec93139ec5b5 (patch) | |
tree | 75c62cc7620a7602a37067dd01268393aec32698 /gnu/packages/patches/zathura-plugindir-environment-variable.patch | |
parent | 7519dc95c7628ceeb5ed616604e8c432723a0a50 (diff) | |
parent | 2776b5d5bf3514717cf224de34c0bf2d894f1cee (diff) | |
download | guix-49b6dc2b4e02269850dacc71d9e7ec93139ec5b5.tar guix-49b6dc2b4e02269850dacc71d9e7ec93139ec5b5.tar.gz |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/patches/zathura-plugindir-environment-variable.patch')
-rw-r--r-- | gnu/packages/patches/zathura-plugindir-environment-variable.patch | 11 |
1 files 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 2e3ea527d0..a8ffff965a 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 <paul@denknerd.org> +Adjusted for Zathura 0.3.9 by Tobias Geerinckx-Rice <me@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 |