[Xfce4-commits] <midori:master> Use the same webkitgtk-3.0.vapi for GTK+2

[Christian Dywan]

Updating branch refs/heads/master
         to b2ce60d164063fc78b592c3a3b703bdf67f3d0fb (commit)
       from e7476073995e23be4ab36bf11d0f7a45475dbbf8 (commit)

commit b2ce60d164063fc78b592c3a3b703bdf67f3d0fb
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Dec 2 15:34:13 2012 +0100

    Use the same webkitgtk-3.0.vapi for GTK+2

 extensions/wscript_build  |    6 +++---
 midori/webkitgtk-3.0.deps |    2 --
 midori/wscript_build      |    6 +++---
 tests/wscript_build       |    6 +++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/extensions/wscript_build b/extensions/wscript_build
index 8bb4cdd..8036c47 100644
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -34,11 +34,11 @@ 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 sqlite3 midori midori-core katze'
+        obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 webkitgtk-3.0 sqlite3 midori midori-core katze'
         if bld.env['HAVE_GTK3']:
-            obj.packages += ' gtk+-3.0 webkitgtk-3.0'
+            obj.packages += ' gtk+-3.0'
         else:
-            obj.packages += ' gtk+-2.0 webkit-1.0 unique-1.0'
+            obj.packages += ' gtk+-2.0'
         if bld.env['HAVE_GRANITE']:
             obj.packages += ' clutter-gtk-1.0 granite'
     obj.install_path = '${LIBDIR}/midori'
diff --git a/midori/webkitgtk-3.0.deps b/midori/webkitgtk-3.0.deps
index 91b1dfe..4485738 100644
--- a/midori/webkitgtk-3.0.deps
+++ b/midori/webkitgtk-3.0.deps
@@ -3,6 +3,4 @@ gio-2.0
 cairo
 pango
 gdk-pixbuf-2.0
-gdk-3.0
-gtk+-3.0
 libsoup-2.4
diff --git a/midori/wscript_build b/midori/wscript_build
index 76bafbc..17c7c4e 100644
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -26,11 +26,11 @@ if progressive:
     obj.add_marshal_file ('marshal.list', 'midori_cclosure_marshal')
     obj.install_path = None
     obj.vapi_dirs = '../midori ../katze'
-    obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 posix sqlite3'
+    obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 webkitgtk-3.0 posix sqlite3'
     if bld.env['HAVE_GTK3']:
-        obj.packages += ' gtk+-3.0 webkitgtk-3.0'
+        obj.packages += ' gtk+-3.0'
     else:
-        obj.packages += ' gtk+-2.0 webkit-1.0'
+        obj.packages += ' gtk+-2.0'
     if bld.env['HAVE_GRANITE']:
         obj.packages += ' clutter-gtk-1.0 granite'
     bld.add_group ()
diff --git a/tests/wscript_build b/tests/wscript_build
index a8727ab..2e79701 100644
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -46,11 +46,11 @@ 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 sqlite3 katze midori midori-core'
+        obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 webkitgtk-3.0 sqlite3 katze midori midori-core'
         if bld.env['HAVE_GTK3']:
-            obj.packages += ' gtk+-3.0 webkitgtk-3.0'
+            obj.packages += ' gtk+-3.0'
         else:
-            obj.packages += ' gtk+-2.0 webkit-1.0'
+            obj.packages += ' gtk+-2.0'
     obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE ZEITGEIST'
     obj.uselib_local = 'midori-core'
     obj.unit_test = 1