[oe] [PATCH 03/15] dconf: upgrade 0.30.1 -> 0.32.0

[Andreas Müller]

Instead of patching out docs just tell meson not to build man pages

Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
---
 ...0001-meson.build-do-not-compile-docs.patch | 27 -------------------
 .../{dconf_0.30.1.bb => dconf_0.32.0.bb}      |  8 +++---
 2 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch
 rename meta-gnome/recipes-gnome/dconf/{dconf_0.30.1.bb => dconf_0.32.0.bb} (53%)

diff --git a/meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch b/meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch
deleted file mode 100644
index 2f4283584..000000000
--- a/meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 50a9133e0b13798640da0b7cd11b5a85e35b2038 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia at windriver.com>
-Date: Fri, 23 Nov 2018 16:27:32 +0800
-Subject: [PATCH] meson.build: do not compile docs
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 04b6d47..46fdbc8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -81,7 +81,6 @@ subdir('gdbus')
- subdir('gsettings')
- subdir('client')
- subdir('bin')
--subdir('docs')
- subdir('tests')
- 
- meson.add_install_script('meson_post_install.py', gio_module_dir)
--- 
-2.7.4
-
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb
similarity index 53%
rename from meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb
rename to meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb
index 9f67673b1..8d1bbdfd1 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb
@@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 SECTION = "x11/gnome"
 
-SRC_URI[archive.md5sum] = "a959eef51c917b3c57cfbef1448a375e"
-SRC_URI[archive.sha256sum] = "549a3a7cc3881318107dc48a7b02ee8f88c9127acaf2d47f7724f78a8f6d02b7"
+SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a"
+SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab"
 
 DEPENDS = "dbus glib-2.0 intltool-native"
 
@@ -12,8 +12,8 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase bash-completion vala
 
-SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch \
-           "
+# I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+EXTRA_OEMESON = "-Dman=false"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
-- 
2.20.1