From 7a6ba84f88b9fea6607570067bbe320ae02f1523 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Thu, 6 Apr 2023 22:04:54 +0200
Subject: [PATCH 1/2] [qca] Fix pkgconfig dependency properly

---
 ports/qca/portfile.cmake | 3 +++
 ports/qca/vcpkg.json     | 8 ++------
 versions/baseline.json   | 2 +-
 versions/q-/qca.json     | 5 +++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake
index 9d8a91c269d261..599801eaeaeed7 100644
--- a/ports/qca/portfile.cmake
+++ b/ports/qca/portfile.cmake
@@ -19,6 +19,8 @@ vcpkg_from_github(
         0003-Define-NOMINMAX-for-botan-plugin-with-MSVC.patch
 )
 
+vcpkg_find_acquire_program(PKGCONFIG)
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
   set(QCA_FEATURE_INSTALL_DIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/Qca)
   set(QCA_FEATURE_INSTALL_DIR_RELEASE ${CURRENT_PACKAGES_DIR}/bin/Qca)
@@ -62,6 +64,7 @@ vcpkg_cmake_configure(
         -DQCA_SUFFIX=OFF
         -DQCA_FEATURE_INSTALL_DIR=share/qca/mkspecs/features
         -DOSX_FRAMEWORK=OFF
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
     OPTIONS_DEBUG
         -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_DEBUG}
     OPTIONS_RELEASE
diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json
index ed3534d2e51cb3..dde4c6dcd4a54d 100644
--- a/ports/qca/vcpkg.json
+++ b/ports/qca/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qca",
   "version": "2.3.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Qt Cryptographic Architecture (QCA).",
   "homepage": "https://userbase.kde.org/QCA",
   "dependencies": [
@@ -29,11 +29,7 @@
     "botan": {
       "description": "Build with botan",
       "dependencies": [
-        "botan",
-        {
-          "name": "pkgconf",
-          "host": true
-        }
+        "botan"
       ]
     }
   }
diff --git a/versions/baseline.json b/versions/baseline.json
index 95f7e9310f45df..591da65572769d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6362,7 +6362,7 @@
     },
     "qca": {
       "baseline": "2.3.5",
-      "port-version": 1
+      "port-version": 2
     },
     "qcustomplot": {
       "baseline": "2.1.1",
diff --git a/versions/q-/qca.json b/versions/q-/qca.json
index 9cb5b84be99a0c..07b88d1141ea54 100644
--- a/versions/q-/qca.json
+++ b/versions/q-/qca.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fd2cceadc6f23f9c6fc3a77683d4e8bb42ab5105",
+      "version": "2.3.5",
+      "port-version": 2
+    },
     {
       "git-tree": "a5af940aef31f91feea8cb12daddb268a7cf4608",
       "version": "2.3.5",

From 6915fec0e0fb9080081b0e3e7617215f93272fb1 Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Fri, 7 Apr 2023 14:44:44 +0800
Subject: [PATCH 2/2] Update qca.json

---
 versions/q-/qca.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/q-/qca.json b/versions/q-/qca.json
index 07b88d1141ea54..d032255dc1d0a8 100644
--- a/versions/q-/qca.json
+++ b/versions/q-/qca.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "fd2cceadc6f23f9c6fc3a77683d4e8bb42ab5105",
+      "git-tree": "32321bfdc0e4563ed40687585b48038d551f6149",
       "version": "2.3.5",
       "port-version": 2
     },