[qca] Update to 2.3.10 (#52994)

ports/qca/0004-fix-cmake4.patch

@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a1680f..9a70ccd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,10 +15,6 @@ set(QCA_LIB_MAJOR_VERSION "2")
- set(QCA_LIB_MINOR_VERSION "3")
- set(QCA_LIB_PATCH_VERSION "7")
- 
--if(POLICY CMP0042)
--  cmake_policy(SET CMP0042 OLD)
--endif()
--
- option(BUILD_WITH_QT6 "Build with Qt 6" OFF)
- option(BUILD_TESTS "Create test" ON)
- option(BUILD_TOOLS "Compile mozcerts and qcatool" ON)

ports/qca/portfile.cmake

@@ -12,12 +12,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/qca
     REF "v${VERSION}"
-    SHA512 de06173aaea32aac19a24510b5dbb4bb79681217eb1e4256de36db9f7158ad485fa450ffba5e13c12a0425866923b54f9b4d6164d0eaf659fdf40e458f5ee017
+    SHA512 21bbc483f78d8c6b99bf2a4375db6a1bcc8a1a16df01e2295dc6a5b43fa27ccbef39114ee33d456071f712a00aca0ab3bc1bf767df82333c2f98ea35f7d35b45
     PATCHES
         0001-fix-path-for-vcpkg.patch
         0002-fix-build-error.patch
         0003-Define-NOMINMAX-for-botan-plugin-with-MSVC.patch
-        0004-fix-cmake4.patch
 )
 
 vcpkg_find_acquire_program(PKGCONFIG)
@@ -36,11 +35,16 @@ endif()
 # So we do it here:
 message(STATUS "Importing certstore")
 file(REMOVE "${SOURCE_PATH}/certs/rootcerts.pem")
-# Using file(DOWNLOAD) to use https
-file(DOWNLOAD https://raw.githubusercontent.com/mozilla/gecko-dev/master/security/nss/lib/ckfw/builtins/certdata.txt
-    "${CURRENT_BUILDTREES_DIR}/cert/certdata.txt"
-    TLS_VERIFY ON
+
+set(CERTDATA_COMMIT_HASH bc977a80f4fcf465681209d431c9dfe549f224cf)
+vcpkg_download_distfile(CERTDATA_TXT
+    URLS     "https://raw.githubusercontent.com/mozilla/gecko-dev/${CERTDATA_COMMIT_HASH}/security/nss/lib/ckfw/builtins/certdata.txt"
+    SHA512   a43dd8fa252afc5478c0a9297899eded17a18c21f359954d81bccad8b8f5a50d4f8aedfc1b9a43f2ce01a7f5352788b864045ed006fae65ccd21ce75430bc55d
+    FILENAME "qca-certdata-${CERTDATA_COMMIT_HASH}.txt"
 )
+file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/cert")
+file(COPY_FILE "${CERTDATA_TXT}" "${CURRENT_BUILDTREES_DIR}/cert/certdata.txt")
+
 vcpkg_execute_required_process(
     COMMAND "${PERL}" "${CMAKE_CURRENT_LIST_DIR}/mk-ca-bundle.pl" -n "${SOURCE_PATH}/certs/rootcerts.pem"
     WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/cert"
@@ -100,5 +104,13 @@ file(REMOVE_RECURSE
 
 vcpkg_fixup_pkgconfig()
 
-# Handle copyright
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+vcpkg_install_copyright(
+    COMMENT [[
+The generated CA certificate bundle is derived from Mozilla's certdata.txt,
+which is licensed under MPL-2.0:
+https://raw.githubusercontent.com/mozilla/gecko-dev/bc977a80f4fcf465681209d431c9dfe549f224cf/security/nss/lib/ckfw/builtins/certdata.txt
+]]
+    FILE_LIST
+        "${SOURCE_PATH}/COPYING"
+        "${SOURCE_PATH}/src/botantools/botan/license.txt"
+)

ports/qca/vcpkg.json

@@ -1,9 +1,9 @@
 {
   "name": "qca",
-  "version": "2.3.7",
-  "port-version": 4,
+  "version": "2.3.10",
   "description": "Qt Cryptographic Architecture (QCA).",
   "homepage": "https://userbase.kde.org/QCA",
+  "license": "LGPL-2.1-or-later AND BSD-2-Clause AND MPL-2.0",
   "dependencies": [
     {
       "name": "qt5compat",

versions/baseline.json

@@ -8157,8 +8157,8 @@
       "port-version": 1
     },
     "qca": {
-      "baseline": "2.3.7",
-      "port-version": 4
+      "baseline": "2.3.10",
+      "port-version": 0
     },
     "qcbor": {
       "baseline": "1.6.1",

versions/q-/qca.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d93407eefa1f741a32b422a660478b00bff93ea2",
+      "version": "2.3.10",
+      "port-version": 0
+    },
     {
       "git-tree": "4f9895a4c55a72d609dec360bb2e989dbfe4b613",
       "version": "2.3.7",