From 7801974c2f2326765ddbf6eb02ecda593c35f7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Tue, 9 Nov 2021 04:26:22 +0800
Subject: [PATCH] [vcpkg baseline][botan/qca] Fix botan pkgconfig and add botan
 as a required dependency to qca (#21250)

* [vcpkg baseline][botan/qca] Fix botan pkgconfig and add botan as a required dependency to qca

* format manifest

* version
---
 ports/botan/portfile.cmake | 12 ++++++++++--
 ports/botan/vcpkg.json     |  2 +-
 ports/qca/vcpkg.json       |  3 ++-
 versions/b-/botan.json     |  5 +++++
 versions/baseline.json     |  4 ++--
 versions/q-/qca.json       |  5 +++++
 6 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
index d6b678e6e6..bfc7db36e4 100644
--- a/ports/botan/portfile.cmake
+++ b/ports/botan/portfile.cmake
@@ -124,18 +124,26 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
     BOTAN_BUILD(dbg)
 endif()
 
+file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan")
+
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
     file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
     file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc"
+        [[${prefix}/include/botan-2]]
+        [[${prefix}/include]]
+    )
 endif()
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
     file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
     file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc"
+        [[${prefix}/include/botan-2]]
+        [[${prefix}/include]]
+    )
 endif()
 vcpkg_fixup_pkgconfig()
 
-file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan")
-
 vcpkg_copy_pdbs()
 
 if(CMAKE_HOST_WIN32)
diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json
index 09e20ed5ce..01891cc6a8 100644
--- a/ports/botan/vcpkg.json
+++ b/ports/botan/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "botan",
   "version": "2.18.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A cryptography library written in C++11",
   "homepage": "https://botan.randombit.net",
   "supports": "!(windows & arm)",
diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json
index e3f5fd3e72..f8dd9019b9 100644
--- a/ports/qca/vcpkg.json
+++ b/ports/qca/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "qca",
   "version": "2.3.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Qt Cryptographic Architecture (QCA).",
   "homepage": "https://cgit.kde.org/qca.git/",
   "dependencies": [
+    "botan",
     {
       "name": "qt5-base",
       "default-features": false
diff --git a/versions/b-/botan.json b/versions/b-/botan.json
index 27ad0e37e3..78fde90713 100644
--- a/versions/b-/botan.json
+++ b/versions/b-/botan.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "045c95bf0e7f1352d91398bc0dc41ce5ec5a288a",
+      "version": "2.18.1",
+      "port-version": 3
+    },
     {
       "git-tree": "5f002dd083e6eedd3bdd1d2bc7882d34d70ed438",
       "version": "2.18.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index 35833c1e20..172e68b861 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1126,7 +1126,7 @@
     },
     "botan": {
       "baseline": "2.18.1",
-      "port-version": 2
+      "port-version": 3
     },
     "box2d": {
       "baseline": "2.4.1",
@@ -5414,7 +5414,7 @@
     },
     "qca": {
       "baseline": "2.3.1",
-      "port-version": 4
+      "port-version": 5
     },
     "qcustomplot": {
       "baseline": "2.0.1",
diff --git a/versions/q-/qca.json b/versions/q-/qca.json
index c5f16dea4d..de9cc43aa0 100644
--- a/versions/q-/qca.json
+++ b/versions/q-/qca.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "842dcdd87f56ec4318a5049e95b1eb9807dd2193",
+      "version": "2.3.1",
+      "port-version": 5
+    },
     {
       "git-tree": "e8275668aade111ed059ddece14bff490ff47fbc",
       "version": "2.3.1",