| 1 |
commit: 18c54a1d8209aa7fef893c91fa4d1857d112bd9f |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Tue Jun 1 17:26:20 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 1 19:01:30 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c54a1d |
| 7 |
|
| 8 |
gnome-base/dconf: remove unused patch |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 13 |
|
| 14 |
.../dconf/files/0.30.1-bash-completion-dir.patch | 62 ---------------------- |
| 15 |
1 file changed, 62 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gnome-base/dconf/files/0.30.1-bash-completion-dir.patch b/gnome-base/dconf/files/0.30.1-bash-completion-dir.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 5d256f7efec..00000000000 |
| 20 |
--- a/gnome-base/dconf/files/0.30.1-bash-completion-dir.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,62 +0,0 @@ |
| 23 |
-From 012b92b115ed96cc66818adbd31557765078be65 Mon Sep 17 00:00:00 2001 |
| 24 |
-From: Mart Raudsepp <leio@g.o> |
| 25 |
-Date: Fri, 22 Feb 2019 22:06:18 +0200 |
| 26 |
-Subject: [PATCH] build: Allow passing bash-completion dir and have a generic |
| 27 |
- fallback |
| 28 |
- |
| 29 |
-With autotools the installation path was just hardcoded to the usual |
| 30 |
-location. In meson it was made to always check the path from |
| 31 |
-bash-completion.pc, but some downstream might want to install the |
| 32 |
-file without a bash-completion build-dep. Allow installing the |
| 33 |
-completion file to a passed directory, and add back the fallback |
| 34 |
-path if an explicit directory isn't passed and bash-completion |
| 35 |
-package isn't found. This is also what the tracker project does. |
| 36 |
---- |
| 37 |
- meson.build | 20 ++++++++++++++++---- |
| 38 |
- meson_options.txt | 2 +- |
| 39 |
- 2 files changed, 17 insertions(+), 5 deletions(-) |
| 40 |
- |
| 41 |
-diff --git a/meson.build b/meson.build |
| 42 |
-index aa87823..a74d5c7 100644 |
| 43 |
---- a/meson.build |
| 44 |
-+++ b/meson.build |
| 45 |
-@@ -48,10 +48,22 @@ glib_dep = dependency('glib-2.0', version: '>= 2.44.0') |
| 46 |
- gio_module_dir = gio_dep.get_pkgconfig_variable('giomoduledir', define_variable: ['libdir', dconf_libdir]) |
| 47 |
- dbus_session_service_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', dconf_datadir]) |
| 48 |
- |
| 49 |
--enable_bash_completion = get_option('bash_completion') |
| 50 |
--if enable_bash_completion |
| 51 |
-- # FIXME: the `.pc` file is wrong because `completionsdir` should be relative to `datadir`, not `prefix` |
| 52 |
-- completions_dir = dependency('bash-completion').get_pkgconfig_variable('completionsdir', define_variable: ['prefix', dconf_prefix]) |
| 53 |
-+enable_bash_completion = false |
| 54 |
-+if get_option('bash_completion_dir') == 'yes' or get_option('bash_completion_dir') == 'auto' |
| 55 |
-+ bash_completion_package = dependency('bash-completion', required: false) |
| 56 |
-+ if bash_completion_package.found() |
| 57 |
-+ # FIXME: the `.pc` file is wrong because `completionsdir` should be relative to `datadir`, not `prefix` |
| 58 |
-+ completions_dir = bash_completion_package.get_pkgconfig_variable('completionsdir', |
| 59 |
-+ define_variable: [ 'prefix', dconf_prefix ]) |
| 60 |
-+ else |
| 61 |
-+ completions_dir = join_paths(dconf_datadir, 'bash-completion', 'completions') |
| 62 |
-+ endif |
| 63 |
-+ enable_bash_completion = true |
| 64 |
-+elif get_option('bash_completion_dir') == 'no' or get_option('bash_completion_dir') == '' |
| 65 |
-+ enable_bash_completion = false |
| 66 |
-+else |
| 67 |
-+ enable_bash_completion = true |
| 68 |
-+ completions_dir = get_option('bash_completion_dir') |
| 69 |
- endif |
| 70 |
- |
| 71 |
- configure_file( |
| 72 |
-diff --git a/meson_options.txt b/meson_options.txt |
| 73 |
-index a2794ce..3ac4ede 100644 |
| 74 |
---- a/meson_options.txt |
| 75 |
-+++ b/meson_options.txt |
| 76 |
-@@ -1,4 +1,4 @@ |
| 77 |
--option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') |
| 78 |
-+option('bash_completion_dir', type: 'string', value: 'yes', description: 'directory to install Bash completion files (or "yes" for default directory, "no" to disable installation)') |
| 79 |
- option('man', type: 'boolean', value: true, description: 'generate man pages') |
| 80 |
- option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') |
| 81 |
- option('vapi', type: 'boolean', value: true, description: 'install dconf client vapi') |
| 82 |
--- |
| 83 |
-2.17.0 |
| 84 |
- |
Archives