Added patch to (hopefully) fix detection of gnutls on Ubuntu 14.10.

debian/changelog

@@ -10,6 +10,7 @@ wine-compholio (1.7.26) UNRELEASED; urgency=low
   * Added patch to fix issues when using setcap on wine executable.
   * Added patch to improve heap allocation performance by using more freelists.
   * Added patch to fix detection of ncurses on Archlinux (avoids ugly workarounds at build time).
+  * Added patch to fix detection of gnutls on Ubuntu 14.10.
   * Added patch to use assembly wrapper for TLS callbacks.
   * Removed patch to fix issue with msi/ITERATE_MoveFiles (accepted upstream).
   * Removed patch to fix detection of ncurses on Archlinux (accepted upstream).

patches/Makefile

@@ -26,6 +26,7 @@ PATCHLIST := \
 	comctl32-ImageList.ok \
 	comctl32-LoadIconMetric.ok \
 	configure-Absolute_RPATH.ok \
+	configure-Detect_Gnutls.ok \
 	dsound-Fast_Mixer.ok \
 	fonts-Missing_Fonts.ok \
 	iphlpapi-TCP_Table.ok \
@@ -270,6 +271,21 @@ configure-Absolute_RPATH.ok:
 		echo '+    { "configure-Absolute_RPATH", "Sebastian Lackner", "Also add the absolute RPATH when linking against libwine." },'; \
 	) > configure-Absolute_RPATH.ok
 
+# Patchset configure-Detect_Gnutls
+# |
+# | Included patches:
+# |   *	Fix detection of gnutls on Ubuntu 14.10. [by Sebastian Lackner]
+# |
+# | Modified files:
+# |   *	configure.ac
+# |
+.INTERMEDIATE: configure-Detect_Gnutls.ok
+configure-Detect_Gnutls.ok:
+	$(call APPLY_FILE,configure-Detect_Gnutls/0001-configure-Fix-detection-of-gnutls-on-Ubuntu-14.10.patch)
+	@( \
+		echo '+    { "configure-Detect_Gnutls", "Sebastian Lackner", "Fix detection of gnutls on Ubuntu 14.10." },'; \
+	) > configure-Detect_Gnutls.ok
+
 # Patchset dsound-Fast_Mixer
 # |
 # | Included patches:

patches/configure-Detect_Gnutls/0001-configure-Fix-detection-of-gnutls-on-Ubuntu-14.10.patch

@@ -0,0 +1,25 @@
+From 3ec0224addff16f803d8d49feb0a4a232c48ebcd Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 7 Sep 2014 08:09:54 +0200
+Subject: configure: Fix detection of gnutls on Ubuntu 14.10.
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2bc0008..c22b119 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1360,7 +1360,7 @@ then
+         [AC_CHECK_HEADER(gnutls/gnutls.h,
+             [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>
+ #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
+-                [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])],
++                [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\\(xx\\)\\{0,1\\}]])])],
+             [GNUTLS_CFLAGS=""])])
+ fi
+ WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],
+-- 
+2.1.0
+

patches/configure-Detect_Gnutls/definition

@@ -0,0 +1,3 @@
+Author: Sebastian Lackner
+Subject: Fix detection of gnutls on Ubuntu 14.10.
+Revision: 1