diff --git a/app-crypt/qca/patches/qca-2.2.1.patchset b/app-crypt/qca/patches/qca-2.2.1.patchset deleted file mode 100644 index e71b61f34..000000000 --- a/app-crypt/qca/patches/qca-2.2.1.patchset +++ /dev/null @@ -1,87 +0,0 @@ -From 2b7dc2829d4e9fa181032bdc16ba38b2487c09d0 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Tue, 13 Oct 2015 12:07:31 +0300 -Subject: QCA2: fix compilation on Haiku/GCC4. - - -diff --git a/src/botantools/botan/ml_unix/mlock.cpp b/src/botantools/botan/ml_unix/mlock.cpp -index 109609c..c88b23b 100644 ---- a/src/botantools/botan/ml_unix/mlock.cpp -+++ b/src/botantools/botan/ml_unix/mlock.cpp -@@ -52,7 +52,9 @@ namespace Botan { - *************************************************/ - void lock_mem(void* ptr, u32bit bytes) - { -+ #ifndef __HAIKU__ - mlock(ptr, bytes); -+ #endif - } - - /************************************************* -@@ -60,7 +62,9 @@ void lock_mem(void* ptr, u32bit bytes) - *************************************************/ - void unlock_mem(void* ptr, u32bit bytes) - { -+ #ifndef __HAIKU__ - munlock(ptr, bytes); -+ #endif - } - - } -diff --git a/src/qca_tools.cpp b/src/qca_tools.cpp -index cef2b79..44357c0 100644 ---- a/src/qca_tools.cpp -+++ b/src/qca_tools.cpp -@@ -44,11 +44,13 @@ static bool can_lock() - #endif - - MLOCK_TYPE d = MLOCK_TYPE_CAST malloc(256); -+ #ifndef __HAIKU__ - if(mlock(d, 256) == 0) - { - munlock(d, 256); - ok = true; - } -+ #endif - free(d); - return ok; - #else -diff --git a/src/support/console.cpp b/src/support/console.cpp -index ee94998..f352dda 100644 ---- a/src/support/console.cpp -+++ b/src/support/console.cpp -@@ -30,7 +30,7 @@ - #ifdef Q_OS_WIN - # include - #else --# ifdef Q_OS_ANDROID -+# if defined(Q_OS_ANDROID) || defined(Q_OS_HAIKU) - # include - # else - # include --- -2.42.1 - - -From aa4efeb86d5dc71e69a9d609c4274933929c7a8b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= -Date: Sat, 6 Jan 2024 14:50:37 +0100 -Subject: add missing #include for shared_ptr - - -diff --git a/src/qca_default.cpp b/src/qca_default.cpp -index 0499bbc..d63977f 100644 ---- a/src/qca_default.cpp -+++ b/src/qca_default.cpp -@@ -30,6 +30,8 @@ - # include "qca_systemstore.h" - #endif - -+#include -+ - #define FRIENDLY_NAMES - - namespace QCA { --- -2.42.1 - diff --git a/app-crypt/qca/qca-2.2.1.recipe b/app-crypt/qca/qca-2.2.1.recipe deleted file mode 100644 index 088f5828e..000000000 --- a/app-crypt/qca/qca-2.2.1.recipe +++ /dev/null @@ -1,106 +0,0 @@ -SUMMARY="Qt Cryptographic Architecture" -DESCRIPTION="QCA aims to provide a straightforward and cross-platform \ -crypto API, using Qt datatypes and conventions. QCA separates the API from \ -the implementation, using plugins known as Providers. The advantage of this \ -model is to allow applications to avoid linking to or explicitly depending \ -on any particular cryptographic library. This allows one to easily change or \ -upgrade crypto implementations without even needing to recompile the \ -application!" -HOMEPAGE="http://delta.affinix.com/qca/" -COPYRIGHT="2003-2015 Justin Karneges" -LICENSE="GNU LGPL v2.1" -REVISION="4" -SOURCE_URI="http://download.kde.org/stable/qca/$portVersion/qca-$portVersion.tar.xz" -CHECKSUM_SHA256="d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02" -SOURCE_DIR="qca-$portVersion" -PATCHES="qca-$portVersion.patchset" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - qca$secondaryArchSuffix = $portVersion - cmd:mozcerts_qt5$secondaryArchSuffix = $portVersion - cmd:qcatool2$secondaryArchSuffix = $portVersion - cmd:qcatool_qt5$secondaryArchSuffix = $portVersion - lib:libqca$secondaryArchSuffix = $portVersion - lib:libqca_qt5$secondaryArchSuffix = $portVersion compat >= 2 - " -REQUIRES=" - haiku$secondaryArchSuffix - ca_root_certificates - lib:libcrypto$secondaryArchSuffix - lib:libnspr4$secondaryArchSuffix - lib:libnss3$secondaryArchSuffix - lib:libnssutil3$secondaryArchSuffix - lib:libplc4$secondaryArchSuffix - lib:libplds4$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libsmime3$secondaryArchSuffix - lib:libssl$secondaryArchSuffix - lib:libssl3$secondaryArchSuffix - " - -PROVIDES_devel=" - qca${secondaryArchSuffix}_devel = $portVersion - devel:libqca$secondaryArchSuffix = $portVersion compat >= 2 - " -REQUIRES_devel=" - haiku${secondaryArchSuffix}_devel - qca$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libcrypto$secondaryArchSuffix - devel:libgsasl$secondaryArchSuffix - devel:libnss3$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix - devel:libssl$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:g++$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:which - " - -BUILD() -{ - export QC_CERTSTORE_PATH=/system/data/ssl/CARootCertificates.pem - - cmake . -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$prefix \ - -DQCA_PLUGINS_INSTALL_DIR=$libDir \ - -DQCA_BINARY_INSTALL_DIR=$binDir \ - -DQCA_LIBRARY_INSTALL_DIR=$libDir \ - -DQCA_FEATURE_INSTALL_DIR=$dataDir/Qt5/mkspecs/features \ - -DQCA_INCLUDE_INSTALL_DIR=$includeDir \ - -DQCA_PRIVATE_INCLUDE_INSTALL_DIR=$includeDir \ - -DQCA_DOC_INSTALL_DIR=$docDir \ - -DQCA_MAN_INSTALL_DIR=$manDir \ - -DBUILD_TESTS=1 \ - -DPKGCONFIG_INSTALL_PREFIX=$developLibDir/pkgconfig - - make $jobArgs -} - -INSTALL() -{ - rm -f bin/qcatool2.debug - rm -f lib/libqca.so.2.0.3.debug - - make install - fixPkgconfig - - packageEntries devel \ - $developDir \ - $dataDir/Qt5/mkspecs \ - $libDir/cmake -} - -TEST() -{ - QCA_PLUGIN_PATH="$sourceDir/lib/qca" make test -}