Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (21d2f2e5e2b2afe697323ca7ad5d42e301b6b06e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (21d2f2e5e2b2afe697323ca7ad5d42e301b6b06e)
  • Date: Sun, 4 Nov 2007 12:14:28 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

crypto/qca-openssl/BUILD | 3 ++-
crypto/qca-openssl/DETAILS | 10 +++++-----
crypto/qca-openssl/HISTORY | 6 ++++++
crypto/qca-openssl/PRE_BUILD | 3 +++
crypto/qca-openssl/qca-ossl_fix.patch | 10 ++++++++++
5 files changed, 26 insertions(+), 6 deletions(-)

New commits:
commit 21d2f2e5e2b2afe697323ca7ad5d42e301b6b06e
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

qca-openssl: Updated to version 2.0.0-beta1. Added compilation
and build fix.

diff --git a/crypto/qca-openssl/BUILD b/crypto/qca-openssl/BUILD
index 52e037b..6472954 100755
--- a/crypto/qca-openssl/BUILD
+++ b/crypto/qca-openssl/BUILD
@@ -1,4 +1,5 @@
-sed -i -e "s:bin/qmake:bin/qt4/qmake:g" $SOURCE_DIRECTORY/configure &&
+QTDIR=/usr &&
+PATH=$QTDIR/bin/qt4:$PATH &&
./configure $OPTS &&
make_single &&
make &&
diff --git a/crypto/qca-openssl/DETAILS b/crypto/qca-openssl/DETAILS
index 69289ac..14dc1cf 100755
--- a/crypto/qca-openssl/DETAILS
+++ b/crypto/qca-openssl/DETAILS
@@ -1,9 +1,9 @@
SPELL=qca-openssl
- VERSION=0.1-20070508
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/beta5/$SOURCE
-
SOURCE_HASH=sha512:597c3de8c06b8dd93005fb80fb4a8fcece76761f19bf6b646372b8f68bbfd0f0fbf4efa2eb77da95a4c3739af9dd5ef3bda60f1a4baa488db1cd70b59638f9e8
+ VERSION=2.0.0-beta1
+ SOURCE=qca-ossl-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-ossl-$VERSION
+ SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/plugins/$SOURCE
+
SOURCE_HASH=sha512:9825358c547e53bb6b60e27e6b965777b6c68f5e8f17a2e2bb6960c647dd6c0c73572fa968c57915d6d30a7075c3dd09277880a9c1502c3b1319454301680194
LICENSE[0]=GPL
WEB_SITE=http://delta.affinix.com/qca
ENTERED=20050101
diff --git a/crypto/qca-openssl/HISTORY b/crypto/qca-openssl/HISTORY
index 40ae693..7096c7e 100644
--- a/crypto/qca-openssl/HISTORY
+++ b/crypto/qca-openssl/HISTORY
@@ -1,3 +1,9 @@
+2007-11-04 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.0.0-beta1.
+ * BUILD: Added code to detect qt4.
+ * PRE_BUILD: Added to apply patch.
+ * qca-ossl_fix.patch: Added to fix compilation problem.
+
2007-05-13 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 0.1-20070508

diff --git a/crypto/qca-openssl/PRE_BUILD b/crypto/qca-openssl/PRE_BUILD
new file mode 100755
index 0000000..3ef8b6b
--- /dev/null
+++ b/crypto/qca-openssl/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/qca-ossl_fix.patch
diff --git a/crypto/qca-openssl/qca-ossl_fix.patch
b/crypto/qca-openssl/qca-ossl_fix.patch
new file mode 100644
index 0000000..3e34431
--- /dev/null
+++ b/crypto/qca-openssl/qca-ossl_fix.patch
@@ -0,0 +1,10 @@
+--- qca-ossl.cpp.orig 2007-11-04 21:30:46.000000000 +0400
++++ qca-ossl.cpp 2007-11-04 21:31:04.000000000 +0400
+@@ -19,6 +19,7 @@
+ */
+
+ #include <QtCrypto>
++#include <qcaprovider.h>
+
+ #include <QDebug>
+ #include <QtCore/qplugin.h>



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (21d2f2e5e2b2afe697323ca7ad5d42e301b6b06e), George Sherwood, 11/04/2007

Archive powered by MHonArc 2.6.24.

Top of Page