diff options
author | 2019-12-01 18:19:00 +0200 | |
---|---|---|
committer | 2019-12-01 18:19:22 +0200 | |
commit | dd9beb499e046d97e42c4cd4f4019eeef9e09fa1 (patch) | |
tree | 3112f842c647cd1dcd0ea6754770b7c375014aea /gnome-base/dconf/files | |
parent | sys-devel/gnuconfig: drop old (diff) | |
download | gentoo-dd9beb499e046d97e42c4cd4f4019eeef9e09fa1.tar.gz gentoo-dd9beb499e046d97e42c4cd4f4019eeef9e09fa1.tar.bz2 gentoo-dd9beb499e046d97e42c4cd4f4019eeef9e09fa1.zip |
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 <leio@gentoo.org>
Diffstat (limited to 'gnome-base/dconf/files')
-rw-r--r-- | gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch | 35 |
1 files changed, 35 insertions, 0 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 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 + |