[Xfce4-commits] <midori:master> Drop unnecessary Clutter requirement from Granite build

[Christian Dywan]

Updating branch refs/heads/master
         to abd0957e7ed7657bd80cfcc08ad71c1988e8af6e (commit)
       from dfa76db581e5749af589c3fb2f72c3c67ca5cb74 (commit)

commit abd0957e7ed7657bd80cfcc08ad71c1988e8af6e
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue May 14 19:52:15 2013 +0200

    Drop unnecessary Clutter requirement from Granite build

 extensions/wscript_build |    4 ++--
 midori/wscript_build     |    4 ++--
 wscript                  |    1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/extensions/wscript_build b/extensions/wscript_build
index 5b698bc..11d1ab4 100644
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -35,7 +35,7 @@ for extension in extensions:
     obj.target = target
     obj.includes = '.. ../katze ../midori'
     obj.source = source
-    obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML CLUTTER GRANITE'
+    obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML GRANITE'
     if 'vala' in source:
         obj.env.append_value ('CCFLAGS', '-w')
         obj.vapi_dirs = '../midori ../katze'
@@ -49,7 +49,7 @@ for extension in extensions:
         else:
             obj.packages += ' webkitgtk-3.0'
         if bld.env['HAVE_GRANITE']:
-            obj.packages += ' clutter-gtk-1.0 granite'
+            obj.packages += ' granite'
     obj.install_path = '${LIBDIR}/midori'
     # See LINKFLAGS in wscript: w/ o it we get several "undefined reference" errors
     if bld.env['platform'] == 'win32':
diff --git a/midori/wscript_build b/midori/wscript_build
index e42462b..b5b6ef8 100644
--- a/midori/wscript_build
+++ b/midori/wscript_build
@@ -9,7 +9,7 @@ import os
 progressive = True
 libs = 'M UNIQUE LIBSOUP GMODULE GTHREAD LIBIDN GIO GTK SQLITE ' \
        'LIBNOTIFY WEBKIT JAVASCRIPTCOREGTK LIBXML X11 XSS WS2_32 ' \
-       'GCR GRANITE CLUTTER ZEITGEIST'
+       'GCR GRANITE ZEITGEIST'
 
 if Options.commands['build'] or Options.commands['check']:
     blddir = str (bld.bldnode)[6:] # dir:// + absolute path
@@ -34,7 +34,7 @@ if progressive:
     else:
         obj.packages += ' gtk+-2.0'
     if bld.env['HAVE_GRANITE']:
-        obj.packages += ' clutter-gtk-1.0 granite'
+        obj.packages += ' granite'
     obj.install_path = None
     bld.add_group ()
 
diff --git a/wscript b/wscript
index 014af53..45ead39 100644
--- a/wscript
+++ b/wscript
@@ -208,7 +208,6 @@ def configure (conf):
             option_checkfatal ('granite', 'new notebook, pop-overs')
             conf.define ('GRANITE_VERSION', 'No')
         else:
-            check_pkg ('clutter-gtk-1.0', '1.0')
             conf.env.append_value ('VALAFLAGS', '-D HAVE_GRANITE')
     else:
         conf.define ('GRANITE_VERSION', 'No')