[PATCH v2 1/2] gtk-immodules-cache: Add initial class to update gtk inputmethod module cache

[PATCH v2 1/2] gtk-immodules-cache: Add initial class to update gtk inputmethod module cache

[Samuel Stirtzel]

This is used by:
openembedded-core/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework_git.bb

Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
---
 meta/classes/gtk-immodules-cache.bbclass |   70 ++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 meta/classes/gtk-immodules-cache.bbclass

diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass
new file mode 100644
index 0000000..833eefe
--- /dev/null
+++ b/meta/classes/gtk-immodules-cache.bbclass
@@ -0,0 +1,70 @@
+# 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
+
+gtk_immodule_cache_postinst() {
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+if [ ! -z `which gtk-query-immodules-2.0` ]; then
+    gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+fi
+if [ ! -z `which gtk-query-immodules-3.0` ]; then
+    gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
+fi
+}
+
+gtk_immodule_cache_postrm() {
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+if [ ! -z `which gtk-query-immodules-2.0` ]; then
+    gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+fi
+if [ ! -z `which gtk-query-immodules-3.0` ]; then
+    gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
+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) or d.getVar('pkg_postinst', 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) or d.getVar('pkg_postrm', True)
+            if not postrm:
+                postrm = '#!/bin/sh\n'
+            postrm += d.getVar('gtk_immodule_cache_postrm', True)
+            d.setVar('pkg_postrm_%s' % pkg, postrm)
+}
+
+def gtkimmodules_after_parse(d):
+    def gtkimmodules_check_vars():
+        if d.getVar('BB_WORKERCONTEXT', True) is not None:
+            return
+
+        bb_filename = d.getVar('FILE')
+        packages = d.getVar('PACKAGES', True)
+
+        # check gtk-immodules package
+        gtkimmodules_check = d.getVar('GTKIMMODULES_PACKAGES', True) or ""
+        if gtkimmodules_check == "":
+            raise bb.build.FuncFailed, "\n\n\nERROR: %s inherits gtk-immodule-cache but doesn't set GTKIMMODULES_PACKAGE" % bb_filename
+
+    bpn = d.getVar('BPN', 1)
+    if bpn + "-native" != d.getVar('PN', 1) and \
+            bpn + "-cross" != d.getVar('PN', 1) and \
+            bpn + "-nativesdk" != d.getVar('PN', 1):
+        gtkimmodules_check_vars()
+
+python __anonymous() {
+    gtkimmodules_after_parse(d)
+}
+
-- 
1.7.9.5

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

[Samuel Stirtzel]

Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
---
 .../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
-}
-- 
1.7.9.5

Re: [PATCH v2 1/2] gtk-immodules-cache: Add initial class to update gtk inputmethod module cache

[Richard Purdie]

On Wed, 2012-10-17 at 17:24 +0200, Samuel Stirtzel wrote:
> This is used by:
> openembedded-core/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
> meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework_git.bb
> 
> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
> ---
>  meta/classes/gtk-immodules-cache.bbclass |   70 ++++++++++++++++++++++++++++++
>  1 file changed, 70 insertions(+)
>  create mode 100644 meta/classes/gtk-immodules-cache.bbclass
> 
> diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass
> new file mode 100644
> index 0000000..833eefe
> --- /dev/null
> +++ b/meta/classes/gtk-immodules-cache.bbclass
> @@ -0,0 +1,70 @@
> +# 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
> +
> +gtk_immodule_cache_postinst() {
> +if [ "x$D" != "x" ]; then
> +    exit 1
> +fi
> +if [ ! -z `which gtk-query-immodules-2.0` ]; then
> +    gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
> +fi
> +if [ ! -z `which gtk-query-immodules-3.0` ]; then
> +    gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
> +fi
> +}
> +
> +gtk_immodule_cache_postrm() {
> +if [ "x$D" != "x" ]; then
> +    exit 1
> +fi
> +if [ ! -z `which gtk-query-immodules-2.0` ]; then
> +    gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
> +fi
> +if [ ! -z `which gtk-query-immodules-3.0` ]; then
> +    gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
> +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) or d.getVar('pkg_postinst', 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) or d.getVar('pkg_postrm', True)
> +            if not postrm:
> +                postrm = '#!/bin/sh\n'
> +            postrm += d.getVar('gtk_immodule_cache_postrm', True)
> +            d.setVar('pkg_postrm_%s' % pkg, postrm)
> +}
> +
> +def gtkimmodules_after_parse(d):
> +    def gtkimmodules_check_vars():
> +        if d.getVar('BB_WORKERCONTEXT', True) is not None:
> +            return
> +
> +        bb_filename = d.getVar('FILE')
> +        packages = d.getVar('PACKAGES', True)
> +
> +        # check gtk-immodules package
> +        gtkimmodules_check = d.getVar('GTKIMMODULES_PACKAGES', True) or ""
> +        if gtkimmodules_check == "":
> +            raise bb.build.FuncFailed, "\n\n\nERROR: %s inherits gtk-immodule-cache but doesn't set GTKIMMODULES_PACKAGE" % bb_filename
> +
> +    bpn = d.getVar('BPN', 1)
> +    if bpn + "-native" != d.getVar('PN', 1) and \
> +            bpn + "-cross" != d.getVar('PN', 1) and \
> +            bpn + "-nativesdk" != d.getVar('PN', 1):
> +        gtkimmodules_check_vars()
> +
> +python __anonymous() {
> +    gtkimmodules_after_parse(d)
> +}
> +

