From fa52f259d6c3ad2fdd493b05ac5bdf1b3f79ee9c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 25 Sep 2012 17:43:23 +0200
Subject: [PATCH] ibus: update to 1.4.99.20120917; switch to dconf.

---
 common/shlibs             |  2 +-
 srcpkgs/ibus/ibus.rshlibs |  3 ++-
 srcpkgs/ibus/template     | 17 ++++++-----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 5f90bfbad91..7ebdf61e34c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1044,4 +1044,4 @@ libsecret-1.so.0 libsecret-0.10_1
 libgweather-3.so.1 libgweather-3.6.0_1
 libgnomekbd.so.8 libgnomekbd-3.6.0_1
 libgnomekbdui.so.8 libgnomekbd-3.6.0_1
-libibus-1.0.so.0 ibus-1.4.2_1
+libibus-1.0.so.5 ibus-1.4.99.20120917_1
diff --git a/srcpkgs/ibus/ibus.rshlibs b/srcpkgs/ibus/ibus.rshlibs
index 7a545cc40de..62440d8570a 100644
--- a/srcpkgs/ibus/ibus.rshlibs
+++ b/srcpkgs/ibus/ibus.rshlibs
@@ -17,6 +17,7 @@ libpthread.so.0
 libgtk-3.so.0
 libgdk-3.so.0
 libcairo-gobject.so.2
+libdconf.so.1
 libX11.so.6
-libgconf-2.so.4
+libXi.so.6
 libgthread-2.0.so.0
diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 58e51fc25e5..470bd9d6d56 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -1,35 +1,30 @@
 # Template file for 'ibus'
 pkgname=ibus
-version=1.4.2
+version=1.4.99.20120917
 revision=1
 subpackages="ibus-devel"
 build_style=gnu-configure
 configure_args="--with-gconf-schema-file-dir=/usr/share/gconf/schemas
 --enable-gtk3 --disable-python --disable-schemas-compile --enable-memconf
---disable-schemas-install --disable-dconf --enable-gconf"
-makedepends="pkg-config intltool GConf-devel librsvg-devel
+--disable-schemas-install --enable-dconf --disable-gconf"
+makedepends="pkg-config intltool dconf-devel>=0.13.90 librsvg-devel
 gobject-introspection gtk+-devel gtk+3-devel"
-fulldepends="iso-codes dbus-x11"
+fulldepends="hicolor-icon-theme iso-codes dbus-x11"
 short_desc="Intelligent Input Bus for Linux / Unix OS"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://ibus.googlecode.com"
 license="LGPL-2.1"
 distfiles="http://ibus.googlecode.com/files/ibus-${version}.tar.gz"
-checksum=2418d9960d177c0ce7d3dc5ef8ab75cfc00e30f5e2c730b7d82f4f22666a04d7
+checksum=190d4bf2b8cfb53393712d2843ef7ff61a277a7ecd684fb749dd7afc598221c9
 long_desc="
  IBus means Intelligent Input Bus. It is an open source input framework
  for Linux/Unix OS."
 
 triggers="gtk-immodules gtk3-immodules"
-gconf_schemas="ibus.schemas"
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 post_install() {
 	vmkdir etc/xdg/autostart
 	ln -sf /usr/share/applications/ibus.desktop \
 		${DESTDIR}/etc/xdg/autostart/ibus.desktop
-
-	# Register gconf schema.
-        mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
-        gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
-                --domain ${pkgname} ${wrksrc}/*.schemas
 }