summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2013-05-10 19:46:28 +0000
committerChristian Faulhammer <fauli@gentoo.org>2013-05-10 19:46:28 +0000
commit736f4e1797c1cfd8aedfdf6f9e271fc01b1d4bce (patch)
tree2f6459fc2aab0de000e3a2f27366046e0daab1f5 /mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch
parentRevision bump (diff)
downloadgentoo-2-736f4e1797c1cfd8aedfdf6f9e271fc01b1d4bce.tar.gz
gentoo-2-736f4e1797c1cfd8aedfdf6f9e271fc01b1d4bce.tar.bz2
gentoo-2-736f4e1797c1cfd8aedfdf6f9e271fc01b1d4bce.zip
Make check for libsoup non-mandatory, as provided by Ted Tanberry on bug 469014
(Portage version: 2.1.11.62/cvs/Linux i686, signed Manifest commit with key 2B859DE3)
Diffstat (limited to 'mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch')
-rw-r--r--mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch b/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch
new file mode 100644
index 000000000000..3b5c452b7652
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch
@@ -0,0 +1,30 @@
+
+libsoup is not obligatory, but nonetheless a mandatory check existed.
+Fixed in releases >3.9.1
+
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=469014
+Upstream commit: http://git.claws-mail.org/?p=claws.git;a=commitdiff;h=d04c724c9e74f7c5d1f247e41a21e472790d9992
+
+
+--- configure.ac.orig
++++ configure.ac
+@@ -1107,14 +1107,17 @@
+ AC_SUBST(WEBKIT_CFLAGS)
+
+ dnl libsoup ********************************************************************
+-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4)
++PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
++if test x"$HAVE_LIBSOUP" = xyes; then
++ AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
++fi
+ AC_SUBST(LIBSOUP_CFLAGS)
+ AC_SUBST(LIBSOUP_LIBS)
+
+ dnl libsoup-gnome **************************************************************
+ PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, HAVE_LIBSOUP_GNOME=yes, HAVE_LIBSOUP_GNOME=no)
+ if test x"$HAVE_LIBSOUP_GNOME" = xyes; then
+- AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup is available])
++ AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup_gnome is available])
+ fi
+ AC_SUBST(LIBSOUP_GNOME_CFLAGS)
+ AC_SUBST(LIBSOUP_GNOME_LIBS)