From fd5d3ee02c4a216e9f54af240b83daf17e96808c Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Tue, 17 Apr 2012 23:07:00 +0200 Subject: [PATCH] fix libsoup detection --- debian/changelog | 4 +++- debian/patches/fix-libsoup-detect.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-libsoup-detect.patch diff --git a/debian/changelog b/debian/changelog index 31e3d2d3..8e1ce44f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -midori (0.4.4-1) unstable; urgency=low +midori (0.4.5-1) UNRELEASED; urgency=low * New upstream release. * 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: - handle the /etc/xdg/midori/extensions/libadblock.so removal there. closes: #660303 + * debian/patches: + - fix-libsoup detection added. -- Yves-Alexis Perez Sat, 14 Apr 2012 14:47:59 +0200 diff --git a/debian/patches/fix-libsoup-detect.patch b/debian/patches/fix-libsoup-detect.patch new file mode 100644 index 00000000..c1fcd1b2 --- /dev/null +++ b/debian/patches/fix-libsoup-detect.patch @@ -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') + diff --git a/debian/patches/series b/debian/patches/series index 5367257f..6b5507a5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ add-debian-searches +fix-libsoup-detect.patch