[gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/files/
commit: 18c54a1d8209aa7fef893c91fa4d1857d112bd9f
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Tue Jun 1 17:26:20 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Jun 1 19:01:30 2021 +
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 levelnine.at>
Signed-off-by: Matt Turner 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..000
--- 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
-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/
commit: f258f8359d0110365291cede0dbc600ae958f2db Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Apr 14 17:05:06 2021 + Commit: Matt Turner gentoo org> CommitDate: Wed Apr 14 22:28:09 2021 + 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 levelnine.at> Signed-off-by: Matt Turner 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..000 --- 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 -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/
commit: b2ce7752761351c64b02e66d5dfd7ac880eb7aa0 Author: Mart Raudsepp gentoo org> AuthorDate: Tue Dec 3 07:18:59 2019 + Commit: Mart Raudsepp gentoo org> CommitDate: Tue Dec 3 07:20:19 2019 + 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 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(
[gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/files/, gnome-base/dconf/
commit: ca0ad966b82e1cdadd45af81c84bdb25fcf1fcb3
Author: Mart Raudsepp gentoo org>
AuthorDate: Sun Sep 8 11:30:12 2019 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Sep 8 11:31:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca0ad966
gnome-base/dconf: bump to 0.32.0, drop env.d snippet and vala deps
Long ago we added a /etc/env.d/51dconf for forcing GSETTINGS_BACKEND=dconf
into the environment when dconf is installed - presumably to switch over to
it from gconf. However nowadays dconf already has the highest priority out
of the available gsettings backend extension points, thus this has become
long unnecessary, and if GSETTINGS_BACKEND is unset and dconf is installed,
it'll pick dconf still too.
dconf-0.32 ported its dconf command line utility away from vala to straight
C, and thus vala is not necessary anymore. It is necessary (the vapigen.pc
file in particular) upstream for finding the location where to install the
pregenerated dconf.vapi and dconf.deps files, but I've patched it to just
fallback to the well-established location of ${datadir}/vala/vapi/ and thus
can keep shipping vapi file without introducing a USE flag and vala deps.
Closes: https://bugs.gentoo.org/693472
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp gentoo.org>
gnome-base/dconf/Manifest | 1 +
gnome-base/dconf/dconf-0.32.0.ebuild | 67 ++
.../dconf/files/0.32.0-drop-vapigen-dep.patch | 44 ++
3 files changed, 112 insertions(+)
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 62d2bd9733b..d4f2717e402 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,2 +1,3 @@
DIST dconf-0.26.1.tar.xz 218516 BLAKE2B
ddb23a1f6519b5460903b1a91ba48242f144a768f7ec5b9e82953589474df998061a4fbfb3605027cb51db44f7e49f88c774a735600de2bedaf8889b58e050bc
SHA512
4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da
DIST dconf-0.30.1.tar.xz 104376 BLAKE2B
c5a90c092b6e028dafbc9aee2f29f622dc4a696e815266355de4a056fe507b0cca9eaa9b10753501ee44f74ee57d0095fd55aafc7205ffea1f0321ed705dbe0b
SHA512
f7d136aec7cb75b64c7d9446d520f4c4af368e6d22346b7bb8ad66c08afaa03a72aacd44016dae7690e37b7d0deb9a16187445db176427a12a8b3cd3885c9e03
+DIST dconf-0.32.0.tar.xz 111700 BLAKE2B
51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee
SHA512
09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0
diff --git a/gnome-base/dconf/dconf-0.32.0.ebuild
b/gnome-base/dconf/dconf-0.32.0.ebuild
new file mode 100644
index 000..2175d3f9748
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.32.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Simple low-level configuration system"
+HOMEPAGE="https://wiki.gnome.org/Projects/dconf;
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="gtk-doc"
+RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
+
+RDEPEND="
+ >=dev-libs/glib-2.44.0:2
+ sys-apps/dbus
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ gtk-doc? ( >=dev-util/gtk-doc-1.15 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/0.30.1-bash-completion-dir.patch
+ "${FILESDIR}"/${PV}-drop-vapigen-dep.patch # .vapi/.deps are
pregenerated, just install them without a vala dep
+)
+
+src_configure() {
+ local emesonargs=(
+ -Dbash_completion_dir="$(get_bashcompdir)"
+ -Dman=true
+ $(meson_use gtk-doc gtk_doc)
+ -Dvapi=true
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_giomodule_cache_update
+
+ # Kill existing dconf-service processes as recommended by upstream due
to
+ # possible changes in the dconf private dbus API.
+ # dconf-service will be dbus-activated on next use.
+ pids=$(pgrep -x dconf-service)
+ if [[ $? == 0 ]]; then
+ ebegin "Stopping dconf-service; it will automatically restart
on demand"
+ kill ${pids}
+ eend $?
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_giomodule_cache_update
+}
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
