From 7daca50690cd61ad4e28d985288de9f29e7ad53a Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Sat, 24 Mar 2018 22:59:50 -0400
Subject: [PATCH] Reverted dconf-native to 0.26.1 due to rpath issue caused
 apparently by change to meson

---
 meta-gnome/conf/include/gnome-3.28.0.inc      |  3 +++
 .../recipes-gnome/dconf/dconf_0.26.1.bb       | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.26.1.bb

diff --git a/meta-gnome/conf/include/gnome-3.28.0.inc b/meta-gnome/conf/include/gnome-3.28.0.inc
index 6a47e05..8581640 100644
--- a/meta-gnome/conf/include/gnome-3.28.0.inc
+++ b/meta-gnome/conf/include/gnome-3.28.0.inc
@@ -3,7 +3,10 @@
 PREFERRED_VERSION_atk = "2.28.1"
 PREFERRED_VERSION_at-spi2-atk = "2.26.2"
 PREFERRED_VERSION_at-spi2-core = "2.28.0"
+#PREFERRED_VERSION_dconf = "0.27.1"
 PREFERRED_VERSION_dconf = "0.27.1"
+# 0.27.1 was moved to meson and rpath is now broken for /usr/bin/dconf
+PREFERRED_VERSION_dconf-native = "0.26.1"
 PREFERRED_VERSION_gcr = "3.28.0"
 PREFERRED_VERSION_gdm = "3.27.92"
 PREFERRED_VERSION_geocode-glib = "3.25.4.1"
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.26.1.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.26.1.bb
new file mode 100644
index 0000000..d2800a8
--- /dev/null
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.26.1.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Low level configuration database backend for GSettings"
+HOMEPAGE = "https://wiki.gnome.org/Projects/dconf"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/dconf/0.26/dconf-${PV}.tar.xz"
+SRC_URI[md5sum] = "a3cb67032e060450fa01c1a0f874bb60"
+SRC_URI[sha256sum] = "d583b1f7fc93b879e2956acc6a26ea05a445a0002158aeef80c8e378e1414535"
+
+DEPENDS = "glib-2.0 xmlto-native glib-2.0-native"
+
+FILES_${PN} += "\
+    ${libdir}/gio/modules/libdconfsettings.so \
+    ${datadir}/bash-completion/completions/dconf \
+    ${datadir}/vala/vapi \
+    ${datadir}/dbus-1/services \
+"
+
+inherit pkgconfig gettext autotools
+
+EXTRA_OECONF = "--enable-man=no"
+
+BBCLASSEXTEND= "native"