From ccd5b5ac99193eefc1360de6f7712697df64a736 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 5 Sep 2012 08:44:27 +0200 Subject: [PATCH] wscript: Fix check for version of GTK+-2.0 After "Move thumbnail generation into SpeedDial class" building Midori failed. 1. Separately pass each digit of version to `check_version()` to fix the following build error. 2. Convert module name with `conf.check_cfg (modversion='gtk+-2.0')` to fix the following build error. Fixes: https://bugs.launchpad.net/midori/+bug/1046172 --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 69a0cc41..1b1988e3 100644 --- a/wscript +++ b/wscript @@ -268,7 +268,7 @@ def configure (conf): check_pkg ('webkit-1.0', '1.1.17', args=args) if check_version (conf.check_cfg (modversion='webkit-1.0'), 1, 5, 1): check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args) - if check_version ('gtk+-2.0', '2.20.0'): + if check_version (conf.check_cfg (modversion='gtk+-2.0'), 2, 20, 0): conf.env.append_value ('VALAFLAGS', '-D HAVE_OFFSCREEN') conf.env['HAVE_GTK3'] = option_enabled ('gtk3') check_pkg ('libsoup-2.4', '2.27.90')