diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-admin/keepassx/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-admin/keepassx/files')
-rw-r--r-- | app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch | 11 | ||||
-rw-r--r-- | app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch | 39 |
2 files changed, 50 insertions, 0 deletions
diff --git a/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch b/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch new file mode 100644 index 000000000000..d5d0d8bd0882 --- /dev/null +++ b/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch @@ -0,0 +1,11 @@ +diff -Naur keepassx-0.4.3/src/lib/random.cpp keepassx-0.4.3.new/src/lib/random.cpp +--- keepassx-0.4.3/src/lib/random.cpp 2009-06-28 16:22:31.000000000 +0200 ++++ keepassx-0.4.3.new/src/lib/random.cpp 2012-04-19 00:20:15.757415510 +0200 +@@ -19,6 +19,7 @@ + ***************************************************************************/ + + #include "random.h" ++#include <unistd.h> + + + #if defined(Q_WS_X11) || defined(Q_WS_MAC) 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); + |