333dce483f
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>
88 lines
3.5 KiB
Text
88 lines
3.5 KiB
Text
# This class will update the inputmethod module cache for virtual keyboards
|
|
#
|
|
# Usage: Set GTKIMMODULES_PACKAGES to the packages that needs to update the inputmethod modules
|
|
|
|
DEPENDS =+ "qemu-native"
|
|
|
|
inherit qemu
|
|
|
|
GTKIMMODULES_PACKAGES ?= "${PN}"
|
|
|
|
gtk_immodule_cache_postinst() {
|
|
if [ "x$D" != "x" ]; then
|
|
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
|
|
|
|
[ $? -ne 0 ] && exit 1
|
|
exit 0
|
|
fi
|
|
if [ ! -z `which gtk-query-immodules-2.0` ]; then
|
|
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 > ${libdir}/gtk-3.0/3.0.0/immodules.cache
|
|
fi
|
|
}
|
|
|
|
gtk_immodule_cache_postrm() {
|
|
if [ "x$D" != "x" ]; then
|
|
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
|
|
|
|
[ $? -ne 0 ] && exit 1
|
|
exit 0
|
|
fi
|
|
if [ ! -z `which gtk-query-immodules-2.0` ]; then
|
|
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 > ${libdir}/gtk-3.0/3.0.0/immodules.cache
|
|
fi
|
|
}
|
|
|
|
python populate_packages_append () {
|
|
gtkimmodules_pkgs = d.getVar('GTKIMMODULES_PACKAGES', True).split()
|
|
|
|
for pkg in gtkimmodules_pkgs:
|
|
bb.note("adding gtk-immodule-cache postinst and postrm scripts to %s" % pkg)
|
|
|
|
postinst = d.getVar('pkg_postinst_%s' % pkg, True)
|
|
if not postinst:
|
|
postinst = '#!/bin/sh\n'
|
|
postinst += d.getVar('gtk_immodule_cache_postinst', True)
|
|
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
|
|
|
postrm = d.getVar('pkg_postrm_%s' % pkg, True)
|
|
if not postrm:
|
|
postrm = '#!/bin/sh\n'
|
|
postrm += d.getVar('gtk_immodule_cache_postrm', True)
|
|
d.setVar('pkg_postrm_%s' % pkg, postrm)
|
|
}
|
|
|
|
python __anonymous() {
|
|
if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d):
|
|
gtkimmodules_check = d.getVar('GTKIMMODULES_PACKAGES', False)
|
|
if not gtkimmodules_check:
|
|
bb_filename = d.getVar('FILE', False)
|
|
raise bb.build.FuncFailed("ERROR: %s inherits gtk-immodules-cache but doesn't set GTKIMMODULES_PACKAGES" % bb_filename)
|
|
}
|
|
|