qca-qt5: update to 2.1.3

common/shlibs

@@ -2086,7 +2086,7 @@ libsfml-graphics.so.2.4 SFML-2.4.1_1
 libclamav.so.7 clamav-0.98.6_1
 libclamunrar.so.7 clamav-0.98.6_1
 libclamunrar_iface.so.7 clamav-0.98.6_1
-libqca.so.2 qca-qt5-2.1.0_1
+libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1

srcpkgs/qca-qt5/patches/fix-qiodevice.patch

@@ -1,34 +0,0 @@
-Since Qt5-5.5.0 explicit include <QIODevice> is required
-if QIODevice is used in headers or source files. It seems
-it was included as a side-effect by other header files before.
-
---- src/qca_publickey.cpp	2014-11-06 09:15:45.000000000 +0100
-+++ src/qca_publickey.cpp	2015-07-07 09:26:59.819005743 +0200
-@@ -25,6 +25,7 @@
- 
- #include <QFile>
- #include <QTextStream>
-+#include <QIODevice>
- 
- namespace QCA {
- 
---- src/qca_keystore.cpp	2014-11-06 09:15:45.000000000 +0100
-+++ src/qca_keystore.cpp	2015-07-07 09:29:24.886016202 +0200
-@@ -27,6 +27,7 @@
- #include <QSet>
- #include <QMutex>
- #include <QWaitCondition>
-+#include <QIODevice>
- 
- #include <stdlib.h> // abort
- #include <stdio.h>  // fprintf
---- include/QtCrypto/qca_core.h	2014-11-06 09:15:45.000000000 +0100
-+++ include/QtCrypto/qca_core.h	2015-07-07 09:36:30.737046903 +0200
-@@ -38,6 +38,7 @@
- #include <QList>
- #include <QSharedData>
- #include <QSharedDataPointer>
-+#include <QIODevice>
- #include "qca_export.h"
- #include "qca_support.h"
- #include "qca_tools.h"

srcpkgs/qca-qt5/patches/libressl-2.3.patch

@@ -1 +0,0 @@
-../../qca/patches/libressl-2.3.patch

srcpkgs/qca-qt5/patches/libressl.patch

@@ -1,14 +0,0 @@
-# upstream
-# http://quickgit.kde.org/?p=qca.git&a=commit&h=593de6855a4f4dc26cface3e96de8889f90cb4bb
-
---- plugins/qca-ossl/qca-ossl.cpp	2015-01-24 00:38:42.000000000 +0100
-+++ plugins/qca-ossl/qca-ossl.cpp	2015-01-24 00:38:27.000000000 +0100
-@@ -5801,7 +5801,7 @@
- 	{
- 		SessionInfo sessInfo;
- 
--		sessInfo.isCompressed = (0 != ssl->session->compress_meth);
-+		sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(ssl->session));
- 
- 		if (ssl->version == TLS1_VERSION)
- 			sessInfo.version = TLS::TLS_v1;

srcpkgs/qca-qt5/patches/narrowing.patch

@@ -1,51 +0,0 @@
---- src/qca_textfilter.cpp	2014-11-06 09:15:45.000000000 +0100
-+++ src/qca_textfilter.cpp	2017-01-25 05:19:43.948129764 +0100
-@@ -289,29 +289,31 @@
- 
- static QByteArray b64decode(const QByteArray &s, bool *ok)
- {
--	// -1 specifies invalid
-+#define	_I '\xff'
-+	// _I specifies invalid
- 	// 64 specifies eof
- 	// everything else specifies data
- 
- 	static char tbl[] =
- 	{
--		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
--		52,53,54,55,56,57,58,59,60,61,-1,-1,-1,64,-1,-1,
--		-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,
--		15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,
--		-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
--		41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1,
--		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--		-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-+		_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,
-+		_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,
-+		_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,62,_I,_I,_I,63,
-+		52,53,54,55,56,57,58,59,60,61,_I,_I,_I,64,_I,_I,
-+		_I, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,
-+		15,16,17,18,19,20,21,22,23,24,25,_I,_I,_I,_I,_I,
-+		_I,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
-+		41,42,43,44,45,46,47,48,49,50,51,_I,_I,_I,_I,_I,
-+		_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,
-+		_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,
-+		_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,
-+		_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,
-+		_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,
-+		_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,
-+		_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,
-+		_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,
- 	};
-+#undef	_I
- 
- 	// return value
- 	QByteArray p;

srcpkgs/qca-qt5/template

@@ -1,52 +1,40 @@
-# Template file for 'qca'
+# Template file for 'qca-qt5'
 pkgname=qca-qt5
-version=2.1.0
+version=2.1.3
-revision=9
+revision=1
 wrksrc=${pkgname%-*}-${version}
 build_style=cmake
-configure_args="-DBUILD_TESTS=0 -DQC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt
+configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs"
- -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca/mkspecs -DWITH_ossl_PLUGIN=yes"
 hostmakedepends="pkg-config ca-certificates"
 makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
 depends="ca-certificates"
-short_desc="Qt Cryptographic Architecture"
+short_desc="Qt5 Cryptographic Architecture"
 maintainer="Duncaen <duncaen@voidlinux.eu>"
 license="LGPL-2.1"
-homepage="http://delta.affinix.com/qca/"
+homepage="https://userbase.kde.org/QCA"
-distfiles="http://delta.affinix.com/download/qca/2.0/${pkgname%-*}-${version}.tar.gz"
+distfiles="http://download.kde.org/stable/qca/${version}/src/qca-${version}.tar.xz"
-checksum=226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284
+checksum=003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353
-
-provides="qca-${version}_${revision}"
-replaces="qca>=0"
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
 fi
 
-pre_configure() {
-	sed -e "s;-D_BSD_SOURCE;-D_DEFAULT_SOURCE;" \
-		-i CMakeLists.txt
-}
-
 qca-qt5-ossl_package() {
 	depends="${sourcepkg}-${version}_${revision}"
 	short_desc+=" - QCA OSSL plugin"
-	provides="qca-ossl-${version}_${revision}"
-	replaces="qca-ossl>=0"
 	pkg_install() {
-		vmove usr/lib/qca/crypto/libqca-ossl.so
+		vmove usr/lib/qca-qt5/crypto/libqca-ossl.so
 	}
 }
 
 qca-qt5-devel_package() {
 	depends="qt5-devel ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"
-	provides="qca-devel-${version}_${revision}"
-	replaces="qca-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/cmake
-		vmove usr/share/qca/mkspecs
+		vmove usr/share/qca-qt5/mkspecs
+		vmove usr/lib/*.so
 	}
 }