Patchwork [meta-oe] maliit-plugins: Clean up recipe and add missing RDEPENDS

login
register
mail settings
Submitter Samuel Stirtzel
Date Oct. 30, 2012, 1:40 p.m.
Message ID <1351604444-16246-1-git-send-email-s.stirtzel@googlemail.com>
Download mbox | patch
Permalink /patch/38711/
State Accepted
Commit a5ff7a97dd50aaa728fc6fc40402a6535f63ca1d
Headers show

Comments

Samuel Stirtzel - Oct. 30, 2012, 1:40 p.m.
The following errors are only shown when started from console, also there are no visible errors during execution.
Error fixed: QML Image: Error decoding: file:///usr/share/maliit/plugins/org/nemomobile/icon-m-input-methods-shift-lowercase.svg: Unsupported image format

This is unaffected from whether libqtsvg4 is installed or not.

Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
---
 .../recipes-support/maliit/maliit-plugins_git.bb   |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
Martin Jansa - Dec. 3, 2012, 1:20 p.m.
On Tue, Oct 30, 2012 at 2:40 PM, Samuel Stirtzel
<s.stirtzel@googlemail.com> wrote:
> The following errors are only shown when started from console, also there are no visible errors during execution.
> Error fixed: QML Image: Error decoding: file:///usr/share/maliit/plugins/org/nemomobile/icon-m-input-methods-shift-lowercase.svg: Unsupported image format
>
> This is unaffected from whether libqtsvg4 is installed or not.
>
> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
> ---
>  .../recipes-support/maliit/maliit-plugins_git.bb   |   10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
> index 932c0ae..2fb52c7 100644
> --- a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
> +++ b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
> @@ -8,6 +8,8 @@ inherit autotools qt4x11
>
>  DEPENDS = "maliit-framework"
>
> +RDEPENDS_${PN} += "qt4-plugin-iconengine-svgicon qt4-plugin-imageformat-svg"
> +
>  SRC_URI = "git://gitorious.org/maliit/maliit-plugins.git;branch=master"
>
>  SRCREV = "0760e585df494b394df1b887e5138ffef19c481f"
> @@ -23,12 +25,8 @@ FILES_${PN} += "\
>      ${datadir} \
>      "
>
> -FILES_${PN}-dbg += "\
> -    ${libdir}/maliit/plugins-*/.debug \
> -    "
> +FILES_${PN}-dbg += "${libdir}/maliit/plugins-*/.debug"
>
>  S= "${WORKDIR}/git"
>
> -do_install() {
> -  cd ${S} && (INSTALL_ROOT=${D} oe_runmake install)
> -}
> \ No newline at end of file
> +EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
> --

It fails to build docs on hosts without doxygen, can we disable docs?

| make[1]: Entering directory
`/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc'
| sed -e "s;@VERSION@;0.92.3;g" -e
"s;@IN_PWD@;/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc;g"
doxyfile.conf.in >
/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc/doxyfile.conf
&& doxygen /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc/doxyfile.conf
| /bin/sh: doxygen: command not found
| make[1]: *** [html/index.html] Error 127
| make[1]: Leaving directory
`/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc'

Cheers,
Samuel Stirtzel - Dec. 3, 2012, 3:16 p.m.
2012/12/3 Martin Jansa <martin.jansa@gmail.com>:
> On Tue, Oct 30, 2012 at 2:40 PM, Samuel Stirtzel
> <s.stirtzel@googlemail.com> wrote:
>> The following errors are only shown when started from console, also there are no visible errors during execution.
>> Error fixed: QML Image: Error decoding: file:///usr/share/maliit/plugins/org/nemomobile/icon-m-input-methods-shift-lowercase.svg: Unsupported image format
>>
>> This is unaffected from whether libqtsvg4 is installed or not.
>>
>> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
>> ---
>>  .../recipes-support/maliit/maliit-plugins_git.bb   |   10 ++++------
>>  1 file changed, 4 insertions(+), 6 deletions(-)
>>
>> diff --git a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
>> index 932c0ae..2fb52c7 100644
>> --- a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
>> +++ b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
>> @@ -8,6 +8,8 @@ inherit autotools qt4x11
>>
>>  DEPENDS = "maliit-framework"
>>
>> +RDEPENDS_${PN} += "qt4-plugin-iconengine-svgicon qt4-plugin-imageformat-svg"
>> +
>>  SRC_URI = "git://gitorious.org/maliit/maliit-plugins.git;branch=master"
>>
>>  SRCREV = "0760e585df494b394df1b887e5138ffef19c481f"
>> @@ -23,12 +25,8 @@ FILES_${PN} += "\
>>      ${datadir} \
>>      "
>>
>> -FILES_${PN}-dbg += "\
>> -    ${libdir}/maliit/plugins-*/.debug \
>> -    "
>> +FILES_${PN}-dbg += "${libdir}/maliit/plugins-*/.debug"
>>
>>  S= "${WORKDIR}/git"
>>
>> -do_install() {
>> -  cd ${S} && (INSTALL_ROOT=${D} oe_runmake install)
>> -}
>> \ No newline at end of file
>> +EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
>> --
>
> It fails to build docs on hosts without doxygen, can we disable docs?