Sorry, but the after_parse code above is horrible. How about something
more simple like:

python __anonymous() {
    if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d):
        gtkimmodules_check = d.getVar('GTKIMMODULES_PACKAGES')
        if not gtkimmodules_check:
            bb_filename = d.getVar('FILE')
            raise bb.build.FuncFailed, "\n\n\nERROR: %s inherits gtk-immodule-cache but doesn't set GTKIMMODULES_PACKAGE" % bb_filename
}

I'd like to know where you got the inspiration for the original as I'd
like to simplify that too!

Cheers,

Richard

Re: [PATCH v2 1/2] gtk-immodules-cache: Add initial class to update gtk inputmethod module cache

[Samuel Stirtzel]

2012/10/17 Richard Purdie <richard.purdie@linuxfoundation.org>:
> On Wed, 2012-10-17 at 17:24 +0200, Samuel Stirtzel wrote:
>> This is used by:
>> openembedded-core/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
>> meta-openembedded/meta-oe/recipes-support/maliit/maliit-framework_git.bb
>>
>> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
>> ---
>>  meta/classes/gtk-immodules-cache.bbclass |   70 ++++++++++++++++++++++++++++++
>>  1 file changed, 70 insertions(+)
>>  create mode 100644 meta/classes/gtk-immodules-cache.bbclass
>>
>> diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass
>> new file mode 100644
>> index 0000000..833eefe
>> --- /dev/null
>> +++ b/meta/classes/gtk-immodules-cache.bbclass
>> @@ -0,0 +1,70 @@
>> +# 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
>> +
>> +gtk_immodule_cache_postinst() {
>> +if [ "x$D" != "x" ]; then
>> +    exit 1
>> +fi
>> +if [ ! -z `which gtk-query-immodules-2.0` ]; then
>> +    gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
>> +fi
>> +if [ ! -z `which gtk-query-immodules-3.0` ]; then
>> +    gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
>> +fi
>> +}
>> +
>> +gtk_immodule_cache_postrm() {
>> +if [ "x$D" != "x" ]; then
>> +    exit 1
>> +fi
>> +if [ ! -z `which gtk-query-immodules-2.0` ]; then
>> +    gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
>> +fi
>> +if [ ! -z `which gtk-query-immodules-3.0` ]; then
>> +    gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
>> +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) or d.getVar('pkg_postinst', 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) or d.getVar('pkg_postrm', True)
>> +            if not postrm:
>> +                postrm = '#!/bin/sh\n'
>> +            postrm += d.getVar('gtk_immodule_cache_postrm', True)
>> +            d.setVar('pkg_postrm_%s' % pkg, postrm)
>> +}
>> +
>> +def gtkimmodules_after_parse(d):
>> +    def gtkimmodules_check_vars():
>> +        if d.getVar('BB_WORKERCONTEXT', True) is not None:
>> +            return
>> +
>> +        bb_filename = d.getVar('FILE')
>> +        packages = d.getVar('PACKAGES', True)
>> +
>> +        # check gtk-immodules package
>> +        gtkimmodules_check = d.getVar('GTKIMMODULES_PACKAGES', True) or ""
>> +        if gtkimmodules_check == "":
>> +            raise bb.build.FuncFailed, "\n\n\nERROR: %s inherits gtk-immodule-cache but doesn't set GTKIMMODULES_PACKAGE" % bb_filename
>> +
>> +    bpn = d.getVar('BPN', 1)
>> +    if bpn + "-native" != d.getVar('PN', 1) and \
>> +            bpn + "-cross" != d.getVar('PN', 1) and \
>> +            bpn + "-nativesdk" != d.getVar('PN', 1):
>> +        gtkimmodules_check_vars()
>> +
>> +python __anonymous() {
>> +    gtkimmodules_after_parse(d)
>> +}
>> +
>
> Sorry, but the after_parse code above is horrible. How about something
> more simple like:
>
> python __anonymous() {
>     if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d):
>         gtkimmodules_check = d.getVar('GTKIMMODULES_PACKAGES')
>         if not gtkimmodules_check:
>             bb_filename = d.getVar('FILE')
>             raise bb.build.FuncFailed, "\n\n\nERROR: %s inherits gtk-immodule-cache but doesn't set GTKIMMODULES_PACKAGE" % bb_filename
> }

Well this looks better, I'll send a v3.

>
> I'd like to know where you got the inspiration for the original as I'd
> like to simplify that too!
>

It was original from systemd.bbclass:
https://github.com/openembedded/meta-oe/blob/master/meta-systemd/classes/systemd.bbclass


A quick grep shows this is used on some other classes:

meta-kde/classes/kde_exports.bbclass:def kde_exports_after_parse(d):
meta-openembedded/meta-systemd/classes/systemd.bbclass:def
systemd_after_parse(d):
openembedded-core/meta/classes/update-alternatives.bbclass:def
update_alternatives_after_parse(d):
openembedded-core/meta/classes/update-rc.d.bbclass:def update_rc_after_parse(d):
openembedded-core/meta/classes/gtk-immodules-cache.bbclass:def
gtkimmodules_after_parse(d):
openembedded-core/meta/classes/useradd.bbclass:def
update_useradd_after_parse(d):


For meta-kde and gtk-immodules-cache I can change this to your
suggestion, maybe the others need some work too?

-- 
Regards
Samuel