- updated to 0.38.0

[packages/dconf.git] / dconf-bash-completion.patch

diff --git a/dconf-bash-completion.patch b/dconf-bash-completion.patch
index 3334e6214f252875e87392ce0819c2332ca61c7a..12b45b591f1004b19223f6a03a5f13e160c2d927 100644 (file)
--- a/dconf-bash-completion.patch
+++ b/dconf-bash-completion.patch
@@ -5,17 +5,21 @@
 +option('bash_completion_dir', type: 'string', value: '')
  option('man', type: 'boolean', value: true, description: 'generate man pages')
  option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
---- dconf-0.30.1/meson.build.orig      2018-10-22 23:53:04.000000000 +0200
-+++ dconf-0.30.1/meson.build   2018-10-30 21:08:19.195238826 +0100
-@@ -52,8 +52,12 @@
+--- dconf-0.38.0/meson.build.orig      2020-09-13 10:26:21.295046156 +0200
++++ dconf-0.38.0/meson.build   2020-09-13 10:29:23.197394039 +0200
+@@ -50,12 +50,16 @@
  
  enable_bash_completion = get_option('bash_completion')
  if enable_bash_completion
 +  if get_option('bash_completion_dir') != ''
 +    completions_dir = get_option('bash_completion_dir')
 +  else
-   # FIXME: the `.pc` file is wrong because `completionsdir` should be relative to `datadir`, not `prefix`
-   completions_dir = dependency('bash-completion').get_pkgconfig_variable('completionsdir', define_variable: ['prefix', dconf_prefix])
+   bash_completion_dep = dependency('bash-completion')
+   completions_dir = bash_completion_dep.get_pkgconfig_variable(
+     'completionsdir',
+     # bash-completion 2.10 changed the substitutions
+     define_variable: bash_completion_dep.version().version_compare('>= 2.10') ? ['datadir', dconf_datadir] : ['prefix', dconf_prefix],
+   )
 +  endif
  endif