From bb267a078a1ebaf5c7c6f806abef21389a2a145d Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Wed, 10 Jan 2024 17:24:17 -0800
Subject: [PATCH] [kd-soap] update to 2.2.0 and rename to kdsoap (#36101)

* kd-soap update to 2.2.0

* update version

---------

Co-authored-by: vzhli17 <v-zhli17@microsoft.com>
---
 .../Ensure-KDSoapConfig-finds-Qt-first.patch  | 26 -------------------
 ports/{kd-soap => kdsoap}/portfile.cmake      |  6 ++---
 ports/{kd-soap => kdsoap}/vcpkg.json          |  5 ++--
 versions/baseline.json                        |  4 +++
 versions/k-/kdsoap.json                       |  9 +++++++
 5 files changed, 17 insertions(+), 33 deletions(-)
 delete mode 100644 ports/kd-soap/Ensure-KDSoapConfig-finds-Qt-first.patch
 rename ports/{kd-soap => kdsoap}/portfile.cmake (73%)
 rename ports/{kd-soap => kdsoap}/vcpkg.json (85%)
 create mode 100644 versions/k-/kdsoap.json

diff --git a/ports/kd-soap/Ensure-KDSoapConfig-finds-Qt-first.patch b/ports/kd-soap/Ensure-KDSoapConfig-finds-Qt-first.patch
deleted file mode 100644
index e37bfd73d24753..00000000000000
--- a/ports/kd-soap/Ensure-KDSoapConfig-finds-Qt-first.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cb2df4c372c115df84805043a7785f38eb4eb082 Mon Sep 17 00:00:00 2001
-From: David Faure <david.faure@kdab.com>
-Date: Sun, 26 Mar 2023 17:27:02 +0200
-Subject: [PATCH] Ensure KDSoapConfig.cmake finds Qt first.
-
-Fixes #258
----
- KDSoapConfig.cmake.in | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/KDSoapConfig.cmake.in b/KDSoapConfig.cmake.in
-index d20649a4..f7bfa82b 100644
---- a/KDSoapConfig.cmake.in
-+++ b/KDSoapConfig.cmake.in
-@@ -8,6 +8,11 @@
- 
- @PACKAGE_INIT@
- 
-+include(CMakeFindDependencyMacro)
-+
-+find_dependency(Qt@Qt_VERSION_MAJOR@Core @QT_MIN_VERSION@)
-+find_dependency(Qt@Qt_VERSION_MAJOR@Network @QT_MIN_VERSION@)
-+
- set_and_check(KDSoap_INCLUDE_DIR "@PACKAGE_INSTALL_INCLUDE_DIR@")
- 
- set(KDSoap_INCLUDE_DIRS "${KDSoap_INCLUDE_DIR}")
diff --git a/ports/kd-soap/portfile.cmake b/ports/kdsoap/portfile.cmake
similarity index 73%
rename from ports/kd-soap/portfile.cmake
rename to ports/kdsoap/portfile.cmake
index 93a1f488e1c7f5..3b56a95c0253b8 100644
--- a/ports/kd-soap/portfile.cmake
+++ b/ports/kdsoap/portfile.cmake
@@ -1,14 +1,12 @@
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${VERSION}/kdsoap-${VERSION}.tar.gz"
     FILENAME "kdsoap-${VERSION}.tar.gz"
-    SHA512 12224f664dcae7ceb7395a7c3de48a208ae81c10f6fba4d0db233613472c6b9cdbea6375297c27b58fe7338d7db27a4447844f4e8f40a24ec1b4dd3fa38d20bb
+    SHA512 6ed5cd6a0d02a9faf6881facbd28391c553b3671512153ecd058ab53bfbe9d3f0afa3704d580e66010ddf6a3de7e578a632339f8c1ae7529c28f9d5fd7d1eb5f
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    PATCHES
-        Ensure-KDSoapConfig-finds-Qt-first.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSoap_STATIC)
@@ -34,4 +32,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/ports/kd-soap/vcpkg.json b/ports/kdsoap/vcpkg.json
similarity index 85%
rename from ports/kd-soap/vcpkg.json
rename to ports/kdsoap/vcpkg.json
index c633915a990048..ecadec916a5511 100644
--- a/ports/kd-soap/vcpkg.json
+++ b/ports/kdsoap/vcpkg.json
@@ -1,7 +1,6 @@
 {
-  "name": "kd-soap",
-  "version": "2.1.1",
-  "port-version": 1,
+  "name": "kdsoap",
+  "version": "2.2.0",
   "description": "A Qt-based client-side and server-side SOAP component",
   "homepage": "https://www.kdab.com/products/kd-soap",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index cfe56cdfe9d689..a4542544d8c12a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3748,6 +3748,10 @@
       "baseline": "2.0.0",
       "port-version": 0
     },
+    "kdsoap": {
+      "baseline": "2.2.0",
+      "port-version": 0
+    },
     "kealib": {
       "baseline": "1.5.3",
       "port-version": 0
diff --git a/versions/k-/kdsoap.json b/versions/k-/kdsoap.json
new file mode 100644
index 00000000000000..49deb010961074
--- /dev/null
+++ b/versions/k-/kdsoap.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "fb0537658cffb2606f6eed9d444a5d8f88cdf2a4",
+      "version": "2.2.0",
+      "port-version": 0
+    }
+  ]
+}