Accepting request 764654 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/764654
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dconf?expand=0&rev=50

dconf-fix-meson.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.24.1
+

dconf.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 14 21:41:11 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add dconf-fix-meson.patch: Update use of link_whole for
+  meson-0.52 and newer.
+
 -------------------------------------------------------------------
 Thu Sep 12 14:28:34 CST 2019 - qkzhu@suse.com
 

dconf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dconf
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,8 @@ Source0:        https://download.gnome.org/sources/dconf/0.34/%{name}-%{version}
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM 0001-gvdb-Restore-permissions-on-changed-files.patch bsc#1025721 bsc#971074 bgo#758066 fezhang@suse.com -- Restore permissions on files changed by dconf update.
 Patch0:         0001-gvdb-Restore-permissions-on-changed-files.patch
+# PATCH-FIX-UPSTREAM dconf-fix-meson.patch -- Fix build with new meson
+Patch1:         dconf-fix-meson.patch
 
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  gtk-doc