From patchwork Wed Oct 17 15:24:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,2/2] matchbox-keyboard: Use gtk-immodules-cache.bbclass Date: Wed, 17 Oct 2012 15:24:57 -0000 From: Samuel Stirtzel X-Patchwork-Id: 38243 Message-Id: <1350487497-13102-2-git-send-email-s.stirtzel@googlemail.com> To: openembedded-core@lists.openembedded.org Signed-off-by: Samuel Stirtzel --- .../matchbox-keyboard/matchbox-keyboard_git.bb | 23 +++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb index 430e343..c812f05 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb @@ -12,7 +12,7 @@ RDEPENDS_${PN} = "formfactor dbus-wait" SECTION = "x11" SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac" PV = "0.0+git${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ file://configure_fix.patch;maxrev=1819 \ @@ -21,13 +21,16 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ S = "${WORKDIR}/git" -inherit autotools pkgconfig gettext +inherit autotools pkgconfig gettext gtk-immodules-cache EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet" PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg \ matchbox-keyboard-applet matchbox-keyboard-applet-dbg" +#Updates the inputmethod module cache in postinst / postrm +GTKIMMODULES_PACKAGES = "matchbox-keyboard-im" + FILES_${PN} = "${bindir}/* \ ${sysconfdir} \ ${datadir}/applications \ @@ -47,19 +50,3 @@ do_install_append () { rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la rm -f ${D}${libdir}/matchbox-panel/*.la } - -pkg_postinst_matchbox-keyboard-im () { -if [ "x$D" != "x" ]; then - exit 1 -fi - -gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules -} - -pkg_postrm_matchbox-keyboard-im () { -if [ "x$D" != "x" ]; then - exit 1 -fi - -gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules -}