diff options
| author | Treeve Jelbert | 2019-04-26 18:03:23 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2019-04-27 10:20:17 +0200 |
| commit | 7262a65c5cf724ca978dc4dd6a864f2373a78f61 (patch) | |
| tree | 437d35d9806413419a0c3323592be4df6d0faf42 /qt5-cmake | |
| parent | 53841617fddda32d3f73a1ac4d4998577207975b (diff) | |
qca-qt5: => 2.2.1
Diffstat (limited to 'qt5-cmake')
| -rwxr-xr-x | qt5-cmake/qca-qt5/BUILD | 2 | ||||
| -rwxr-xr-x | qt5-cmake/qca-qt5/DETAILS | 8 | ||||
| -rw-r--r-- | qt5-cmake/qca-qt5/HISTORY | 5 | ||||
| -rwxr-xr-x | qt5-cmake/qca-qt5/PRE_BUILD | 3 | ||||
| -rw-r--r-- | qt5-cmake/qca-qt5/patches/libressl.patch | 24 |
5 files changed, 37 insertions, 5 deletions
diff --git a/qt5-cmake/qca-qt5/BUILD b/qt5-cmake/qca-qt5/BUILD index 00cebf7d4d..458d10b84f 100755 --- a/qt5-cmake/qca-qt5/BUILD +++ b/qt5-cmake/qca-qt5/BUILD @@ -1,3 +1,3 @@ -CXXFLAGS+=" -Wno-cpp" +CXXFLAGS+=" -Wno-cpp -fpermissive" OPTS+=' -DBUILD_TESTS=0' default_build diff --git a/qt5-cmake/qca-qt5/DETAILS b/qt5-cmake/qca-qt5/DETAILS index 01a51e84ea..68464de444 100755 --- a/qt5-cmake/qca-qt5/DETAILS +++ b/qt5-cmake/qca-qt5/DETAILS @@ -1,12 +1,12 @@ SPELL=qca-qt5 SPELLX=qca - VERSION=2.1.3 - SOURCE_HASH=sha512:0aec277e0695da2e45298f0a9006213829fe4c449a79969e472947db54f45000ba6e22361b782465bdc03f269b7301d318c843f5a83db459a118e58a03f3116a + VERSION=2.2.1 + SOURCE_HASH=sha512:3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c SOURCE=$SPELLX-$VERSION.tar.xz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION - SOURCE_URL[0]=http://download.kde.org/stable/$SPELLX/$VERSION/src/$SOURCE + SOURCE_URL[0]=https://download.kde.org/stable/$SPELLX/$VERSION/$SOURCE LICENSE[0]=GPL - WEB_SITE=http://delta.affinix.com/qca + WEB_SITE=https://delta.affinix.com/qca ENTERED=20141229 KEYWORDS="qt crypto" SHORT="Qt Cryptographic Architecture" diff --git a/qt5-cmake/qca-qt5/HISTORY b/qt5-cmake/qca-qt5/HISTORY index 9b52a8a543..2bb750cf83 100644 --- a/qt5-cmake/qca-qt5/HISTORY +++ b/qt5-cmake/qca-qt5/HISTORY @@ -1,3 +1,8 @@ +2019-04-26 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2.2.1 + * PRE_BUILD libressl.fix: added + * BUILD: suppress -fpermissive errors + 2017-02-17 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.1.3 * PRE_BUILD ssl.diff: deleted diff --git a/qt5-cmake/qca-qt5/PRE_BUILD b/qt5-cmake/qca-qt5/PRE_BUILD new file mode 100755 index 0000000000..922c0ab256 --- /dev/null +++ b/qt5-cmake/qca-qt5/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +apply_patch_dir patches diff --git a/qt5-cmake/qca-qt5/patches/libressl.patch b/qt5-cmake/qca-qt5/patches/libressl.patch new file mode 100644 index 0000000000..baa09c431f --- /dev/null +++ b/qt5-cmake/qca-qt5/patches/libressl.patch @@ -0,0 +1,24 @@ +diff -uNr qca-2.2.1/plugins/qca-ossl/ossl110-compat.h qca-2.2.1.fix/plugins/qca-ossl/ossl110-compat.h +--- qca-2.2.1/plugins/qca-ossl/ossl110-compat.h 2019-04-24 14:58:14.000000000 +0200 ++++ qca-2.2.1.fix/plugins/qca-ossl/ossl110-compat.h 2019-04-26 18:43:23.371501310 +0200 +@@ -25,7 +25,7 @@ + #include <openssl/rsa.h> + #include <openssl/dsa.h> + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define RSA_F_RSA_METH_DUP 161 + + static void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) +diff -uNr qca-2.2.1/plugins/qca-ossl/qca-ossl.cpp qca-2.2.1.fix/plugins/qca-ossl/qca-ossl.cpp +--- qca-2.2.1/plugins/qca-ossl/qca-ossl.cpp 2019-04-24 14:58:14.000000000 +0200 ++++ qca-2.2.1.fix/plugins/qca-ossl/qca-ossl.cpp 2019-04-26 18:42:11.179426042 +0200 +@@ -57,7 +57,7 @@ + ((_STACK*) (1 ? p : (type*)0)) + #endif + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && ! defined(LIBRESSL_VERSION_NUMBER) + #define OSSL_110 + #endif + |