From: "Maxin B. John" <maxin.john@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/3] gtk-immodules-cache.bbclass: fix immodules-cache path
Date: Tue, 2 Feb 2016 13:04:10 +0200 [thread overview]
Message-ID: <1454411051-15095-2-git-send-email-maxin.john@intel.com> (raw)
In-Reply-To: <1454411051-15095-1-git-send-email-maxin.john@intel.com>
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.". Update gtk-immodules-cache.bbclass
to use that path.
The environment variable "GTK_IM_MODULE_FILE" can also be set to point GTK+
at the file to fix this problem. However, it causes problems for gtk3 apps.
[YOCTO #6774]
[YOCTO #8957]
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
meta/classes/gtk-immodules-cache.bbclass | 48 +++++++++++++++++---------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass
index 0a6316d..c099cd3 100644
--- a/meta/classes/gtk-immodules-cache.bbclass
+++ b/meta/classes/gtk-immodules-cache.bbclass
@@ -10,47 +10,51 @@ GTKIMMODULES_PACKAGES ?= "${PN}"
gtk_immodule_cache_postinst() {
if [ "x$D" != "x" ]; then
- for maj_ver in 2 3; do
- if [ -x $D${bindir}/gtk-query-immodules-$maj_ver.0 ]; then
- IMFILES=$(ls $D${libdir}/gtk-$maj_ver.0/*/immodules/*.so)
- ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-$maj_ver.0')} \
- $IMFILES > $D/etc/gtk-$maj_ver.0/gtk.immodules 2>/dev/null &&
- sed -i -e "s:$D::" $D/etc/gtk-$maj_ver.0/gtk.immodules
-
- [ $? -ne 0 ] && exit 1
+ if [ -x $D${bindir}/gtk-query-immodules-2.0 ]; then
+ IMFILES=$(ls $D${libdir}/gtk-2.0/*/immodules/*.so)
+ ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-2.0')} \
+ $IMFILES > $D${libdir}/gtk-2.0/2.10.0/immodules.cache 2>/dev/null &&
+ sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache
+ elif [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then
+ IMFILES=$(ls $D${libdir}/gtk-3.0/*/immodules/*.so)
+ ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-3.0')} \
+ $IMFILES > $D${libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null &&
+ sed -i -e "s:$D::" $D${libdir}/gtk-3.0/3.0.0/immodules.cache
fi
- done
+ [ $? -ne 0 ] && exit 1
exit 0
fi
if [ ! -z `which gtk-query-immodules-2.0` ]; then
- gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+ gtk-query-immodules-2.0 > ${libdir}/gtk-2.0/2.10.0/immodules.cache
fi
if [ ! -z `which gtk-query-immodules-3.0` ]; then
- gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
+ gtk-query-immodules-3.0 > ${libdir}/gtk-3.0/3.0.0/immodules.cache
fi
}
gtk_immodule_cache_postrm() {
if [ "x$D" != "x" ]; then
- for maj_ver in 2 3; do
- if [ -x $D${bindir}/gtk-query-immodules-$maj_ver.0 ]; then
- IMFILES=$(ls $D${libdir}/gtk-$maj_ver.0/*/immodules/*.so)
- ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-$maj_ver.0')} \
- $IMFILES > $D/etc/gtk-$maj_ver.0/gtk.immodules 2>/dev/null &&
- sed -i -e "s:$D::" $D/etc/gtk-$maj_ver.0/gtk.immodules
-
- [ $? -ne 0 ] && exit 1
+ if [ -x $D${bindir}/gtk-query-immodules-2.0 ]; then
+ IMFILES=$(ls $D${libdir}/gtk-2.0/*/immodules/*.so)
+ ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-2.0')} \
+ $IMFILES > $D${libdir}/gtk-2.0/2.10.0/immodules.cache 2>/dev/null &&
+ sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache
+ elif [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then
+ IMFILES=$(ls $D${libdir}/gtk-3.0/*/immodules/*.so)
+ ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-3.0')} \
+ $IMFILES > $D${libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null &&
+ sed -i -e "s:$D::" $D${libdir}/gtk-3.0/3.0.0/immodules.cache
fi
- done
+ [ $? -ne 0 ] && exit 1
exit 0
fi
if [ ! -z `which gtk-query-immodules-2.0` ]; then
- gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+ gtk-query-immodules-2.0 > ${libdir}/gtk-2.0/2.10.0/immodules.cache
fi
if [ ! -z `which gtk-query-immodules-3.0` ]; then
- gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
+ gtk-query-immodules-3.0 > ${libdir}/gtk-3.0/3.0.0/immodules.cache
fi
}
--
2.4.0
next prev parent reply other threads:[~2016-02-02 11:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-02 11:04 [PATCH 1/3] Revert "matchbox-keyboard: export GTK_IM_MODULE_FILE location" Maxin B. John
2016-02-02 11:04 ` Maxin B. John [this message]
2016-02-02 11:04 ` [PATCH 3/3] formfactor: add machconfig for qemumips64 and beaglebone Maxin B. John
2016-02-02 11:59 ` Martin Jansa
2016-02-02 12:07 ` Burton, Ross
2016-02-03 10:25 ` Maxin B. John
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454411051-15095-2-git-send-email-maxin.john@intel.com \
--to=maxin.john@intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox