diff options
-rw-r--r-- | meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb index fb4c6e9166..c7870cf083 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb | |||
@@ -26,7 +26,7 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
26 | 26 | ||
27 | EXTRA_OECONF = "--disable-cairo" | 27 | EXTRA_OECONF = "--disable-cairo" |
28 | 28 | ||
29 | PACKAGECONFIG ??= "gtk2-im applet" | 29 | PACKAGECONFIG ??= "gtk3-im applet" |
30 | PACKAGECONFIG[applet] = "--enable-applet,--disable-applet,matchbox-panel-2" | 30 | PACKAGECONFIG[applet] = "--enable-applet,--disable-applet,matchbox-panel-2" |
31 | PACKAGECONFIG[gtk2-im] = "--enable-gtk-im,--disable-gtk-im,gtk+" | 31 | PACKAGECONFIG[gtk2-im] = "--enable-gtk-im,--disable-gtk-im,gtk+" |
32 | PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3" | 32 | PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3" |
@@ -39,7 +39,8 @@ FILES_${PN} = "${bindir}/ \ | |||
39 | ${datadir}/pixmaps \ | 39 | ${datadir}/pixmaps \ |
40 | ${datadir}/matchbox-keyboard" | 40 | ${datadir}/matchbox-keyboard" |
41 | 41 | ||
42 | FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so" | 42 | FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \ |
43 | ${libdir}/gtk-3.0/*/immodules/*.so" | ||
43 | 44 | ||
44 | FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" | 45 | FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" |
45 | 46 | ||
@@ -49,6 +50,7 @@ do_install_append () { | |||
49 | install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ | 50 | install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ |
50 | 51 | ||
51 | rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la | 52 | rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la |
53 | rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la | ||
52 | rm -f ${D}${libdir}/matchbox-panel/*.la | 54 | rm -f ${D}${libdir}/matchbox-panel/*.la |
53 | } | 55 | } |
54 | 56 | ||