guix-wigust/wine-1.9.6-gnutls.patch

schannel_gnutls.c:45:12: error: conflicting types for ‘gnutls_cipher_get_block_size’                                                                                          
 extern int gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm);                                                                                                
            ^                                                                                                                                                                 
In file included from schannel_gnutls.c:28:0:                                                                                                                                 
/gnu/store/m4a4kaw68ghs2zgl87dax3f6x4p67l61-gnutls-3.5.13/include/gnutls/crypto.h:59:10: note: previous declaration of ‘gnutls_cipher_get_block_size’ was here                
 unsigned gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm) __GNUTLS_CONST__;                                                                                 

See <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=832275#5>.

From bf5ac531a030bce9e798ab66bc53e84a65ca8fdb Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Thu, 16 Jun 2016 00:21:13 -0500
Subject: [PATCH] secur32: Provide a static declaration for
 gnutls_cipher_get_block_size.

Instead of providing an extern provide a static declaration. The
function return type changed from signed to unsigned in GnuTLS 3.5.

Signed-off-by: Michael Cronenworth <mike@cchtml.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/secur32/schannel_gnutls.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
index b10b629..bcadd47 100644
--- 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_credentials);
 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);
-- 
2.1.4