From 5a82cc881c64a54e1634bc4dab73c1c539f0c71d Mon Sep 17 00:00:00 2001
From: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com>
Date: Fri, 24 May 2024 14:31:09 +0800
Subject: [PATCH] [open62541] Upgrade to 1.4.1

---
 ports/open62541/disable-docs.patch | 20 --------------------
 ports/open62541/portfile.cmake     | 14 +++++++++++---
 ports/open62541/vcpkg.json         |  5 +----
 ports/qtopcua/vcpkg.json           |  2 +-
 versions/baseline.json             |  4 ++--
 versions/o-/open62541.json         |  5 +++++
 versions/q-/qtopcua.json           |  5 +++++
 7 files changed, 25 insertions(+), 30 deletions(-)
 delete mode 100644 ports/open62541/disable-docs.patch

diff --git a/ports/open62541/disable-docs.patch b/ports/open62541/disable-docs.patch
deleted file mode 100644
index 430716532a3d3c..00000000000000
--- a/ports/open62541/disable-docs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a051f12f..a751b6d83 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1529,7 +1529,6 @@ target_link_libraries(open62541 ${open62541_LIBRARIES})
- ##########################
- 
- # always include, builds with make doc
--add_subdirectory(doc)
- 
- if(UA_BUILD_EXAMPLES)
-     if(UA_ENABLE_AMALGAMATION)
-@@ -1565,7 +1564,6 @@ endif()
- ########################
- # Linting as target    #
- ########################
--include(linting_target)
- 
- ##########################
- # Installation           #
diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake
index fa7362903b4abc..d39a9cdc9f1484 100644
--- a/ports/open62541/portfile.cmake
+++ b/ports/open62541/portfile.cmake
@@ -1,17 +1,25 @@
+vcpkg_download_distfile(PATCH_6501
+    URLS https://github.com/open62541/open62541/commit/14c1d6fb1175257b624bcd509817887f5e8a2543.patch?full_index=1
+    SHA512 c7ae62bbab66bdb306b7aded3bd0fc3d63ccc082528475151d1ffecb743a34227a2694294d5f8d17949a24f87d853337c948fcc995a2da4b85c198c4ed47ab4d
+    FILENAME 14c1d6fb1175257b624bcd509817887f5e8a2543.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open62541/open62541
     REF "v${VERSION}"
-    SHA512 8771a70d1f38f2a02f21281200d98fdd8d41d842cc82704155793529a1768beeb2583382f7547e6aaefdab4a17c3130779af792b2a59487889a3cdea4a2fa776
+    SHA512 e0a2f9e748ee1b27b0bd400d56b6e90602d545c7a5c794ba9a1ccd1ab15bde3c2908440ec1662b4a6980b9e7ffcf532018f8894821405f8edbd5f0168ca4ccf3
     HEAD_REF master
     PATCHES
-        disable-docs.patch
+        "${PATCH_6501}"
 )
 
+vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "add_subdirectory(doc)" "")
+vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "include(linting_target)" "")
+
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        amalgamation UA_ENABLE_AMALGAMATION
         historizing UA_ENABLE_HISTORIZING
 )
 
diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json
index 34aba5b42d00df..0945ce26252293 100644
--- a/ports/open62541/vcpkg.json
+++ b/ports/open62541/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "open62541",
-  "version": "1.3.9",
+  "version": "1.4.1",
   "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.",
   "homepage": "https://open62541.org",
   "license": "MPL-2.0",
@@ -19,9 +19,6 @@
     "openssl"
   ],
   "features": {
-    "amalgamation": {
-      "description": "Concatenate the library to a single file open62541.h/.c"
-    },
     "historizing": {
       "description": "Enable basic support for historical access (client and server)"
     },
diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json
index a1cbb17ad6d1ec..d2e76fd434b401 100644
--- a/ports/qtopcua/vcpkg.json
+++ b/ports/qtopcua/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtopcua",
   "version": "6.7.0",
+  "port-version": 1,
   "description": "The Qt OPC UA module implements a Qt API to interact with OPC UA on top of a 3rd party OPC UA stack.",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -45,7 +46,6 @@
           "name": "open62541",
           "default-features": false,
           "features": [
-            "amalgamation",
             "historizing",
             "openssl"
           ]
diff --git a/versions/baseline.json b/versions/baseline.json
index 1dd7526d01cf2f..6a6e8556c9f62b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6393,7 +6393,7 @@
       "port-version": 0
     },
     "open62541": {
-      "baseline": "1.3.9",
+      "baseline": "1.4.1",
       "port-version": 0
     },
     "open62541pp": {
@@ -7406,7 +7406,7 @@
     },
     "qtopcua": {
       "baseline": "6.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "qtpositioning": {
       "baseline": "6.7.0",
diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json
index 6b964419195367..738aca5b15ae1f 100644
--- a/versions/o-/open62541.json
+++ b/versions/o-/open62541.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b99fdf8b2d1406e3bd71f5c718cd7f7a2219b786",
+      "version": "1.4.1",
+      "port-version": 0
+    },
     {
       "git-tree": "2cab251773b17791187e59d83a27ec09d344a49c",
       "version": "1.3.9",
diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json
index c70d634a0fcc62..4079842c64c898 100644
--- a/versions/q-/qtopcua.json
+++ b/versions/q-/qtopcua.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9e64aecf27f0cb6f54d971be155272bc4fd7c84b",
+      "version": "6.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "6ccc54814fa0de5f91425e29f2258c96e42e48cb",
       "version": "6.7.0",