Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ca80742f7aee65db99694497f696010b5bb5f070)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ca80742f7aee65db99694497f696010b5bb5f070)
  • Date: Sat, 12 Dec 2015 14:16:17 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

crypto/keepassx/0001-add-missing-includes.patch | 26
------------------------
crypto/keepassx/DEPENDS | 9 +++++++-
crypto/keepassx/DETAILS | 6 ++---
crypto/keepassx/HISTORY | 4 +++
crypto/keepassx/PRE_BUILD | 3 --
dev/null |binary
6 files changed, 15 insertions(+), 33 deletions(-)

New commits:
commit ca80742f7aee65db99694497f696010b5bb5f070
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/keepassx: version 2.0

diff --git a/crypto/keepassx/0001-add-missing-includes.patch
b/crypto/keepassx/0001-add-missing-includes.patch
deleted file mode 100644
index 53e7ce0..0000000
--- a/crypto/keepassx/0001-add-missing-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d811f2e3d119c0b9cde3aff6604097b968969a41 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Sun, 2 Jun 2013 13:40:58 +0200
-Subject: [PATCH] add missing includes
-
----
- src/lib/random.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/lib/random.cpp b/src/lib/random.cpp
-index 1007172..5b06658 100644
---- a/src/lib/random.cpp
-+++ b/src/lib/random.cpp
-@@ -34,6 +34,9 @@
- #include <QDataStream>
- #include <QTime>
-
-+#include <sys/types.h>
-+#include <unistd.h>
-+
- void initStdRand();
- bool getNativeEntropy(quint8* buffer, int length);
-
---
-1.8.3
-
diff --git a/crypto/keepassx/DEPENDS b/crypto/keepassx/DEPENDS
index 38c7f5a..e8b58ec 100755
--- a/crypto/keepassx/DEPENDS
+++ b/crypto/keepassx/DEPENDS
@@ -1,4 +1,11 @@
depends -sub CXX gcc &&
depends qt4 &&
depends cmake &&
-depends patchelf
+depends libgcrypt &&
+depends zlib &&
+depends patchelf &&
+
+optional_depends libxtst '' '' 'for auto-type support' &&
+if is_depends_enabled $SPELL libxtst; then
+ depends libxi
+fi
diff --git a/crypto/keepassx/DETAILS b/crypto/keepassx/DETAILS
index cc5e9e0..53a3295 100755
--- a/crypto/keepassx/DETAILS
+++ b/crypto/keepassx/DETAILS
@@ -1,9 +1,9 @@
SPELL=keepassx
- VERSION=0.4.3
+ VERSION=2.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
- SOURCE_GPG=gurus.gpg:$SOURCE.sig
+ SOURCE_URL[0]=https://www.keepassx.org/releases/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:6c8b8ee6a22cab5da5f262b281ed914e9cce99607312124b068a3386d9da560a3584acea4ce1be6700e40087febcc269273ab67ea472b99e6d3f75048d164788
LICENSE[0]=GPL
WEB_SITE=http://www.keepassx.org/
ENTERED=20100706
diff --git a/crypto/keepassx/HISTORY b/crypto/keepassx/HISTORY
index 85ebff9..22fb312 100644
--- a/crypto/keepassx/HISTORY
+++ b/crypto/keepassx/HISTORY
@@ -1,3 +1,7 @@
+2015-12-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: version 2.0
+ * 0001-add-missing-includes.patch, PRE_BUILD: removed
+
2015-07-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* INSTALL, DEPENDS: fix rpath of executable so all libraries are found

diff --git a/crypto/keepassx/PRE_BUILD b/crypto/keepassx/PRE_BUILD
deleted file mode 100755
index 9a5b1f4..0000000
--- a/crypto/keepassx/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/0001-add-missing-includes.patch
diff --git a/crypto/keepassx/keepassx-0.4.3.tar.gz.sig
b/crypto/keepassx/keepassx-0.4.3.tar.gz.sig
deleted file mode 100644
index 20be615..0000000
Binary files a/crypto/keepassx/keepassx-0.4.3.tar.gz.sig and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ca80742f7aee65db99694497f696010b5bb5f070), Florian Franzmann, 12/12/2015

Archive powered by MHonArc 2.6.24.

Top of Page