Midori Web Browser

Merge lp:~tuxator/midori/wk2-skip-nojs into lp:midori

  1. wk2-skip-nojs
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: André Stösel
Approved revision: 6297
Merged at revision: 6297
Proposed branch: lp:~tuxator/midori/wk2-skip-nojs
Merge into: lp:midori
Diff against target: 12 lines (+1/-1)
1 file modified
extensions/wscript_build (+1/-1)
To merge this branch: bzr merge lp:~tuxator/midori/wk2-skip-nojs
Reviewer Review Type Date Requested Status
André Stösel Approve
Review via email: mp+177934@code.launchpad.net

Commit message

Skip nojs extension for now when building with WK2

To post a comment you must log in.
Revision history for this message
André Stösel (ivaldi) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'extensions/wscript_build'
--- extensions/wscript_build 2013-07-29 21:05:02 +0000
+++ extensions/wscript_build 2013-07-31 20:32:30 +0000
@@ -32,7 +32,7 @@
32 source = extension32 source = extension
3333
34 # FIXME34 # FIXME
35 if bld.env['HAVE_WEBKIT2'] and target in ['external-download-manager', 'nsplugin-manager', 'formhistory', 'adblock', 'cookie-permissions', 'addons']:35 if bld.env['HAVE_WEBKIT2'] and target in ['external-download-manager', 'nsplugin-manager', 'formhistory', 'adblock', 'cookie-permissions', 'addons', 'nojs']:
36 continue36 continue
3737
38 obj = bld.new_task_gen ('cc', 'shlib')38 obj = bld.new_task_gen ('cc', 'shlib')

Subscribers

People subscribed via source and target branches

to all changes: