early-access version 2853

externals/vcpkg/ports/qca/0002-fix-build-error.patch

@@ -0,0 +1,71 @@
+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)
+-  if(MSVC)
+-    get_target_property(LOCATION ${TARGET} LOCATION_DEBUG)
+-    string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}")
+-    install(FILES ${LOCATION} DESTINATION ${INSTALL_PATH} CONFIGURATIONS Debug)
+-
+-    get_target_property(LOCATION ${TARGET} LOCATION_RELWITHDEBINFO)
+-    string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}")
+-    install(FILES ${LOCATION} DESTINATION ${INSTALL_PATH} CONFIGURATIONS RelWithDebInfo)
+-  endif()
+ endmacro(install_pdb)
+ 
+ macro(normalize_path PATH)
+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"))
+@@ -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"))
+@@ -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"))
+@@ -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"))
+-- 
+2.31.1
+