[gnome-continuous] manifest: Add ibus-dconf-update.patch

[Colin Walters <walters src gnome org>]

commit 77bfcb3a8d5c287abc437f9ef56b08c0fbd353dd
Author: Colin Walters <walters verbum org>
Date:   Tue Jan 14 09:48:55 2014 -0500

    manifest: Add ibus-dconf-update.patch

 manifest.json                   |    2 +-
 patches/ibus-dconf-update.patch |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 3cf2538..f87a99b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -802,7 +802,7 @@
 
                 {"src": "ibus:ibus.git",
                 "patches": ["ibus-builddir.patch",
-                            "ibus-no-desktop.patch"],
+                            "ibus-dconf-update.patch"],
                 "config-opts": ["--disable-tests", 
                                 "--disable-gconf",
                                 "--enable-dconf",
diff --git a/patches/ibus-dconf-update.patch b/patches/ibus-dconf-update.patch
new file mode 100644
index 0000000..6f56446
--- /dev/null
+++ b/patches/ibus-dconf-update.patch
@@ -0,0 +1,39 @@
+From 0308c787d6653398c0125c9bcf81ccd3667cbad4 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Tue, 14 Jan 2014 09:24:27 -0500
+Subject: [PATCH] data/dconf: Don't run "dconf update" if $(DESTDIR) is set
+
+dconf changed as of
+https://git.gnome.org/browse/dconf/commit/?id=c211fc46496597c7ddabd73d623bae4037754916
+to actually emit an error if /etc/dconf/db is empty.  When building
+ibus in a system such as dpkg/rpm or gnome-continuous, there may
+actually be nothing in that directory in the buildroot.
+
+This will now cause "dconf update" as executed by this Makefile to
+fail.  The fix is to just check $(DESTDIR), like we should do for all
+triggers (e.g. gtk-update-icon-cache too).  It's never useful to
+execute these from per-component Makefiles if $(DESTDIR) is set.
+
+Instead, these meta-build systems (dpkg/rpm/jhbuild/Continuous) all
+take care of execution of triggers on their own.
+---
+ data/dconf/Makefile.am |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am
+index c841a34..62c20a3 100644
+--- a/data/dconf/Makefile.am
++++ b/data/dconf/Makefile.am
+@@ -61,6 +61,8 @@ org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in
+               { rc=$$?; $(RM) -rf $@; exit $$rc; }
+ 
+ install-data-hook:
+-      dconf update
++      if test -z "$(DESTDIR)"; then \
++              dconf update; \
++      fi
+ 
+ -include $(top_srcdir)/git.mk
+-- 
+1.7.1
+