[oe-commits] Thomas Zimmermann : Midori: prepare for OE.dev merge

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: 7ef705de09e9476be77f4741fe2d099fcb78a43c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7ef705de09e9476be77f4741fe2d099fcb78a43c

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Fri Sep 18 09:18:59 2009 +0000

Midori: prepare for OE.dev merge

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 recipes/gtk-webcore/files/waf        |  Bin 0 -> 75695 bytes
 recipes/gtk-webcore/midori.inc       |    2 ++
 recipes/gtk-webcore/midori_0.1.10.bb |   27 ++++++++++++++++-----------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/recipes/gtk-webcore/files/waf b/recipes/gtk-webcore/files/waf
new file mode 100755
index 0000000..a22ad09
Binary files /dev/null and b/recipes/gtk-webcore/files/waf differ
diff --git a/recipes/gtk-webcore/midori.inc b/recipes/gtk-webcore/midori.inc
index 793590b..a7ed936 100644
--- a/recipes/gtk-webcore/midori.inc
+++ b/recipes/gtk-webcore/midori.inc
@@ -7,4 +7,6 @@ inherit autotools gtk-icon-cache pkgconfig
 
 SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
 
+EXTRA_OECONF = "  --disable-hildon "
 
+TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/recipes/gtk-webcore/midori_0.1.10.bb b/recipes/gtk-webcore/midori_0.1.10.bb
index 89f4400..9d1f1dc 100644
--- a/recipes/gtk-webcore/midori_0.1.10.bb
+++ b/recipes/gtk-webcore/midori_0.1.10.bb
@@ -1,19 +1,20 @@
 require midori.inc
 
-DEPENDS += "python-native librsvg python-docutils-native"
+PR = "r2"
 
-SRC_URI = "\
-	http://archive.xfce.org/src/apps/midori/0.1/midori-${PV}.tar.bz2\
-	file://ua-iphone-0.1.10.patch;patch=1\
-	file://config\
-"
+DEPENDS += "python-native python-docutils-native"
 
-PR = "r2"
+SRC_URI = "http://archive.xfce.org/src/apps/midori/0.1/midori-${PV}.tar.bz2 \
+           file://waf \
+          "
 
-CC += "-lstdc++"
+SRC_URI_append_shr = "file://ua-iphone-0.1.10.patch;patch=1 \
+                      file://config"
 
 do_configure() {
-	${S}/configure \
+	cp -f ${WORKDIR}/waf ${S}/
+	sed -i -e 's:, shell=False::g' wscript 
+	./configure \
             --prefix=${prefix} \
             --bindir=${bindir} \
             --sbindir=${sbindir} \
@@ -26,10 +27,14 @@ do_configure() {
             --includedir=${includedir} \
             --infodir=${infodir} \
             --mandir=${mandir} \
-            ${EXTRA_OECONF}
+            ${EXTRA_OECONF} 
+ 
+	sed -i /LINK_CC/d ./_build_/c4che/default.cache.py 
+	echo "LINK_CC = '${CXX}'" >>  ./_build_/c4che/default.cache.py
 }
 
-do_install_append() {
+do_install_append_shr() {
 	install -d ${D}${sysconfdir}/xdg/midori
 	install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/xdg/midori
 }
+