Seems like I was careless, this hasn't been noticed as doxygen is
installed on all my build machines.

However I'll send a follow-up patch, do you want me to disable docs
for the framework as well? The Framework uses gtk-doc.
>
> | make[1]: Entering directory
> `/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc'
> | sed -e "s;@VERSION@;0.92.3;g" -e
> "s;@IN_PWD@;/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc;g"
> doxyfile.conf.in >
> /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc/doxyfile.conf
> && doxygen /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc/doxyfile.conf
> | /bin/sh: doxygen: command not found
> | make[1]: *** [html/index.html] Error 127
> | make[1]: Leaving directory
> `/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc'
>
> Cheers,
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Martin Jansa - Dec. 3, 2012, 3:30 p.m.
On Mon, Dec 03, 2012 at 04:16:03PM +0100, Samuel Stirtzel wrote:
> 2012/12/3 Martin Jansa <martin.jansa@gmail.com>:
> > On Tue, Oct 30, 2012 at 2:40 PM, Samuel Stirtzel
> > <s.stirtzel@googlemail.com> wrote:
> >> The following errors are only shown when started from console, also there are no visible errors during execution.
> >> Error fixed: QML Image: Error decoding: file:///usr/share/maliit/plugins/org/nemomobile/icon-m-input-methods-shift-lowercase.svg: Unsupported image format
> >>
> >> This is unaffected from whether libqtsvg4 is installed or not.
> >>
> >> Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
> >> ---
> >>  .../recipes-support/maliit/maliit-plugins_git.bb   |   10 ++++------
> >>  1 file changed, 4 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
> >> index 932c0ae..2fb52c7 100644
> >> --- a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
> >> +++ b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
> >> @@ -8,6 +8,8 @@ inherit autotools qt4x11
> >>
> >>  DEPENDS = "maliit-framework"
> >>
> >> +RDEPENDS_${PN} += "qt4-plugin-iconengine-svgicon qt4-plugin-imageformat-svg"
> >> +
> >>  SRC_URI = "git://gitorious.org/maliit/maliit-plugins.git;branch=master"
> >>
> >>  SRCREV = "0760e585df494b394df1b887e5138ffef19c481f"
> >> @@ -23,12 +25,8 @@ FILES_${PN} += "\
> >>      ${datadir} \
> >>      "
> >>
> >> -FILES_${PN}-dbg += "\
> >> -    ${libdir}/maliit/plugins-*/.debug \
> >> -    "
> >> +FILES_${PN}-dbg += "${libdir}/maliit/plugins-*/.debug"
> >>
> >>  S= "${WORKDIR}/git"
> >>
> >> -do_install() {
> >> -  cd ${S} && (INSTALL_ROOT=${D} oe_runmake install)
> >> -}
> >> \ No newline at end of file
> >> +EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
> >> --
> >
> > It fails to build docs on hosts without doxygen, can we disable docs?
> 
> Seems like I was careless, this hasn't been noticed as doxygen is
> installed on all my build machines.

No problem, it's hard to notice such issues unless you're building in
minimal chroot like I do.

> However I'll send a follow-up patch, do you want me to disable docs
> for the framework as well? The Framework uses gtk-doc.

It doesn't fail in framework, bbclass takes care of that IIRC, but fix
those QA Errors there, please.

Cheers,

> >
> > | make[1]: Entering directory
> > `/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc'
> > | sed -e "s;@VERSION@;0.92.3;g" -e
> > "s;@IN_PWD@;/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc;g"
> > doxyfile.conf.in >
> > /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc/doxyfile.conf
> > && doxygen /OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc/doxyfile.conf
> > | /bin/sh: doxygen: command not found
> > | make[1]: *** [html/index.html] Error 127
> > | make[1]: Leaving directory
> > `/OE/jansa-test/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/maliit-plugins/0.92.3+git1+0760e585df494b394df1b887e5138ffef19c481f-r0/git/doc'
> >
> > Cheers,
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
> 
> 
> -- 
> Regards
> Samuel
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
index 932c0ae..2fb52c7 100644
--- a/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
+++ b/meta-oe/recipes-support/maliit/maliit-plugins_git.bb
@@ -8,6 +8,8 @@  inherit autotools qt4x11
 
 DEPENDS = "maliit-framework"
 
+RDEPENDS_${PN} += "qt4-plugin-iconengine-svgicon qt4-plugin-imageformat-svg"
+
 SRC_URI = "git://gitorious.org/maliit/maliit-plugins.git;branch=master"
 
 SRCREV = "0760e585df494b394df1b887e5138ffef19c481f"
@@ -23,12 +25,8 @@  FILES_${PN} += "\
     ${datadir} \
     "
 
-FILES_${PN}-dbg += "\
-    ${libdir}/maliit/plugins-*/.debug \
-    "
+FILES_${PN}-dbg += "${libdir}/maliit/plugins-*/.debug"
 
 S= "${WORKDIR}/git"
 
-do_install() {
-  cd ${S} && (INSTALL_ROOT=${D} oe_runmake install)
-}
\ No newline at end of file
+EXTRA_OEMAKE += "INSTALL_ROOT=${D}"