From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A8E3138334 for ; Sun, 1 Dec 2019 16:20:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CF6DE0809; Sun, 1 Dec 2019 16:20:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4ED75E0809 for ; Sun, 1 Dec 2019 16:20:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5665034D652 for ; Sun, 1 Dec 2019 16:20:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4B7A8A6 for ; Sun, 1 Dec 2019 16:19:58 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1575217162.dd9beb499e046d97e42c4cd4f4019eeef9e09fa1.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/, gnome-base/dconf/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/dconf/dconf-0.32.0-r2.ebuild gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch X-VCS-Directories: gnome-base/dconf/ gnome-base/dconf/files/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: dd9beb499e046d97e42c4cd4f4019eeef9e09fa1 X-VCS-Branch: master Date: Sun, 1 Dec 2019 16:19:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2668f237-88f9-4df2-a23a-f1d1675c1fd6 X-Archives-Hash: 273ac153274709e99a3bbda0eb32dfb0 commit: dd9beb499e046d97e42c4cd4f4019eeef9e09fa1 Author: Mart Raudsepp gentoo org> AuthorDate: Sun Dec 1 16:19:00 2019 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Dec 1 16:19:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9beb49 gnome-base/dconf: fix compat with meson-0.52 Closes: https://bugs.gentoo.org/698144 Package-Manager: Portage-2.3.69, Repoman-2.3.12 Signed-off-by: Mart Raudsepp gentoo.org> gnome-base/dconf/dconf-0.32.0-r2.ebuild | 83 ++++++++++++++++++++++ .../dconf/files/0.32.0-meson-0.52-compat.patch | 35 +++++++++ 2 files changed, 118 insertions(+) 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 00000000000..9992b900a0b --- /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-meson-0.52-compat.patch b/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch new file mode 100644 index 00000000000..7b5d8c5aefc --- /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 +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 +