From 2740681bb94200d986585f90a55f547afc85600e 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 commit 6210c59e3166a3098982d1ddb8006dfb7f4c5d36 Author: Christian Dywan Date: Wed Sep 5 00:03:55 2012 +0200 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. Checking for javascriptcoregtk-1.0 >= 1.5.1 : yes Traceback (most recent call last): File "./waf", line 158, in Scripting.prepare(t, cwd, VERSION, wafdir) File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Scripting.py", line 105, in prepare prepare_impl(t,cwd,ver,wafdir) File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Scripting.py", line 98, in prepare_impl main() File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Scripting.py", line 133, in main fun(ctx) File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Scripting.py", line 172, in configure conf.sub_config(['']) File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Configure.py", line 155, in sub_config self.recurse(k,name='configure') File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Utils.py", line 461, in recurse f(self) File "/src/midori/wscript", line 271, in configure if check_version ('gtk+-2.0', '2.20.0'): TypeError: check_version() takes exactly 4 arguments (2 given) make[1]: *** [override_dh_auto_configure] Fehler 1 make[1]: Leaving directory `/src/midori' make: *** [build-arch] Fehler 2 2. Convert module name with `conf.check_cfg (modversion='gtk+-2.0')` to fix the following build error. Checking for javascriptcoregtk-1.0 >= 1.5.1 : yes Traceback (most recent call last): File "./waf", line 158, in Scripting.prepare(t, cwd, VERSION, wafdir) File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Scripting.py", line 105, in prepare prepare_impl(t,cwd,ver,wafdir) File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Scripting.py", line 98, in prepare_impl main() File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Scripting.py", line 133, in main fun(ctx) File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Scripting.py", line 172, in configure conf.sub_config(['']) File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Configure.py", line 155, in sub_config self.recurse(k,name='configure') File "/src/midori/.waf-1.5.19-d046dea57dbefcabd071866ac51eb518/wafadmin/Utils.py", line 461, in recurse f(self) File "/src/midori/wscript", line 271, in configure if check_version ('gtk+-2.0', 2, 20, 0): File "/src/midori/wscript", line 97, in check_version given_major, given_minor, given_micro = given_version.split ('.', 2) ValueError: need more than 2 values to unpack make[1]: *** [override_dh_auto_configure] Fehler 1 make[1]: Leaving directory `/src/midori' make: *** [build-arch] Fehler 2 Fixes: https://bugs.launchpad.net/midori/+bug/1046172 --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 69a0cc4..1b1988e 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') -- 1.7.10.4