2 files changed, 29 insertions, 6 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index feaf962d97..4b8790bee5 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -85,7 +85,7 @@ SRCDATE_matchbox-common ?= "20070417"
 SRCDATE_matchbox-config-gtk ?= "20070417"
 SRCDATE_matchbox-desktop ?= "20060612"
 SRCDATE_matchbox-desktop-2 ?= "20070417"
-SRCDATE_matchbox-keyboard ?= "20070417"
+SRCDATE_matchbox-keyboard ?= "20070516"
 SRCDATE_matchbox-panel ?= "20060727"
 SRCDATE_matchbox-panel-manager ?= "20060612"
 SRCDATE_matchbox-panel-2 ?= "20070417"
@@ -196,7 +196,7 @@ DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
 POKY_EXTRA_RDEPENDS = ""
 POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
 POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
-POKY_EXTRA_RDEPENDS_akita = "pointercal"
+POKY_EXTRA_RDEPENDS_akita = "pointercal matchbox-keyboard-im"
 
 DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
 
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 4cea81a2ea..ac03f11e2d 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Matchbox virtual keyboard for X11"
 LICENSE = "GPL"
-DEPENDS = "libfakekey expat libxft"
+DEPENDS = "libfakekey expat libxft gtk+"
 SECTION = "x11"
 PV = "0.0+svn${SRCDATE}"
-PR="r2"
+PR="r3"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
@@ -12,9 +12,32 @@ S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig gettext
 
-EXTRA_OECONF = "--disable-cairo"
+EXTRA_OECONF = "--disable-cairo --enable-gtk-im"
+
+PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg"
 
 FILES_${PN} = "${bindir}/* \
                ${datadir}/applications \
                ${datadir}/pixmaps \
-                ${datadir}/matchbox-keyboard"
+               ${datadir}/matchbox-keyboard"
+
+FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
+
+FILES_matchbox-keyboard-dbg = "${libdir}/gtk-2.0/*/immodules/.debug"
+
+
+pkg_postinst_matchbox-keyboard-im () {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_matchbox-keyboard-im () {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}