midori: Updated to the latest git snapshot.

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e16ab3e..d747b6e 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -136,7 +136,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9"
-SRCREV_pn-midori ?= "3179a538a947cbd7612cac346e3e0c7c3d0e03cd"
+SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"

diff --git a/recipes/gtk-webcore/files/wscript-fix.patch b/recipes/gtk-webcore/files/wscript-fix.patch
new file mode 100644 (file)
index 0000000..58a0cbf
--- /dev/null
+++ b/recipes/gtk-webcore/files/wscript-fix.patch
@@ -0,0 +1,14 @@
+Index: git/wscript
+===================================================================
+--- git.orig/wscript
++++ git/wscript
+@@ -62,8 +62,7 @@ def rc_file(self, node):
+     rctask.set_inputs (node)
+     rctask.set_outputs (node.change_ext ('.rc.o'))
+     self.compiled_tasks.append (rctask)
+-Task.simple_task_type ('winrc', '${WINRC} -o${TGT} ${SRC}', color='BLUE',
+-    before='cc cxx', shell=False)
++    Task.simple_task_type ('winrc', '${WINRC} -o${TGT} ${SRC}', color='BLUE', before='cc cxx', shell=False)
+ 
+ def configure (conf):
+     def option_checkfatal (option, desc):

diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb
index aa5a213..decc81c 100644 (file)
--- a/recipes/gtk-webcore/midori_git.bb
+++ b/recipes/gtk-webcore/midori_git.bb
@@ -3,11 +3,12 @@ require midori.inc
 DEPENDS += "python-native python-docutils-native"
 
 # increment PR every time SRCREV is updated!
-PR = "r1"
+PR = "r2"
 PV = "0.1.7+${PR}+gitr${SRCREV}"
 
 SRC_URI = "git://git.xfce.org/kalikiana/midori;protocol=git \
-           file://waf"
+           file://waf \
+           file://wscript-fix.patch;patch=1"
 
 S = "${WORKDIR}/git"