debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wscript: Fix check for version of GTK+-2.0

Browse source 
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
This commit is contained in:
Paul Menzel 2012-09-05 08:44:27 +02:00 committed by Christian Dywan
parent a6744f64ee
commit ccd5b5ac99
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wscript
View file

@ -268,7 +268,7 @@ def configure (conf):
check_pkg ('webkit-1.0', '1.1.17', args=args) check_pkg ('webkit-1.0', '1.1.17', args=args)
if check_version (conf.check_cfg (modversion='webkit-1.0'), 1, 5, 1): if check_version (conf.check_cfg (modversion='webkit-1.0'), 1, 5, 1):
check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args) 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.append_value ('VALAFLAGS', '-D HAVE_OFFSCREEN')
conf.env['HAVE_GTK3'] = option_enabled ('gtk3') conf.env['HAVE_GTK3'] = option_enabled ('gtk3')
check_pkg ('libsoup-2.4', '2.27.90') check_pkg ('libsoup-2.4', '2.27.90')