[oe] [PATCH] midori: fix build with dirty vala

[Martin Jansa]

On Wed, Oct 19, 2011 at 09:35:55PM +0200, Andreas Müller wrote:
> On Wednesday, October 19, 2011 02:29:59 PM Martin Jansa wrote:
> > * there is only one line added to default waf file
> >   in unpack_wafdir() just before last chdir and return
> >   because those files are downloaded and cannot be patched in normal way
> >   os.system("sed -i \"s/version=output.split/version=output.replace('-dirty','').split/g\" wafadmin/Tools/vala.py")
> > 
> > * It fails to parse version like this
> >   /OE/shr-core/tmp/sysroots/x86_64-linux/usr/bin/valac --version
> >   Vala 0.12.1-dirty
> >   reporting 0.0.0 instead which breaks configure
> > 
> > Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> > ---
> >  .../recipes-connectivity/midori/midori-0.4.1/waf   |  Bin 0 -> 92569 bytes
> >  .../recipes-connectivity/midori/midori_0.4.1.bb    |    8 ++++++++
> >  2 files changed, 8 insertions(+), 0 deletions(-)
> >  create mode 100755 meta-oe/recipes-connectivity/midori/midori-0.4.1/waf
> > 
> > diff --git a/meta-oe/recipes-connectivity/midori/midori-0.4.1/waf b/meta-oe/recipes-connectivity/midori/midori-0.4.1/waf
> > new file mode 100755
> > index 0000000000000000000000000000000000000000..b74a2d809a1bca11ec8548cb9dfcd7501c5f346d
> > GIT binary patch
> > literal 92569
...
> > literal 0
> > HcmV?d00001
> > 
> > diff --git a/meta-oe/recipes-connectivity/midori/midori_0.4.1.bb b/meta-oe/recipes-connectivity/midori/midori_0.4.1.bb
> > index 2805b92..860ed21 100644
> > --- a/meta-oe/recipes-connectivity/midori/midori_0.4.1.bb
> > +++ b/meta-oe/recipes-connectivity/midori/midori_0.4.1.bb
> > @@ -1,7 +1,15 @@
> >  require midori.inc
> >  
> > +PR = "r1"
> > +
> >  SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
> > +           file://waf \
> >            "
> > +
> > +do_configure_prepend() {
> > +  cp -f ${WORKDIR}/waf ${S}/
> > +}
> > +
> >  SRC_URI[midori.md5sum] = "33dde203cd71ae2b1d2adcc7f5739f65"
> >  SRC_URI[midori.sha256sum] = "b3c77ddb6f562a0ea3d2e6fbb756ca0dc158ad8410f4b60f8e5998c2f7305f07"
> >  
> > 
> Just my personal interest: How did you get to new waf. Can you suggest sources to lift waf out of black-box?

I've edited old one with vim :)

Not that I'm usually able after few beers to fix binaries directly in vim.. 
but the beginning of that file is python script where I've put that
extra line..

Maybe it would be worth it to upgrade waf to 1.6.0 or newer (where vala
issue is also resolved), but I haven't tried to build midori with it as
there were many changes in waf and I hope that newer midori will be
using it already from upstream.

Other option is to store only smaller binary patch to upstream waf, but
that wont probably apply to next version too.

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20111019/25659cc6/attachment-0002.sig>