dconf: update to 0.18.0

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 29 insertions, 23 deletions

diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
new file mode 100644
index 000000000..ae9c80968
--- /dev/null
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "configuation database system"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+SECTION = "x11/gnome"
+
+inherit gnome gsettings
+SRC_URI[archive.md5sum] = "69a12ed68893f2e1e81ac4e531bc1515"
+SRC_URI[archive.sha256sum] = "109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955"
+GNOME_COMPRESS_TYPE = "xz"
+
+DEPENDS = "glib-2.0 gtk+3"
+
+inherit vala gtk-doc
+
+EXTRA_OECONF += "--disable-man"
+
+PACKAGES =+ "dconf-editor"
+
+FILES_${PN} += " \
+        ${datadir}/dbus-1 \
+        ${libdir}/gio/modules/*.so \
+"
+FILES_dconf-editor = " \
+        ${bindir}/dconf-editor \
+        ${datadir}/icons \
+        ${datadir}/bash-completion \
+"
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so"
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb
deleted file mode 100644
index 7d11cf810..000000000
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "configuation database system"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
-
-SECTION = "x11/gnome"
-
-inherit gnome gsettings
-SRC_URI[archive.md5sum] = "d784f8afca04473d194a72047595c28e"
-SRC_URI[archive.sha256sum] = "e2103e8207744903790e9fac6427fa394bb485a0c7f4e0d03b0fb43268c34f33"
-
-DEPENDS = "glib-2.0 gtk+3"
-
-inherit vala
-
-PR = "r2"
-
-PACKAGES =+ "dconf-editor"
-
-FILES_dconf-editor = "${bindir}/dconf-editor ${datadir}/dconf-editor/"
-FILES_${PN} += "${datadir}/dbus-1/ \
-                ${libdir}/gio/modules/*.so \
-"
-FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so"