From d550bbcecb50cff982ccac39fde870e565d452c8 Mon Sep 17 00:00:00 2001
From: zhanzhimin <zhanzhimin@huawei.com>
Date: Wed, 16 Jun 2021 19:05:33 +0800
Subject: [PATCH] add patch to fix compilation failed

(cherry picked from commit 9ac730e264ce2226cb04a6ee4b9099a0722ea8b1)
---
 ...t-Update-use-of-link_whole-for-meson.patch | 34 +++++++++++++++++++
 dconf.spec                                    |  6 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 backport-Update-use-of-link_whole-for-meson.patch

diff --git a/backport-Update-use-of-link_whole-for-meson.patch b/backport-Update-use-of-link_whole-for-meson.patch
new file mode 100644
index 0000000..918f607
--- /dev/null
+++ b/backport-Update-use-of-link_whole-for-meson.patch
@@ -0,0 +1,34 @@
+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(
+-- 
+GitLab
diff --git a/dconf.spec b/dconf.spec
index 82dae25..ac63f2a 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -1,12 +1,13 @@
 Name:           dconf
 Version:        0.34.0
-Release:        3
+Release:        4
 Summary:        Dconf provides a backend to the GSettings API in Glib
 
 License:        LGPLv2+ and GPLv2+ and GPLv3+
 URL:            http://live.gnome.org/%{name}
 Source0:        http://download.gnome.org/sources/%{name}/0.30/%{name}-%{version}.tar.xz
 
+Patch6000:      backport-Update-use-of-link_whole-for-meson.patch
 Patch9000:      dconf-eliminate-difference.patch
 
 BuildRequires:  bash-completion dbus-devel glib2-devel >= 2.44.0 gtk-doc meson vala libxslt
@@ -87,6 +88,9 @@ dconf update
 %{_mandir}/man7/dconf.7.gz
 
 %changelog
+* Wed Jun 16 2021 zhanzhimin <zhanzhimin@huawei.com> - 0.34.0-4
+- add patch to fix compilation failed
+
 * Tue Feb 9 2021 jinzhimin <jinzhimin2@huawei.com> - 0.34.0-3
 - rebuild dconf
 
-- 
Gitee