diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2009-07-13 22:51:33 +0100 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-07-13 22:51:33 +0100 |
| commit | 6e07d2d3e45221b8f7e57416261d7c98ac4d765d (patch) | |
| tree | 5f307b352faef6421f21d5e4c3626653825bdafc /recipes/gtk-webcore | |
| parent | 0ad2fd0c195d4466c3a0a4236775bb3622d02b3e (diff) | |
| parent | 7babd08c434f8d1dda59b34201e68f26a4f99f14 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/gtk-webcore')
| -rw-r--r-- | recipes/gtk-webcore/files/wscript-fix.patch | 14 | ||||
| -rw-r--r-- | recipes/gtk-webcore/midori_git.bb | 5 |
2 files changed, 17 insertions, 2 deletions
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" |