dconf: upgrade 0.34.0 -> 0.36.0

fix-meson-0.52.patch was applied upstream

Changes in dconf 0.36.0

=======================

 - No changes since 0.35.1

Changes in dconf 0.35.1
=======================

 - Writer service: avoid writing to disk and emitting changed signals
   when write requests do not result in changes to the database (Daniel
   Playfair Cal, !3)
 - build: Drop redundant `install` key from `configure_file()` (Philip
   Withnall, !53)
 - build: Update abicheck.sh script to work with GCC 9 (Diego
   Escalante Urello, !55)
 - build: Update use of link_whole for meson-0.52 (Diego Escalante
   Urello, !54)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 2 insertions, 29 deletions

diff --git a/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch b/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch
deleted file mode 100644
index 485c46509..000000000
--- a/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-With meson 0.52 the build fails due to duplicate symbols. There is a fix
-to meson but the dconf build also needs tweaking.
-
-https://gitlab.gnome.org/GNOME/dconf/issues/59
-https://github.com/mesonbuild/meson/pull/5936
-
-Despite the comments there about this being incorrect, libdconf is unchanged
-between 0.51 and 0.52 and this patch.
-
-Upstream-Status: Pending [under discussion, see above links]
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Index: dconf-0.34.0/client/meson.build
-===================================================================
---- dconf-0.34.0.orig/client/meson.build
-+++ dconf-0.34.0/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(
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb
index 3c3802f34..914672688 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb
@@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 SECTION = "x11/gnome"
 
-SRC_URI[archive.md5sum] = "a3ab18ed51a0494a1c8436fef20cc1b0"
-SRC_URI[archive.sha256sum] = "943a94ab16121de5580ceaed2605b87444d1bca1c6cd8beefb778bcb0aa2da52"
+SRC_URI[archive.md5sum] = "1a50c988d9f0206f74a44f7c6d09cead"
+SRC_URI[archive.sha256sum] = "9fe6bb22191fc2a036ad86fd8e7d165e9983c687b9fedccf85d46c799301da2d"
 
 DEPENDS = "dbus glib-2.0 intltool-native"
 
@@ -12,8 +12,6 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase bash-completion vala
 
-SRC_URI += "file://fix-meson-0.52.patch"
-
 # I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
 EXTRA_OEMESON = "-Dman=false"
 # no bash-completion for native