diff options
Diffstat (limited to 'app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch')
| -rw-r--r-- | app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch b/app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch new file mode 100644 index 000000000000..c2734c83e45d --- /dev/null +++ b/app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch @@ -0,0 +1,39 @@ +commit 8c7e6552742d11b13bc381fb39c00f9d57ce70ba +Author: Felix Geyer <debfx@fobos.de> +Date: Sun Jan 12 12:39:39 2014 +0100 + + Add compatibility with libgcrypt 1.6. + + Closes #129 + +diff --git a/src/crypto/Crypto.cpp b/src/crypto/Crypto.cpp +index 6ad7fb0..1e28002 100644 +--- a/src/crypto/Crypto.cpp ++++ b/src/crypto/Crypto.cpp +@@ -23,6 +23,7 @@ + + bool Crypto::m_initalized(false); + ++#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600) + static int gcry_qt_mutex_init(void** p_sys) + { + *p_sys = new QMutex(); +@@ -57,6 +58,7 @@ static const struct gcry_thread_cbs gcry_threads_qt = + gcry_qt_mutex_unlock, + 0, 0, 0, 0, 0, 0, 0, 0 + }; ++#endif + + Crypto::Crypto() + { +@@ -69,7 +71,10 @@ void Crypto::init() + return; + } + ++ // libgcrypt >= 1.6 doesn't allow custom thread callbacks anymore. ++#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600) + gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_qt); ++#endif + gcry_check_version(0); + gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); + |