diff options
Diffstat (limited to 'gnome-base/dconf')
| -rw-r--r-- | gnome-base/dconf/Manifest | 4 | ||||
| -rw-r--r-- | gnome-base/dconf/dconf-0.32.0-r2.ebuild | 83 | ||||
| -rw-r--r-- | gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch | 2 | ||||
| -rw-r--r-- | gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch | 35 |
4 files changed, 122 insertions, 2 deletions
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest index 88252470b4e2..c51031926b60 100644 --- a/gnome-base/dconf/Manifest +++ b/gnome-base/dconf/Manifest @@ -1,9 +1,11 @@ AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa -AUX 0.32.0-drop-vapigen-dep.patch 1113 BLAKE2B 17bc1da864e0a706aee7574115604e8bd8fa3048febdc2daa8bc0792a0ebd676d3ad3d334d1af86a4441d13074bf9dbf1a66c832d36c036b4909736f2c166aef SHA512 bca6484acb0a7cba34c16c3ac841970a93f4da3f439c7352824049641f256164588b7f184781b77e2d85e0906750b55573bcbd0a8819247f64bc702bf95e5231 +AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f +AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a08f4977c856a94321b616e5135b3618477a44812a7429148018c915d716f35c6296e3c72c247970adedc9331af7bfdc6 SHA512 a4b9a1c6b6f16a4f5ea7a250d0a2949c1906813cefc985706575865abc03dc715f6d283887b081bc906a7a439fff0ef4fac57b3de3a4ea40ba2dc19e51db4664 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 EBUILD dconf-0.26.1.ebuild 1476 BLAKE2B 2cc966193509f00c2ef23dcb6712f60c0c7894c91aaff397b2d067123c7f7be4ea8a27121bb1578c6a111fe7206406722158538c9458944f41790e462fb77d3c SHA512 f5bb74a43f300ac4b0c1042d67d44f2414fbc9621ab1c753ce68804c0d6ce2b42afe830fcde32d4b683ab05f06723050704bde6c54cac58e54f2b786a3445e2b EBUILD dconf-0.30.1.ebuild 1906 BLAKE2B 4a9e6b53080395b0449bce434beb1b8b2efd61a1bd4cdefe6ff8a380288451d3cc60a87eb3591c465b25ee70a2416c2b486b041894a52e7d1fa98bb05dfdf5c9 SHA512 4d0372ba27f1e088b17973fe00f042a57f1dc07989f15216c79a7884ad5ca8239d7b8b67d73d3ff32aac953ad492cc540e01fd169a8d6c18aeb7369d845fa1b8 EBUILD dconf-0.32.0-r1.ebuild 2204 BLAKE2B 027128c7dee3ce99a765f57e792e7c290ac965be8675b3aa41ba2e9f2f33812a24298808b88440081a6f343be95c037cedda9c679846913cd3f679b127436f9b SHA512 d1073cefd7de8def9618dd7c15794e8e77a82a52746260cfbaef68a8f46b065c10ca7143b0473774ef1271a7a951afcd35902fab1a20fd11d92f4907d050ccb1 +EBUILD dconf-0.32.0-r2.ebuild 2194 BLAKE2B 98733409e9df5f8dc82352603de66d0c63a40d779d80042adbfd8bfe4d12247843a4a2fdfbd2b08c878e31a18aeb1326ba3a62b0c095be09b71d3c26fb081505 SHA512 7b522e025d8c97a9f329668017b4cf341f934f7a68f2356e614f642929dcc0b948d6996aff5c97d7d8ef78719013c7afb65934a4db4badaf85ab805ef54d1754 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/dconf/dconf-0.32.0-r2.ebuild b/gnome-base/dconf/dconf-0.32.0-r2.ebuild new file mode 100644 index 000000000000..a036e7103d2a --- /dev/null +++ b/gnome-base/dconf/dconf-0.32.0-r2.ebuild @@ -0,0 +1,83 @@ +# 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 ~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}" +BDEPEND=" + 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 + "${FILESDIR}"/${PV}-meson-0.52-compat.patch # https://gitlab.gnome.org/GNOME/dconf/issues/59 +) + +src_configure() { + local emesonargs=( + -Dbash_completion_dir="$(get_bashcompdir)" + -Dman=true + $(meson_use gtk-doc gtk_doc) + -Dvapi=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # GSettings backend may be one of: memory, gconf, dconf + # Only dconf is really considered functional by upstream + # must have it enabled over gconf if both are installed + # This snippet can't be removed until gconf package is + # ensured to not install a /etc/env.d/50gconf and then + # still consider the CONFIG_PROTECT_MASK bit. + echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf + echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf + doenvd 51dconf +} + +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 index 55959a7febf0..0dcb72358bde 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( 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 new file mode 100644 index 000000000000..7b5d8c5aefc0 --- /dev/null +++ b/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch @@ -0,0 +1,35 @@ +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 + |