[Xfce4-commits] <midori:master> Pick right WebKit1/2 package for extensions/ tests

[Christian Dywan]

Updating branch refs/heads/master
         to e41d7af3f8cfcab1e3a5df210ebb4ee80380b777 (commit)
       from 04ad9c644f49e83f0ecec0f33ce7e340e4b2f3f0 (commit)

commit e41d7af3f8cfcab1e3a5df210ebb4ee80380b777
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Tue Feb 26 19:42:32 2013 +0100

    Pick right WebKit1/2 package for extensions/ tests

 extensions/wscript_build |   10 +++++++++-
 tests/wscript_build      |    6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/extensions/wscript_build b/extensions/wscript_build
index f8cf079..48a9043 100644
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -26,6 +26,10 @@ for extension in extensions:
             continue
         source = extension
 
+    # FIXME
+    if bld.env['HAVE_WEBKIT2'] and target not in ['tab-panel', 'statusbar-features', 'shortcuts', 'status-clock', 'tab-minimized', 'toolbar-editor']:
+        continue
+
     obj = bld.new_task_gen ('cc', 'shlib')
     obj.target = target
     obj.includes = '.. ../katze ../midori'
@@ -34,11 +38,15 @@ for extension in extensions:
     if 'vala' in source:
         obj.env.append_value ('CCFLAGS', '-w')
         obj.vapi_dirs = '../midori ../katze'
-        obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 webkitgtk-3.0 sqlite3 midori midori-core katze'
+        obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 sqlite3 midori midori-core katze'
         if bld.env['HAVE_GTK3']:
             obj.packages += ' gtk+-3.0'
         else:
             obj.packages += ' gtk+-2.0'
+        if bld.env['HAVE_WEBKIT2']:
+            obj.packages += ' webkit2gtk-3.0'
+        else:
+            obj.packages += ' webkitgtk-3.0'
         if bld.env['HAVE_GRANITE']:
             obj.packages += ' clutter-gtk-1.0 granite'
     obj.install_path = '${LIBDIR}/midori'
diff --git a/tests/wscript_build b/tests/wscript_build
index 085ebb5..fe48c0e 100644
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -45,11 +45,15 @@ for test in tests:
     if 'vala' in source:
         obj.env.append_value ('CCFLAGS', '-w')
         obj.vapi_dirs = '../midori ../katze'
-        obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 webkitgtk-3.0 sqlite3 katze midori midori-core'
+        obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 sqlite3 katze midori midori-core'
         if bld.env['HAVE_GTK3']:
             obj.packages += ' gtk+-3.0'
         else:
             obj.packages += ' gtk+-2.0'
+        if bld.env['HAVE_WEBKIT2']:
+            obj.packages += ' webkit2gtk-3.0'
+        else:
+            obj.packages += ' webkitgtk-3.0'
     obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE ZEITGEIST'
     obj.uselib_local = 'midori-core'
     obj.unit_test = 1