gtk-immodules-cache.bbclass: fix immodules-cache path
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] (From OE-Core rev: fff4303a18ac8100e5a96da7facb42d8751e1eae) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b1e41f4fbf
commit
333dce483f
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue