From 4cdccc30bdf0a67f7e8b1547971e6f3326d17fd2 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Thu, 22 Jun 2023 07:31:23 +0200
Subject: [PATCH] [catch2] Fix catch2-with-main.pc (#32047)

---
 ports/catch2/portfile.cmake | 5 ++++-
 ports/catch2/vcpkg.json     | 1 +
 versions/baseline.json      | 2 +-
 versions/c-/catch2.json     | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
index 30915bf2d4..73303d99a1 100644
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@@ -1,7 +1,6 @@
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 endif()
-vcpkg_minimum_required(VERSION 2022-11-10)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -24,6 +23,10 @@ vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2)
 vcpkg_fixup_pkgconfig()
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/catch2-with-main.pc" [["-L${libdir}"]] [["-L${libdir}/manual-link"]])
+if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/catch2-with-main.pc" [["-L${libdir}"]] [["-L${libdir}/manual-link"]])
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json
index baaba33046..f3ab9ccca0 100644
--- a/ports/catch2/vcpkg.json
+++ b/ports/catch2/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "catch2",
   "version-semver": "3.3.2",
+  "port-version": 1,
   "description": "A modern, header-only test framework for unit testing.",
   "homepage": "https://github.com/catchorg/Catch2",
   "license": "BSL-1.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 378954b1c8..2d44de3aa5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1402,7 +1402,7 @@
     },
     "catch2": {
       "baseline": "3.3.2",
-      "port-version": 0
+      "port-version": 1
     },
     "cccapstone": {
       "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e",
diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json
index ec1e5fbc9b..e6cce5a874 100644
--- a/versions/c-/catch2.json
+++ b/versions/c-/catch2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8dc2e0cb32d0c1e0a12684a3628c926157f36ddd",
+      "version-semver": "3.3.2",
+      "port-version": 1
+    },
     {
       "git-tree": "e776d4cb313c846f6de82c05fa2ab9b7748edb6b",
       "version-semver": "3.3.2",