1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00

matchbox-keyboard: Enable GTK+3 IM module

* Build GTK+3 im module (and no GTK+2 by default)
* Fix FILES for this case

(From OE-Core rev: 92436e402ac6222b625bbf99f6f23d39a58720fc)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@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:
Jussi Kukkonen
2016-04-14 16:53:55 +03:00
committed by Richard Purdie
parent fdbf32bb76
commit c8044c4a16
@@ -26,7 +26,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
EXTRA_OECONF = "--disable-cairo"
PACKAGECONFIG ??= "gtk2-im applet"
PACKAGECONFIG ??= "gtk3-im applet"
PACKAGECONFIG[applet] = "--enable-applet,--disable-applet,matchbox-panel-2"
PACKAGECONFIG[gtk2-im] = "--enable-gtk-im,--disable-gtk-im,gtk+"
PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3"
@@ -39,7 +39,8 @@ FILES_${PN} = "${bindir}/ \
${datadir}/pixmaps \
${datadir}/matchbox-keyboard"
FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so"
FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \
${libdir}/gtk-3.0/*/immodules/*.so"
FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so"
@@ -49,6 +50,7 @@ do_install_append () {
install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/
rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la
rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la
rm -f ${D}${libdir}/matchbox-panel/*.la
}