diff --git a/app-crypt/qca/patches/qca-2.1.3.patchset b/app-crypt/qca/patches/qca-2.2.1.patchset similarity index 73% rename from app-crypt/qca/patches/qca-2.1.3.patchset rename to app-crypt/qca/patches/qca-2.2.1.patchset index 6e99800e1..832c7185f 100644 --- a/app-crypt/qca/patches/qca-2.1.3.patchset +++ b/app-crypt/qca/patches/qca-2.2.1.patchset @@ -1,22 +1,9 @@ -From fc1d9a0c193fbe837e386e4d3b0dd3db296f354b Mon Sep 17 00:00:00 2001 +From 3f8cc3ecc938ebdeea8eee181864db930fd0cf9e 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/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp -index cfb1e9f..95b2bc4 100644 ---- a/plugins/qca-ossl/qca-ossl.cpp -+++ b/plugins/qca-ossl/qca-ossl.cpp -@@ -5805,7 +5805,7 @@ public: - { - SessionInfo sessInfo; - -- sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(ssl->session)); -+ sessInfo.isCompressed = (0 != ssl->session->compress_meth); - - if (ssl->version == TLS1_VERSION) - sessInfo.version = TLS::TLS_v1; 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 @@ -60,7 +47,7 @@ index cef2b79..44357c0 100644 return ok; #else diff --git a/src/support/console.cpp b/src/support/console.cpp -index c3c5570..0d5c5d2 100644 +index ee94998..f352dda 100644 --- a/src/support/console.cpp +++ b/src/support/console.cpp @@ -30,7 +30,7 @@ @@ -73,5 +60,5 @@ index c3c5570..0d5c5d2 100644 # else # include -- -2.2.2 +2.21.0 diff --git a/app-crypt/qca/qca-2.1.3.recipe b/app-crypt/qca/qca-2.2.1.recipe similarity index 93% rename from app-crypt/qca/qca-2.1.3.recipe rename to app-crypt/qca/qca-2.2.1.recipe index 1ab95397f..05b23c2d7 100644 --- a/app-crypt/qca/qca-2.1.3.recipe +++ b/app-crypt/qca/qca-2.2.1.recipe @@ -9,9 +9,9 @@ application!" HOMEPAGE="http://delta.affinix.com/qca/" COPYRIGHT="2003-2015 Justin Karneges" LICENSE="GNU LGPL v2.1" -REVISION="2" -SOURCE_URI="http://download.kde.org/stable/qca/$portVersion/src/qca-$portVersion.tar.xz" -CHECKSUM_SHA256="003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353" +REVISION="1" +SOURCE_URI="http://download.kde.org/stable/qca/$portVersion/qca-$portVersion.tar.xz" +CHECKSUM_SHA256="d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02" SOURCE_DIR="qca-$portVersion" PATCHES="qca-$portVersion.patchset"