midori: fix build with dirty vala

* 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

(From meta-openembedded rev: bcfc89236b7a96eb00999492351fb9cafc0cbf84)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-connectivity/midori/midori-0.4.1/waf b/meta-openembedded/meta-oe/recipes-connectivity/midori/midori-0.4.1/waf
new file mode 100755 (executable)
index 0000000..b74a2d8
Binary files /dev/null and b/meta-openembedded/meta-oe/recipes-connectivity/midori/midori-0.4.1/waf differ

diff --git a/meta-openembedded/meta-oe/recipes-connectivity/midori/midori_0.4.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/midori/midori_0.4.1.bb
index 2805b92..860ed21 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-connectivity/midori/midori_0.4.1.bb
+++ b/meta-openembedded/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"