[oe] [meta-qt5][PATCH 7/8] qtbase: install and split package fonts

[Eric Bénard]

Le Tue, 28 May 2013 10:28:57 +0200,
Martin Jansa <martin.jansa at gmail.com> a écrit :

> On Tue, May 28, 2013 at 01:43:52AM +0200, Eric Bénard wrote:
> > - fonts were not installed (at least in qt 5.0.2) so install
> > them manually.
> > - split the font package in smaller package as done in qt4 to
> > save space on the target.
> > 
> > Signed-off-by: Eric Bénard <eric at eukrea.com>
> > ---
> >  recipes-qt/qt5/qtbase.inc |   30 ++++++++++++++++++++++++++++--
> >  1 file changed, 28 insertions(+), 2 deletions(-)
> > 
> > diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
> > index 81cc2e1..4b4fb10 100644
> > --- a/recipes-qt/qt5/qtbase.inc
> > +++ b/recipes-qt/qt5/qtbase.inc
> > @@ -161,7 +161,33 @@ do_install_append() {
> >      # qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed
> >      # ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake')
> >      rm -f ${D}/${bindir}/${QT_DIR_NAME}/qmake
> > +    # install fonts manually if they are missing
> > +    if [ ! -d ${D}/${libdir}/fonts ]; then
> > +        cp -a ${S}/lib/fonts ${D}/${libdir}
> > +    fi
> >  }
> >  
> > -PACKAGES =. "${PN}-fonts "
> > -FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts"
> > +PACKAGES =. "${PN}-fonts \
> > +             ${PN}-fonts-ttf-vera \
> > +             ${PN}-fonts-ttf-dejavu \
> > +             ${PN}-fonts-pfa \
> > +             ${PN}-fonts-pfb \
> > +             ${PN}-fonts-qpf "
> > +
> > +RRECOMMENDS_${PN}-fonts = " \
> > +             ${PN}-fonts-ttf-vera \
> > +             ${PN}-fonts-ttf-dejavu \
> > +             ${PN}-fonts-pfa \
> > +             ${PN}-fonts-pfb \
> > +             ${PN}-fonts-qpf "
> > +
> > +ALLOW_EMPTY_${PN}-fonts = "1"
> > +PACKAGES_DYNAMIC += "^${PN}-fonts-.*"
> 
> Is this line needed? You're creating all ${PN}-fonts manually, I don't
> see any do_split_packages which would require PACKAGES_DYNAMIC.
> 
true, this comes from qt4 package and I blindly copied those lines.

Eric