| 1 |
pacho 14/02/09 12:15:00 |
| 2 |
|
| 3 |
Added: abiword-3.0.0-libgcrypt_1_6_0-1.patch |
| 4 |
Log: |
| 5 |
Fix build with libcrypt-1.6 (#495176 by Anton Kochkov) and boost dependency (#493786 by Maxim Kammerer) |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-office/abiword/files/abiword-3.0.0-libgcrypt_1_6_0-1.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/abiword/files/abiword-3.0.0-libgcrypt_1_6_0-1.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/abiword/files/abiword-3.0.0-libgcrypt_1_6_0-1.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: abiword-3.0.0-libgcrypt_1_6_0-1.patch |
| 16 |
=================================================================== |
| 17 |
Submitted By: Armin K. <krejzi at email dot com> |
| 18 |
Date: 2013-12-21 |
| 19 |
Initial Package Version: 3.0.0 |
| 20 |
Upstream Status: Not submitted |
| 21 |
Origin: Self |
| 22 |
Description: Fixes building with libgcrypt 1.6.0 |
| 23 |
|
| 24 |
diff -Naur a/plugins/collab/backends/service/xp/tls_tunnel.cpp b/plugins/collab/backends/service/xp/tls_tunnel.cpp |
| 25 |
--- a/plugins/collab/backends/service/xp/tls_tunnel.cpp 2009-09-10 12:46:19.000000000 +0200 |
| 26 |
+++ b/plugins/collab/backends/service/xp/tls_tunnel.cpp 2013-12-20 19:25:38.728798750 +0100 |
| 27 |
@@ -123,11 +123,16 @@ |
| 28 |
return 0; |
| 29 |
} |
| 30 |
|
| 31 |
+#if GCRYPT_VERSION_NUMBER >= 0x010600 |
| 32 |
+ GCRY_THREAD_OPTION_PTHREAD_IMPL; |
| 33 |
+ static struct gcry_thread_cbs &gcry_threads_tunnel = gcry_threads_pthread; |
| 34 |
+#else |
| 35 |
static struct gcry_thread_cbs gcry_threads_tunnel = |
| 36 |
{ GCRY_THREAD_OPTION_USER, NULL, |
| 37 |
gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy, |
| 38 |
gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock, |
| 39 |
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; |
| 40 |
+#endif |
| 41 |
|
| 42 |
bool Proxy::tls_tunnel_init() { |
| 43 |
if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0) |
Archives