From: Maxin B. John <maxin.john@intel.com>
Date: Mon, 4 Jan 2016 15:20:57 +0000 (+0200)
Subject: matchbox-keyboard: export GTK_IM_MODULE_FILE location
X-Git-Tag: 2016-4~1568
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d83d6ef50e6736d3c5f75050a01d5811a2a668f7;p=openembedded-core.git

matchbox-keyboard: export GTK_IM_MODULE_FILE location

This commit in gtk+ moved the cache files below <libdir>
"
commit c8849046860a9b17fa943247d85ddadb29262b48
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Thu Jul 4 09:27:17 2013 -0400

Move the module cache files below libdir

These files contain architecture-dependent paths, and thus placing
them into sysconfdir causes unnecessary hassle. Now the immodule cache
file is looked for in libdir/gtk-2.0/2.10.0/immodules.cache.
Belated backport of a change that was done in the run-up to 3.0.
"

Since gtk-immodules-cache.bbclass creates the cache file in
"/etc/gtk-2.0/gtk.immodules", the environment variable "GTK_IM_MODULE_FILE"
can be set to point GTK+ at the file.

[YOCTO #6774]

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
index 6cf188b2d0..63d9b8df92 100644
--- a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
+++ b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 . /etc/formfactor/config
+export GTK_IM_MODULE_FILE="/etc/gtk-2.0/gtk.immodules"
 
 CMD=""