[gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/files/

[gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/files/

[Matt Turner]

commit:     18c54a1d8209aa7fef893c91fa4d1857d112bd9f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun  1 17:26:20 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 19:01:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c54a1d

gnome-base/dconf: remove unused patch

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../dconf/files/0.30.1-bash-completion-dir.patch   | 62 ----------------------
 1 file changed, 62 deletions(-)

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
deleted file mode 100644
index 5d256f7efec..00000000000
--- a/gnome-base/dconf/files/0.30.1-bash-completion-dir.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 012b92b115ed96cc66818adbd31557765078be65 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 22 Feb 2019 22:06:18 +0200
-Subject: [PATCH] build: Allow passing bash-completion dir and have a generic
- fallback
-
-With autotools the installation path was just hardcoded to the usual
-location. In meson it was made to always check the path from
-bash-completion.pc, but some downstream might want to install the
-file without a bash-completion build-dep. Allow installing the
-completion file to a passed directory, and add back the fallback
-path if an explicit directory isn't passed and bash-completion
-package isn't found. This is also what the tracker project does.
----
- meson.build       | 20 ++++++++++++++++----
- meson_options.txt |  2 +-
- 2 files changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index aa87823..a74d5c7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -48,10 +48,22 @@ glib_dep = dependency('glib-2.0', version: '>= 2.44.0')
- gio_module_dir = gio_dep.get_pkgconfig_variable('giomoduledir', define_variable: ['libdir', dconf_libdir])
- dbus_session_service_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', dconf_datadir])
- 
--enable_bash_completion = get_option('bash_completion')
--if enable_bash_completion
--  # 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])
-+enable_bash_completion = false
-+if get_option('bash_completion_dir') == 'yes' or get_option('bash_completion_dir') == 'auto'
-+  bash_completion_package = dependency('bash-completion', required: false)
-+  if bash_completion_package.found()
-+    # FIXME: the `.pc` file is wrong because `completionsdir` should be relative to `datadir`, not `prefix`
-+    completions_dir = bash_completion_package.get_pkgconfig_variable('completionsdir',
-+                                                                         define_variable: [ 'prefix', dconf_prefix ])
-+  else
-+    completions_dir = join_paths(dconf_datadir, 'bash-completion', 'completions')
-+  endif
-+  enable_bash_completion = true
-+elif get_option('bash_completion_dir') == 'no' or get_option('bash_completion_dir') == ''
-+  enable_bash_completion = false
-+else
-+  enable_bash_completion = true
-+  completions_dir = get_option('bash_completion_dir')
- endif
- 
- configure_file(
-diff --git a/meson_options.txt b/meson_options.txt
-index a2794ce..3ac4ede 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,4 +1,4 @@
--option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files')
-+option('bash_completion_dir', type: 'string', value: 'yes', description: 'directory to install Bash completion files (or "yes" for default directory, "no" to disable installation)')
- option('man', type: 'boolean', value: true, description: 'generate man pages')
- option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
- option('vapi', type: 'boolean', value: true, description: 'install dconf client vapi')
--- 
-2.17.0
-

[gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/files/

[Matt Turner]

commit:     f258f8359d0110365291cede0dbc600ae958f2db
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Apr 14 17:05:06 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 22:28:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f258f835

gnome-base/dconf: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/20379
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../dconf/files/0.32.0-meson-0.52-compat.patch     | 35 ----------------------
 1 file changed, 35 deletions(-)

diff --git a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch b/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch
deleted file mode 100644
index 7b5d8c5aefc..00000000000
--- a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001
-From: Diego Escalante Urrelo <diegoe@gnome.org>
-Date: Thu, 31 Oct 2019 05:51:22 -0500
-Subject: [PATCH] build: Update use of link_whole for meson-0.52
-
-A regression in meson-0.52 caused uses of link_whole to expose scenarios
-where duplicate symbols issues could appear. In particular
-libdconf_client_dep was being link_whole'd to itself, which recursively
-already included libdconf_common which was also a link_whole.
-
-This change does not modify the available symbols in libdconf.so, and is
-compatible with meson-0.52 and 0.51.
-
-See: https://github.com/mesonbuild/meson/pull/6030
-Fixes: https://gitlab.gnome.org/GNOME/dconf/issues/59
----
- client/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/meson.build b/client/meson.build
-index f3b7122..de6387e 100644
---- a/client/meson.build
-+++ b/client/meson.build
-@@ -28,7 +28,7 @@ libdconf_client = static_library(
- 
- libdconf_client_dep = declare_dependency(
-   dependencies: gio_dep,
--  link_whole: libdconf_client,
-+  link_with: libdconf_client,
- )
- 
- libdconf = shared_library(
--- 
-2.20.1
-

[gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/files/

[Mart Raudsepp]

commit:     b2ce7752761351c64b02e66d5dfd7ac880eb7aa0
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 07:18:59 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 07:20:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ce7752

gnome-base/dconf: adjust vapigen patch to not require meson-0.49+

Our patch used 0.49 feature for joining paths, but meson.eclass
still only enforces >=meson-0.48.2. Instead of adding a depstring
on >=meson-0.49, just trivially tweak the patch to use the old
way of joining paths, to support easier upgrades on out of date
machines.

Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch b/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch
index 55959a7febf..0dcb72358bd 100644
--- a/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch
+++ b/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch
@@ -34,7 +34,7 @@ index f3b7122..7dbca97 100644
 +      define_variable: ['datadir', dconf_datadir]
    )
 +  else
-+    vapi_dir = dconf_datadir / 'vala' / 'vapi'
++    vapi_dir = join_paths(dconf_datadir, 'vala', 'vapi')
 +  endif
  
    install_data(