[Xfce4-commits] <midori:master> Require Granite 0.2 due to dynamic notebook and API changes

[Christian Dywan]

Updating branch refs/heads/master
         to 6f8c01c367e15b188289c94320015a6cd019ba79 (commit)
       from c68a42bb658199a48710b5f276a409bfd5e756e5 (commit)

commit 6f8c01c367e15b188289c94320015a6cd019ba79
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Dec 8 13:12:45 2012 +0100

    Require Granite 0.2 due to dynamic notebook and API changes

 README  |    2 +-
 wscript |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/README b/README
index cc78dc9..c9cbc2c 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ Midori is a lightweight web browser.
 Requirements: GLib 2.22, GTK+ 2.16, WebkitGTK+ 1.1.17, libXML2,
               libsoup 2.27.90, sqlite 3.0, Vala 0.14
 
-Optional: GTK+ 3.0, Unique 0.9, libnotify, gcr
+Optional: GTK+ 3.0, Unique 0.9, libnotify, gcr, Granite 0.2
 
 For installation instructions read INSTALL.
 
diff --git a/wscript b/wscript
index dee3705..7ea9ca1 100644
--- a/wscript
+++ b/wscript
@@ -228,7 +228,7 @@ def configure (conf):
             else:
                 granite = 'no (requires --enable-gtk3)'
         else:
-            check_pkg ('granite', '0.1', mandatory=False)
+            check_pkg ('granite', '0.2', mandatory=False)
             granite = ['N/A', 'yes'][conf.env['HAVE_GRANITE'] == 1]
         if granite != 'yes':
             option_checkfatal ('granite', 'new notebook, pop-overs')
@@ -247,7 +247,6 @@ def configure (conf):
 
     conf.check (lib='m')
     check_pkg ('gmodule-2.0')
-    check_pkg ('gthread-2.0')
     check_pkg ('gio-2.0', '2.22.0')
     if check_version (conf.env['GIO_VERSION'], 2, 30, 0) \
         and check_version (conf.env['VALAC_VERSION'], 0, 16, 0):
@@ -421,7 +420,7 @@ def set_options (opt):
     add_enable_option ('libnotify', 'notification support', group)
     add_enable_option ('granite', 'new notebook, pop-overs', group)
     add_enable_option ('addons', 'building of extensions', group)
-    add_enable_option ('tests', 'building of tests', group, disable=True)
+    add_enable_option ('tests', 'install tests', group, disable=True)
     add_enable_option ('gtk3', 'GTK+3 and WebKitGTK+3 support', group, disable=True)
     add_enable_option ('zeitgeist', 'Zeitgeist history integration', group, disable=is_win32 (os.environ))