[pkg-wine-party] [wine] 18/18: Add gnutls.patch to fix FTBFS against against gnutls 3.5.

[Jens Reyer]

This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch stretch
in repository wine.

commit 758122e8a33d5dba20bc30601d6df0283beac7f0
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Jul 28 23:22:46 2016 +0200

    Add gnutls.patch to fix FTBFS against against gnutls 3.5.
    
    Closes: #832275
---
 debian/changelog            |  1 +
 debian/patches/gnutls.patch | 23 +++++++++++++++++++++++
 debian/patches/series       |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1599512..c19194c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ wine (1.8.3-3) UNRELEASED; urgency=medium
     - Let the -tools packages recommend wineVERSION.
     - Add wine-development as alternative depends to wine-binfmt.
   * Make wine-binfmt M-A:foreign.
+  * Add gnutls.patch to fix FTBFS against against gnutls 3.5 (closes: #832275).
 
  -- Jens Reyer <jre.winesim at gmail.com>  Thu, 28 Jul 2016 17:33:38 +0200
 
diff --git a/debian/patches/gnutls.patch b/debian/patches/gnutls.patch
new file mode 100644
index 0000000..6d36bea
--- /dev/null
+++ b/debian/patches/gnutls.patch
@@ -0,0 +1,23 @@
+Description: fix ftbfs against against gnutls 3.5
+Origin: upstream, http://source.winehq.org/git/wine.git/commitdiff/bf5ac531a030bce9e798ab66bc53e84a65ca8fdb
+Bug-Debian: https://bugs.debian.org/832275
+
+--- a/dlls/secur32/schannel_gnutls.c
++++ b/dlls/secur32/schannel_gnutls.c
+@@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32);
+ WINE_DECLARE_DEBUG_CHANNEL(winediag);
+ 
+ /* Not present in gnutls version < 2.9.10. */
+-extern int gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm);
++static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t algorithm);
+ 
+ static void *libgnutls_handle;
+ #define MAKE_FUNCPTR(f) static typeof(f) * p##f
+@@ -52,7 +52,6 @@ MAKE_FUNCPTR(gnutls_certificate_allocate
+ MAKE_FUNCPTR(gnutls_certificate_free_credentials);
+ MAKE_FUNCPTR(gnutls_certificate_get_peers);
+ MAKE_FUNCPTR(gnutls_cipher_get);
+-MAKE_FUNCPTR(gnutls_cipher_get_block_size);
+ MAKE_FUNCPTR(gnutls_cipher_get_key_size);
+ MAKE_FUNCPTR(gnutls_credentials_set);
+ MAKE_FUNCPTR(gnutls_deinit);
diff --git a/debian/patches/series b/debian/patches/series
index 2b68b9a..7657844 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+gnutls.patch
 fontdir.patch
 makefile.patch
 kfreebsd.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git