From 629e14ad48b82720594327ad30455990b1f361cc Mon Sep 17 00:00:00 2001 From: John Date: Tue, 19 Nov 2019 04:43:28 +0100 Subject: [PATCH] qca-qt5: update to 2.2.1. --- srcpkgs/qca-qt5/patches/ansi.patch | 15 ------------ srcpkgs/qca-qt5/patches/cmake.patch | 12 ++++++++++ srcpkgs/qca-qt5/patches/libressl.patch | 33 ++++++++++++++++++++++++++ srcpkgs/qca-qt5/template | 11 ++++----- 4 files changed, 49 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/qca-qt5/patches/ansi.patch create mode 100644 srcpkgs/qca-qt5/patches/cmake.patch create mode 100644 srcpkgs/qca-qt5/patches/libressl.patch diff --git a/srcpkgs/qca-qt5/patches/ansi.patch b/srcpkgs/qca-qt5/patches/ansi.patch deleted file mode 100644 index 7cf346d57e0..00000000000 --- a/srcpkgs/qca-qt5/patches/ansi.patch +++ /dev/null @@ -1,15 +0,0 @@ -Not quite sure what the purpose of -ansi for C++ was meant to be, but it -breaks build because it will make the compiler deactivate C++11 features -that Qt relies on. - ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -127,7 +127,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) - endif() - - set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") -- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common") -+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common") - endif (CMAKE_SYSTEM_NAME MATCHES Linux) - endif (CMAKE_COMPILER_IS_GNUCXX) - diff --git a/srcpkgs/qca-qt5/patches/cmake.patch b/srcpkgs/qca-qt5/patches/cmake.patch new file mode 100644 index 00000000000..6e9e5c9c5e5 --- /dev/null +++ b/srcpkgs/qca-qt5/patches/cmake.patch @@ -0,0 +1,12 @@ +--- CMakeLists.txt 2019-04-24 14:58:14.000000000 +0200 ++++ - 2019-12-12 23:58:20.783902817 +0100 +@@ -264,7 +264,8 @@ + QCA_LIBRARY_INSTALL_DIR + QCA_FEATURE_INSTALL_DIR + QCA_INCLUDE_INSTALL_DIR +- QCA_PRIVATE_INCLUDE_INSTALL_DIR ++ QCA_FULL_INCLUDE_INSTALL_DIR ++ QCA_PRIVATE_INCLUDE_INSTALL_DIR + QCA_DOC_INSTALL_DIR + QCA_MAN_INSTALL_DIR + PKGCONFIG_INSTALL_PREFIX) diff --git a/srcpkgs/qca-qt5/patches/libressl.patch b/srcpkgs/qca-qt5/patches/libressl.patch new file mode 100644 index 00000000000..557c99950aa --- /dev/null +++ b/srcpkgs/qca-qt5/patches/libressl.patch @@ -0,0 +1,33 @@ +--- plugins/qca-ossl/ossl110-compat.h 2019-04-24 14:58:14.000000000 +0200 ++++ - 2019-11-19 04:28:55.887108555 +0100 +@@ -25,7 +25,7 @@ + #include + #include + +-#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) +--- plugins/qca-ossl/qca-ossl.cpp 2019-04-24 14:58:14.000000000 +0200 ++++ - 2019-11-19 04:29:29.745309997 +0100 +@@ -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 + +--- plugins/qca-ossl/qca-ossl.cpp 2019-11-19 04:29:30.804925040 +0100 ++++ - 2019-11-19 04:30:35.947007237 +0100 +@@ -3826,7 +3826,7 @@ + p.policies = get_cert_policies(ex); + } + +-#ifdef OSSL_110 ++#if defined(OSSL_110) || defined(LIBRESSL_VERSION_NUMBER) + const + #endif + ASN1_BIT_STRING *signature; diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template index c8dc4f633eb..21ff730e44d 100644 --- a/srcpkgs/qca-qt5/template +++ b/srcpkgs/qca-qt5/template @@ -1,7 +1,7 @@ # Template file for 'qca-qt5' pkgname=qca-qt5 -version=2.1.3 -revision=8 +version=2.2.1 +revision=1 wrksrc="${pkgname%-*}-${version}" build_style=cmake configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs @@ -13,8 +13,8 @@ short_desc="Qt5 Cryptographic Architecture" maintainer="Duncaen " license="LGPL-2.1-or-later" homepage="https://userbase.kde.org/QCA" -distfiles="${KDE_SITE}/qca/${version}/src/qca-${version}.tar.xz" -checksum=003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353 +distfiles="${KDE_SITE}/qca/${version}/qca-${version}.tar.xz" +checksum=d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" @@ -37,8 +37,5 @@ qca-qt5-devel_package() { vmove usr/lib/cmake vmove usr/share/qca-qt5/mkspecs vmove usr/lib/*.so - - sed -i -e 's|usr\/include\/|\$\{_IMPORT_PREFIX}\/include\/|g' \ - ${PKGDESTDIR}/usr/lib/cmake/Qca-qt5/Qca-qt5Targets.cmake } }