File abiword-gcrypt-1.6.0.patch of Package abiword

Index: abiword-2.8.6/plugins/collab/backends/service/xp/tls_tunnel.cpp
===================================================================
--- abiword-2.8.6.orig/plugins/collab/backends/service/xp/tls_tunnel.cpp
+++ abiword-2.8.6/plugins/collab/backends/service/xp/tls_tunnel.cpp
@@ -123,11 +123,16 @@ static int gcry_tunnel_mutex_unlock(void
 	return 0;
 }
 
+#if GCRYPT_VERSION_NUMBER >= 0x010600
+  GCRY_THREAD_OPTION_PTHREAD_IMPL;
+  static struct gcry_thread_cbs &gcry_threads_tunnel = gcry_threads_pthread;
+#else
 static struct gcry_thread_cbs gcry_threads_tunnel =
 { GCRY_THREAD_OPTION_USER, NULL,
   gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy,
   gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock,
   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+#endif
 
 bool Proxy::tls_tunnel_init() {
 	if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0)