Patchwork [2/2] matchbox-keyboard: Use gtk-immodules-cache.bbclass

login
register
mail settings
Submitter Samuel Stirtzel
Date Oct. 17, 2012, 2:29 p.m.
Message ID <1350484172-9188-3-git-send-email-s.stirtzel@googlemail.com>
Download mbox | patch
Permalink /patch/38231/
State New
Headers show

Comments

Samuel Stirtzel - Oct. 17, 2012, 2:29 p.m.
Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
---
 .../matchbox-keyboard/matchbox-keyboard_git.bb     |   21 ++++----------------
 1 file changed, 4 insertions(+), 17 deletions(-)
Ross Burton - Oct. 17, 2012, 3:01 p.m.
On 17 October 2012 15:29, Samuel Stirtzel <s.stirtzel@googlemail.com> wrote:
> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
> ---
>  .../matchbox-keyboard/matchbox-keyboard_git.bb     |   21 ++++----------------
>  1 file changed, 4 insertions(+), 17 deletions(-)

Missing PR bump, but acked once that is fixed.

Ross
Samuel Stirtzel - Oct. 17, 2012, 3:20 p.m.
2012/10/17 Burton, Ross <ross.burton@intel.com>:
> On 17 October 2012 15:29, Samuel Stirtzel <s.stirtzel@googlemail.com> wrote:
>> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
>> ---
>>  .../matchbox-keyboard/matchbox-keyboard_git.bb     |   21 ++++----------------
>>  1 file changed, 4 insertions(+), 17 deletions(-)
>
> Missing PR bump, but acked once that is fixed.
>
> Ross

Thought that the PR bump is needed if the functionality changes?
Anyway v2 coming soon.

Patch

diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index 430e343..e426a5b 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -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
-}