From c161bbddb30ad98c17cfc04b925e4208f3f75455 Mon Sep 17 00:00:00 2001
From: Kevin Lalumiere <klalumiere@coveo.com>
Date: Tue, 15 Mar 2022 18:40:06 -0400
Subject: [PATCH 1/2] Fix microsoft/vcpkg#23580

---
 ports/qpid-proton/portfile.cmake          | 18 ++++++++++++++++--
 ports/qpid-proton/qpid-protonConfig.cmake |  4 ++++
 ports/qpid-proton/vcpkg.json              |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 ports/qpid-proton/qpid-protonConfig.cmake

diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake
index 2d206def12219f..f82649d132ac94 100644
--- a/ports/qpid-proton/portfile.cmake
+++ b/ports/qpid-proton/portfile.cmake
@@ -16,8 +16,6 @@ vcpkg_cmake_configure(
         -DPYTHON_EXECUTABLE=${PYTHON3}
         -DLIB_SUFFIX=
         -DBUILD_GO=no
-        -DBUILD_RUBY=no
-        -DBUILD_PYTHON=no
         -DENABLE_JSONCPP=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON
 )
@@ -26,8 +24,24 @@ vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
+set(configFiles
+    "${CURRENT_PACKAGES_DIR}/share/${PORT}/Proton/ProtonConfig.cmake"
+    "${CURRENT_PACKAGES_DIR}/share/${PORT}/ProtonCpp/ProtonCppConfig.cmake"
+)
+foreach(configFile IN LISTS configFiles)
+    vcpkg_replace_string("${configFile}"
+        "IMPORTED_LOCATION_DEBUG \"\${_IMPORT_PREFIX}/lib"
+        "IMPORTED_LOCATION_DEBUG \"\${_IMPORT_PREFIX}/debug/lib"
+    )
+    vcpkg_replace_string("${configFile}"
+        "debug \${_IMPORT_PREFIX}/lib"
+        "debug \${_IMPORT_PREFIX}/debug/lib"
+    )
+endforeach()
 vcpkg_fixup_pkgconfig()
 
+configure_file(${CMAKE_CURRENT_LIST_DIR}/qpid-protonConfig.cmake
+    ${CURRENT_PACKAGES_DIR}/share/${PORT}/qpid-protonConfig.cmake COPYONLY)
 file(RENAME "${CURRENT_PACKAGES_DIR}/share/proton/LICENSE.txt"
             "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
 
diff --git a/ports/qpid-proton/qpid-protonConfig.cmake b/ports/qpid-proton/qpid-protonConfig.cmake
new file mode 100644
index 00000000000000..3ad039bd6f9138
--- /dev/null
+++ b/ports/qpid-proton/qpid-protonConfig.cmake
@@ -0,0 +1,4 @@
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
+set(_IMPORT_PREFIX "${PACKAGE_PREFIX_DIR}")
+include(${CMAKE_CURRENT_LIST_DIR}/Proton/ProtonConfig.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/ProtonCpp/ProtonCppConfig.cmake)
diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json
index cbdd7e4ecd6d0a..30219802bdcea2 100644
--- a/ports/qpid-proton/vcpkg.json
+++ b/ports/qpid-proton/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qpid-proton",
   "version": "0.32.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Qpid Proton is a high-performance, lightweight messaging library.",
   "homepage": "https://github.com/apache/qpid-proton",
   "dependencies": [

From fa208b6fadee751f04d4c535aa13d7a20517a10d Mon Sep 17 00:00:00 2001
From: Kevin Lalumiere <klalumiere@coveo.com>
Date: Tue, 15 Mar 2022 18:45:16 -0400
Subject: [PATCH 2/2] Add version

---
 versions/baseline.json       | 2 +-
 versions/q-/qpid-proton.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 3b1068dffbb47d..542af17014e22c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5606,7 +5606,7 @@
     },
     "qpid-proton": {
       "baseline": "0.32.0",
-      "port-version": 2
+      "port-version": 3
     },
     "qscintilla": {
       "baseline": "2.12.0",
diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json
index 82017e48c4be54..19532ceadc92bb 100644
--- a/versions/q-/qpid-proton.json
+++ b/versions/q-/qpid-proton.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "109a9bb4fac5d5c5a52cd620d7ddb22da6fe47f7",
+      "version": "0.32.0",
+      "port-version": 3
+    },
     {
       "git-tree": "c6ab0bd896fa44681e2c3d4b325915ddacb38a1a",
       "version": "0.32.0",