[gnome-continuous] manifest: Add patch for ibus, untag dbus

[Colin Walters <walters src gnome org>]

commit 06b784aa4bd5ecc7d139e5b0d73cf548cbe5f31b
Author: Colin Walters <walters verbum org>
Date:   Wed Feb 25 09:11:07 2015 -0500

    manifest: Add patch for ibus, untag dbus

 manifest.json                                      |    7 ++--
 ...around-using-dbus-development-builds-and-.patch |   33 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index c4dc817..33ff260 100644
--- a/manifest.json
+++ b/manifest.json
@@ -308,9 +308,7 @@
                                 "--disable-tests",
                                 "--with-systemdsystemunitdir=/usr/lib/systemd/system",
                                 "--with-system-pid-file=/run/dbus.pid"],
-                "setuid": ["/runtime/usr/libexec/dbus-daemon-launch-helper"],
-                "tag": "2a6cefbc3bd3ed9392603da6a76b49c0dcba7e0d",
-                "tag-reason": "breaks ibus - 
http://build.gnome.org/continuous/buildmaster/builds/2015/02/25/29/build/log-ibus.txt"},
+                "setuid": ["/runtime/usr/libexec/dbus-daemon-launch-helper"]},
 
                {"src": "git:git://libpng.git.sourceforge.net/gitroot/libpng/libpng",
                 "tag": "v1.5.18"},
@@ -916,7 +914,8 @@
                 "config-opts": ["--without-pcre"]},
 
                 {"src": "ibus:ibus.git",
-                "patches": ["ibus-builddir.patch"],
+                "patches": ["ibus-builddir.patch",
+                            "ibus-dconf-Work-around-using-dbus-development-builds-and-.patch"],
                 "config-opts": ["--disable-tests", 
                                 "--disable-gconf",
                                 "--enable-dconf",
diff --git a/patches/ibus-dconf-Work-around-using-dbus-development-builds-and-.patch 
b/patches/ibus-dconf-Work-around-using-dbus-development-builds-and-.patch
new file mode 100644
index 0000000..bc71a84
--- /dev/null
+++ b/patches/ibus-dconf-Work-around-using-dbus-development-builds-and-.patch
@@ -0,0 +1,33 @@
+From d3b9bcb547847f69de5acc186ad1b7693ba9fac2 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Wed, 25 Feb 2015 08:55:19 -0500
+Subject: [PATCH] dconf: Work around using dbus development builds and
+ /etc/machine-id
+
+Recent DBus changed the way it reads /etc/machine-id to be more
+strict, and it turns out that this breaks the use of dbus-launch here.
+
+The *correct* fix is to use `dbus-run-session`, but not everyone has
+that yet.  This is a quick hack that keeps the build going.
+---
+ data/dconf/make-dconf-override-db.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
+index 49a6df9..9c650e9 100755
+--- a/data/dconf/make-dconf-override-db.sh
++++ b/data/dconf/make-dconf-override-db.sh
+@@ -2,6 +2,10 @@
+ 
+ set -e
+ 
++# gnome-continuous doesn't have a machine-id set, which
++# breaks dbus-launch.  There's dbus-run-session which is
++# better, but not everyone has it yet.
++export DBUS_FATAL_WARNINGS=0
+ export TMPDIR=$(mktemp -d --tmpdir="$PWD")
+ export XDG_CONFIG_HOME="$TMPDIR/config"
+ export XDG_CACHE_HOME="$TMPDIR/cache"
+-- 
+1.8.3.1
+