summaryrefslogtreecommitdiff
path: root/app-emulation/wine/files/wine-1.8-gnutls-3.5-compat.patch
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-08-13 12:33:02 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-08-13 12:33:02 +0100
commitce8fe402f545e8762abd3745e0d3aa41d2a97a8f (patch)
tree49393f128c912905faa9716f28ed47cd56b6d73a /app-emulation/wine/files/wine-1.8-gnutls-3.5-compat.patch
parentd57dbc4b3f327aeba40f0b02a63c5a370d239ce8 (diff)
Revert "app-emulation/wine : version bump"
This reverts commit 5a8f7ce4218cf59d117cc1d2c1f52165b9e68bd7.
Diffstat (limited to 'app-emulation/wine/files/wine-1.8-gnutls-3.5-compat.patch')
-rw-r--r--app-emulation/wine/files/wine-1.8-gnutls-3.5-compat.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/app-emulation/wine/files/wine-1.8-gnutls-3.5-compat.patch b/app-emulation/wine/files/wine-1.8-gnutls-3.5-compat.patch
new file mode 100644
index 00000000..291c4a51
--- /dev/null
+++ b/app-emulation/wine/files/wine-1.8-gnutls-3.5-compat.patch
@@ -0,0 +1,39 @@
+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
+