Skip to contentSkip to conversation

midori: fix build with dirty vala

PATCH In review Martin Jansa 2 participants 3 messages Oct 19, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 .../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
meta-oe/recipes-connectivity/midori/midori-0.4.1/waf new file binary +0 -0
new file mode 100755
index 0000000000000000000000000000000000000000..b74a2d809a1bca11ec8548cb9dfcd7501c5f346d
GIT binary patch
meta-oe/recipes-connectivity/midori/midori_0.4.1.bb +8 -0
index 2805b92..860ed21 100644
@@ -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"
 
Signature · 1 line
1.7.7
#1 lore raw
Quoted 1,789 lines · Martin Jansa

* 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

---
 .../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
meta-oe/recipes-connectivity/midori/midori-0.4.1/waf new file binary +0 -0
new file mode 100755
index 0000000000000000000000000000000000000000..b74a2d809a1bca11ec8548cb9dfcd7501c5f346d
GIT binary patch
meta-oe/recipes-connectivity/midori/midori_0.4.1.bb +2 -0
index 2805b92..860ed21 100644
@@ -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 \

meta-oe/recipes-connectivity/midori/midori_0.4.1.bb line 15

Quoted 10 lines
meta-oe/recipes-connectivity/midori/midori_0.4.1.bb +6 -0
+           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?

Andreas

#2 lore raw
Quoted 23 lines · Andreas Müller
Quoted 22 lines · Martin Jansa

* 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

---
 .../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
meta-oe/recipes-connectivity/midori/midori-0.4.1/waf new file binary +0 -0
new file mode 100755
index 0000000000000000000000000000000000000000..b74a2d809a1bca11ec8548cb9dfcd7501c5f346d
GIT binary patch

...

Quoted 10 lines
Quoted 10 lines

literal 0
HcmV?d00001

meta-oe/recipes-connectivity/midori/midori_0.4.1.bb +0 -0
index 2805b92..860ed21 100644
@@ -1,7 +1,15 @@
 require midori.inc
 
Quoted 15 lines
Quoted 4 lines
meta-oe/recipes-connectivity/midori/midori_0.4.1.bb +2 -0
+PR = "r1"
+
 SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \

meta-oe/recipes-connectivity/midori/midori_0.4.1.bb line 15

Quoted 10 lines
meta-oe/recipes-connectivity/midori/midori_0.4.1.bb +6 -0
+           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,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]