aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Brabec <utx@penguin.cz>2009-07-13 21:25:15 +0000
committerutx@penguin.cz <utx@penguin.cz>2009-07-13 21:25:15 +0000
commit7babd08c434f8d1dda59b34201e68f26a4f99f14 (patch)
tree8c0e576cde1079dff7217701dda507968109b76e
parent8b633e67eeac66d972589c2016791a4860ad5f65 (diff)
downloadopenembedded-7babd08c434f8d1dda59b34201e68f26a4f99f14.tar.gz
openembedded-7babd08c434f8d1dda59b34201e68f26a4f99f14.tar.bz2
openembedded-7babd08c434f8d1dda59b34201e68f26a4f99f14.zip
midori: Updated to the latest git snapshot.
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--recipes/gtk-webcore/files/wscript-fix.patch14
-rw-r--r--recipes/gtk-webcore/midori_git.bb5
3 files changed, 18 insertions, 3 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e16ab3eb8b..d747b6ebc9 100644
--- 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
index 0000000000..58a0cbff46
--- /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 aa5a213f78..decc81c365 100644
--- 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"