[jhbuild] ibus: update to 1.5.5 and add a patch

[Ryan Lortie <desrt src gnome org>]

commit 14e163767d851f73a9f2552b13ac69c53079cafb
Author: Ryan Lortie <desrt desrt ca>
Date:   Sat Jan 25 13:30:54 2014 -0500

    ibus: update to 1.5.5 and add a patch
    
    Recent changes to 'dconf update' combined with ibus's strange use of
    dconf mean that ibus fails to install if the system is missing an
    /etc/dconf/db directory.
    
    Update to the latest tarball release from upstream and cherry-pick a
    patch from their git in order to work around the issue.
    
    We can also take this chance to drop our -Wno-error because this problem
    was solved upstream in the latest tarball.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=722978

 modulesets/gnome-suites-core-deps-3.12.modules     |   10 ++--
 .../ibus.skip-dconf-update-if-DESTDIR-is-set.patch |   42 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index 5170fa0..7452e27 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -1291,13 +1291,13 @@
     </dependencies>
   </autotools>
 
-  <autotools id="ibus"
-             autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf --disable-ui"
-             makeargs="CFLAGS=-Wno-error">
+  <autotools id="ibus" autogenargs="--disable-tests --disable-gconf --enable-dconf --disable-memconf 
--disable-ui">
     <branch repo="ibus"
             module="ibus-${version}.tar.gz"
-            version="1.5.3"
-            hash="sha256:2afc6371c24873f0e37554ef07effd022042f8eca6cb649d1bb02d8c57528b8c">
+            version="1.5.5"
+            size="2063794"
+            hash="sha256:02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec">
+      <patch file="ibus.skip-dconf-update-if-DESTDIR-is-set.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="dbus"/>
diff --git a/patches/ibus.skip-dconf-update-if-DESTDIR-is-set.patch 
b/patches/ibus.skip-dconf-update-if-DESTDIR-is-set.patch
new file mode 100644
index 0000000..432ecc9
--- /dev/null
+++ b/patches/ibus.skip-dconf-update-if-DESTDIR-is-set.patch
@@ -0,0 +1,42 @@
+From e6ec45d64a32d16245770f8b80e795a63e6ad553 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Thu, 16 Jan 2014 13:22:12 +0900
+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.
+
+Review URL: https://codereview.appspot.com/51730044
+Patch from Colin Walters <walters verbum org>.
+---
+ data/dconf/Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+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.8.4.2
+