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

Show libSoup version from pkg-config in about:version

Browse source
This commit is contained in:
Christian Dywan 2011-04-30 12:00:12 +02:00
parent 4435b8fcef
commit e6d8e10606
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
midori/midori-view.c
View file

@ -4221,13 +4221,6 @@ midori_view_set_uri (MidoriView* view,
#define WEBKIT_USER_AGENT_MAJOR_VERSION 532 #define WEBKIT_USER_AGENT_MAJOR_VERSION 532
#define WEBKIT_USER_AGENT_MINOR_VERSION 1 #define WEBKIT_USER_AGENT_MINOR_VERSION 1
#endif #endif
#if defined (HAVE_LIBSOUP_2_29_3)
#define LIBSOUP_VERSION "2.29.3"
#elif defined (HAVE_LIBSOUP_2_27_90)
#define LIBSOUP_VERSION "2.27.90"
#else
#define LIBSOUP_VERSION "2.25.2"
#endif
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
#define DEBUGGING " (Debug)" #define DEBUGGING " (Debug)"
#else #else

1
wscript
View file

@ -209,6 +209,7 @@ def configure (conf):
check_pkg ('libsoup-2.4', '2.27.90', False, var='LIBSOUP_2_27_90') check_pkg ('libsoup-2.4', '2.27.90', False, var='LIBSOUP_2_27_90')
check_pkg ('libsoup-2.4', '2.29.3', False, var='LIBSOUP_2_29_3') check_pkg ('libsoup-2.4', '2.29.3', False, var='LIBSOUP_2_29_3')
check_pkg ('libsoup-2.4', '2.29.91', False, var='LIBSOUP_2_29_91') check_pkg ('libsoup-2.4', '2.29.91', False, var='LIBSOUP_2_29_91')
conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4'))
check_pkg ('libxml-2.0', '2.6') check_pkg ('libxml-2.0', '2.6')
check_pkg ('sqlite3', '3.0', True, var='SQLITE') check_pkg ('sqlite3', '3.0', True, var='SQLITE')