fix libsoup detection

This commit is contained in:
Yves-Alexis Perez 2012-04-17 23:07:00 +02:00
parent a489245d13
commit fd5d3ee02c
3 changed files with 23 additions and 1 deletions

4
debian/changelog vendored
View file

@ -1,4 +1,4 @@
midori (0.4.4-1) unstable; urgency=low midori (0.4.5-1) UNRELEASED; urgency=low
* New upstream release. * New upstream release.
* Apply patch from Colin Watson to improve conffile handling, using new * Apply patch from Colin Watson to improve conffile handling, using new
@ -8,6 +8,8 @@ midori (0.4.4-1) unstable; urgency=low
* debian/midori.maintscript: * debian/midori.maintscript:
- handle the /etc/xdg/midori/extensions/libadblock.so removal there. - handle the /etc/xdg/midori/extensions/libadblock.so removal there.
closes: #660303 closes: #660303
* debian/patches:
- fix-libsoup detection added.
-- Yves-Alexis Perez <corsac@debian.org> Sat, 14 Apr 2012 14:47:59 +0200 -- Yves-Alexis Perez <corsac@debian.org> Sat, 14 Apr 2012 14:47:59 +0200

19
debian/patches/fix-libsoup-detect.patch vendored Normal file
View file

@ -0,0 +1,19 @@
diff --git a/wscript b/wscript
index db74324..c7a0c87 100644
--- a/wscript
+++ b/wscript
@@ -260,11 +260,11 @@ def configure (conf):
check_pkg ('libsoup-2.4', '2.27.90')
conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4'))
if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3):
- conf.define ('LIBSOUP_2_29_3', 1)
+ conf.define ('HAVE_LIBSOUP_2_29_3', 1)
if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91):
- conf.define ('LIBSOUP_2_29_91', 1)
+ conf.define ('HAVE_LIBSOUP_2_29_91', 1)
if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
- conf.define ('LIBSOUP_2_37_1', 1)
+ conf.define ('HAVE_LIBSOUP_2_37_1', 1)
check_pkg ('libxml-2.0', '2.6')
check_pkg ('sqlite3', '3.0', True, var='SQLITE')

View file

@ -1 +1,2 @@
add-debian-searches add-debian-searches
fix-libsoup-detect.patch