mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 15:09:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[qca] Bump version to 2.3.4 (#21839)

Browse Source
This commit is contained in:
Matthias Kuhn 2021-12-07 05:51:41 +01:00 committed by GitHub
parent 4010c730d4
commit 1fc9f75814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 59 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
ports/qca/0002-fix-build-error.patch
View File

@ -1,8 +1,18 @@
diff --git "a/cmake/modules/QcaMacro.cmake" "b/cmake/modules/QcaMacro.cmake"
index 5d86e4725..62568626b 100644
--- "a/cmake/modules/QcaMacro.cmake"
+++ "b/cmake/modules/QcaMacro.cmake"
@@ -61,15 +61,6 @@ macro(add_qca_test TARGET DESCRIPTION)
From 8d67288a3dde7e535ff747715f96f98282a3bf67 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Fri, 3 Dec 2021 15:17:25 +0100
Subject: [PATCH] Ifdef codecs
---
cmake/modules/QcaMacro.cmake | 9 ---------
plugins/qca-ossl/qca-ossl.cpp | 6 ++++++
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/cmake/modules/QcaMacro.cmake b/cmake/modules/QcaMacro.cmake
index 80af6e84..ba86310d 100644
--- a/cmake/modules/QcaMacro.cmake
+++ b/cmake/modules/QcaMacro.cmake
@@ -69,15 +69,6 @@ macro(add_qca_test TARGET DESCRIPTION)
endmacro(add_qca_test)
macro(install_pdb TARGET INSTALL_PATH)
@ -18,41 +28,44 @@ index 5d86e4725..62568626b 100644
endmacro(install_pdb)
macro(normalize_path PATH)
diff --git "a/plugins/qca-ossl/qca-ossl.cpp" "b/plugins/qca-ossl/qca-ossl.cpp"
index ee872d721..fa3e2c414 100644
--- "a/plugins/qca-ossl/qca-ossl.cpp"
+++ "b/plugins/qca-ossl/qca-ossl.cpp"
@@ -6910,6 +6910,7 @@ public:
else if ( type == QLatin1String("aes256-ccm") )
return new opensslCipherContext( EVP_aes_256_ccm(), 0, this, type);
diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
index b2c5d3d3..4250ec26 100644
--- a/plugins/qca-ossl/qca-ossl.cpp
+++ b/plugins/qca-ossl/qca-ossl.cpp
@@ -6846,6 +6846,7 @@ public:
else if (type == QLatin1String("aes256-ccm"))
return new opensslCipherContext(EVP_aes_256_ccm(), 0, this, type);
#endif
+#ifndef OPENSSL_NO_BF
else if ( type == QLatin1String("blowfish-ecb") )
return new opensslCipherContext( EVP_bf_ecb(), 0, this, type);
else if ( type == QLatin1String("blowfish-cfb") )
@@ -6920,6 +6921,8 @@ public:
return new opensslCipherContext( EVP_bf_cbc(), 0, this, type);
else if ( type == QLatin1String("blowfish-cbc-pkcs7") )
return new opensslCipherContext( EVP_bf_cbc(), 1, this, type);
else if (type == QLatin1String("blowfish-ecb"))
return new opensslCipherContext(EVP_bf_ecb(), 0, this, type);
else if (type == QLatin1String("blowfish-cfb"))
@@ -6856,6 +6857,8 @@ public:
return new opensslCipherContext(EVP_bf_cbc(), 0, this, type);
else if (type == QLatin1String("blowfish-cbc-pkcs7"))
return new opensslCipherContext(EVP_bf_cbc(), 1, this, type);
+#endif
+#ifndef OPENSSL_NO_DES
else if ( type == QLatin1String("tripledes-ecb") )
return new opensslCipherContext( EVP_des_ede3(), 0, this, type);
else if ( type == QLatin1String("tripledes-cbc") )
@@ -6936,6 +6939,8 @@ public:
return new opensslCipherContext( EVP_des_cfb(), 0, this, type);
else if ( type == QLatin1String("des-ofb") )
return new opensslCipherContext( EVP_des_ofb(), 0, this, type);
else if (type == QLatin1String("tripledes-ecb"))
return new opensslCipherContext(EVP_des_ede3(), 0, this, type);
else if (type == QLatin1String("tripledes-cbc"))
@@ -6872,6 +6875,8 @@ public:
return new opensslCipherContext(EVP_des_cfb(), 0, this, type);
else if (type == QLatin1String("des-ofb"))
return new opensslCipherContext(EVP_des_ofb(), 0, this, type);
+#endif
+#ifndef OPENSSL_NO_CAST
else if ( type == QLatin1String("cast5-ecb") )
return new opensslCipherContext( EVP_cast5_ecb(), 0, this, type);
else if ( type == QLatin1String("cast5-cbc") )
@@ -6946,6 +6951,7 @@ public:
return new opensslCipherContext( EVP_cast5_cfb(), 0, this, type);
else if ( type == QLatin1String("cast5-ofb") )
return new opensslCipherContext( EVP_cast5_ofb(), 0, this, type);
else if (type == QLatin1String("cast5-ecb"))
return new opensslCipherContext(EVP_cast5_ecb(), 0, this, type);
else if (type == QLatin1String("cast5-cbc"))
@@ -6882,6 +6887,7 @@ public:
return new opensslCipherContext(EVP_cast5_cfb(), 0, this, type);
else if (type == QLatin1String("cast5-ofb"))
return new opensslCipherContext(EVP_cast5_ofb(), 0, this, type);
+#endif
else if ( type == QLatin1String("pkey") )
return new MyPKeyContext( this );
else if ( type == QLatin1String("dlgroup") )
else if (type == QLatin1String("pkey"))
return new MyPKeyContext(this);
else if (type == QLatin1String("dlgroup"))
--
2.31.1

4
ports/qca/portfile.cmake
View File

@ -11,8 +11,8 @@ vcpkg_add_to_path("${PERL_EXE_PATH}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/qca
REF v2.3.1
SHA512 e04a44fb395e24fd009bb6b005282880bef84ca492b5e15903f9ce3e5e3f93beae3a386a1a381507ed5b0c6550e64c6bf434328f9d965fa7f7d638c3e5d5948b
REF v2.3.4
SHA512 04583da17531538fc2a7ae18a1a4f89f1e8d303e2bb390520a8f55a20bab17f8407ab07aefef2a75587e2a0521f41b37a9fdd8430ec483daf5d02c05556b8ddb
PATCHES
0001-fix-path-for-vcpkg.patch
0002-fix-build-error.patch

3
ports/qca/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "qca",
"version": "2.3.1",
"port-version": 5,
"version": "2.3.4",
"description": "Qt Cryptographic Architecture (QCA).",
"homepage": "https://cgit.kde.org/qca.git/",
"dependencies": [

4
versions/baseline.json
View File

@ -5477,8 +5477,8 @@
"port-version": 4
},
"qca": {
"baseline": "2.3.1",
"port-version": 5
"baseline": "2.3.4",
"port-version": 0
},
"qcustomplot": {
"baseline": "2.0.1",

5
versions/q-/qca.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8fd8829b933de5ae6fffecd509403987ca084634",
"version": "2.3.4",
"port-version": 0
},
{
"git-tree": "842dcdd87f56ec4318a5049e95b1eb9807dd2193",
"version": "2.3.1",