I've just finished rebuilding last of the packages that were linked to
libgcrypt because of libgcrypt soname bump with 1.6.0 and stumbled upon
a problem. libgcrypt 1.6.0 removed some structure members of
gcry_thread_cbs structure and abiword collab backend failed to build. I
am attaching a patch that fixes the build with latest libgcrypt.
Also, telepathy backend disable option is not valid anymore, abiword
collab telepathy backend builds just fine with telepathy-glib 0.22.0.
--
Note: My last name is not Krejzi.
diff -Naur a/plugins/collab/backends/service/xp/tls_tunnel.cpp b/plugins/collab/backends/service/xp/tls_tunnel.cpp
--- a/plugins/collab/backends/service/xp/tls_tunnel.cpp 2009-09-10 12:46:19.000000000 +0200
+++ b/plugins/collab/backends/service/xp/tls_tunnel.cpp 2013-12-20 19:25:38.728798750 +0100
@@ -123,11 +123,16 @@
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)
--
http://linuxfromscratch.org/mailman/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
