From e6824772117047b127ae0250c34c73bfa042400f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 25 Feb 2020 19:22:19 +0100
Subject: [PATCH] zathura: install fish completion to vendor_completions.d

---
 .../patches/fish-completion-vendor.patch      | 77 +++++++++++++++++++
 srcpkgs/zathura/template                      |  2 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/zathura/patches/fish-completion-vendor.patch

diff --git a/srcpkgs/zathura/patches/fish-completion-vendor.patch b/srcpkgs/zathura/patches/fish-completion-vendor.patch
new file mode 100644
index 00000000000..780d53024c2
--- /dev/null
+++ b/srcpkgs/zathura/patches/fish-completion-vendor.patch
@@ -0,0 +1,77 @@
+# upstream: yes
+
+From bf46e4de707f364082570f4818846f2944b0ccfa Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 21 Jan 2020 21:39:00 -0500
+Subject: [PATCH] Fix installation of bash/fish completions using pkg-config
+
+Both shells provide pkg-config files which declare their designated
+completionsdir. Use this as the primary source of truth.
+---
+ data/meson.build | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c1e9231..557b630 100644
+--- data/meson.build
++++ data/meson.build
+@@ -70,6 +70,20 @@ fish_completion = configure_file(
+   configuration: conf_data
+ )
+ 
+-install_data(bash_completion, install_dir: join_paths(datadir, 'bash-completion', 'completions'))
++bash_comp = dependency('bash-completion', required: false)
++if bash_comp.found()
++  bash_compdir = bash_comp.get_pkgconfig_variable('completionsdir')
++else
++  bash_compdir = join_paths(datadir, 'bash-completion', 'completions')
++endif
++
++fish_comp = dependency('fish', required: false)
++if fish_comp.found()
++  fish_compdir = fish_comp.get_pkgconfig_variable('completionsdir')
++else
++  fish_compdir = join_paths(datadir, 'fish', 'completions')
++endif
++
++install_data(bash_completion, install_dir: bash_compdir)
+ install_data(zsh_completion, install_dir: join_paths(datadir, 'zsh', 'site-functions'))
+-install_data(fish_completion, install_dir: join_paths(datadir, 'fish', 'completions'))
++install_data(fish_completion, install_dir: fish_compdir)
+-- 
+2.25.0
+
+
+
+
+From d21d0406630eaf5e20d180524e6d396611e7243a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 21 Jan 2020 21:39:26 -0500
+Subject: [PATCH] fish-completion: use the correct fallback directory
+
+fish completions should never be installed to share/fish/completions/ as
+that directory is reserved exclusively for completions shipped as part
+of the fish source code.
+
+Use the same vendor_completions.d/ directory which the default fish
+configuration uses.
+---
+ data/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 557b630..4649160 100644
+--- data/meson.build
++++ data/meson.build
+@@ -81,7 +81,7 @@ fish_comp = dependency('fish', required: false)
+ if fish_comp.found()
+   fish_compdir = fish_comp.get_pkgconfig_variable('completionsdir')
+ else
+-  fish_compdir = join_paths(datadir, 'fish', 'completions')
++  fish_compdir = join_paths(datadir, 'fish', 'vendor_completions.d')
+ endif
+ 
+ install_data(bash_completion, install_dir: bash_compdir)
+-- 
+2.25.0
+
diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index f01c346c691..bc28d8c830f 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura'
 pkgname=zathura
 version=0.4.5
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dsynctex=disabled -Dtests=disabled"
 hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils