From a8c02e6a7454ddec5417d6bad4cce4b81a7e53ff Mon Sep 17 00:00:00 2001 From: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> Date: Tue, 28 May 2024 05:23:29 +0800 Subject: [PATCH] [open62541] Update to 1.3.10 [open62541pp] Update to 0.13.0 (#38953) Refer to #38922, related of #38762. ### Checklist - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~The "supports" clause reflects platforms that may be fixed by this new version.~ - [ ] ~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~ - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. ### Test The ports `open62541` and `open62541pp` usages test pass with the following triplets: * x64-windows --- ports/open62541/disable-docs.patch | 20 -------------------- ports/open62541/portfile.cmake | 8 +++++--- ports/open62541/vcpkg.json | 2 +- ports/open62541pp/portfile.cmake | 3 +-- ports/open62541pp/usage | 4 ---- ports/open62541pp/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/o-/open62541.json | 5 +++++ versions/o-/open62541pp.json | 5 +++++ 9 files changed, 20 insertions(+), 33 deletions(-) delete mode 100644 ports/open62541/disable-docs.patch delete mode 100644 ports/open62541pp/usage 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..b8e6369e2f449e 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -2,12 +2,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open62541/open62541 REF "v${VERSION}" - SHA512 8771a70d1f38f2a02f21281200d98fdd8d41d842cc82704155793529a1768beeb2583382f7547e6aaefdab4a17c3130779af792b2a59487889a3cdea4a2fa776 + SHA512 47e2a8af03e3e6dfbf6edcf3bec665a639c5cd6a826d987bb72eafb981e0ebfde01f36e624798fa529e8fcd83b6f22972538c4ea181ccd1a5bd5988bd87331c5 HEAD_REF master - PATCHES - disable-docs.patch ) +# disable docs +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 diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json index 34aba5b42d00df..36239f4cf89acd 100644 --- a/ports/open62541/vcpkg.json +++ b/ports/open62541/vcpkg.json @@ -1,6 +1,6 @@ { "name": "open62541", - "version": "1.3.9", + "version": "1.3.10", "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", diff --git a/ports/open62541pp/portfile.cmake b/ports/open62541pp/portfile.cmake index ea713ea6b6b0e5..305d4d0a144b54 100644 --- a/ports/open62541pp/portfile.cmake +++ b/ports/open62541pp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open62541pp/open62541pp REF "v${VERSION}" - SHA512 7dc598ae373009c181b06b3768178d26a55880356984a24cef9758240efa7c827286a926222d6c225313a4f5b2d1abab9135794db8e216dac0f050ed3b471f25 + SHA512 77dbcc26330271ddffe1fc58a192f01fca43d18de1df4e36fae65f86b6fa3af30f22589beb0a56f654830946ee3ab0518e37246deff4df99cb9950ec1f60f2bf HEAD_REF master ) @@ -25,4 +25,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/open62541pp/usage b/ports/open62541pp/usage deleted file mode 100644 index 7cc720ba55f175..00000000000000 --- a/ports/open62541pp/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package open62541pp provides CMake targets: - - find_package(open62541pp CONFIG REQUIRED) - target_link_libraries(main PRIVATE open62541pp::open62541pp) diff --git a/ports/open62541pp/vcpkg.json b/ports/open62541pp/vcpkg.json index 0962f32c7efd8c..d02adf7028aa4c 100644 --- a/ports/open62541pp/vcpkg.json +++ b/ports/open62541pp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "open62541pp", - "version": "0.12.0", + "version": "0.13.0", "description": "C++ wrapper of the open62541 OPC UA library", "homepage": "https://open62541pp.github.io/open62541pp/", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index f0d413eb0ad3b7..5b88ab51876da1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6393,11 +6393,11 @@ "port-version": 0 }, "open62541": { - "baseline": "1.3.9", + "baseline": "1.3.10", "port-version": 0 }, "open62541pp": { - "baseline": "0.12.0", + "baseline": "0.13.0", "port-version": 0 }, "openal-soft": { diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index 6b964419195367..c9b0f2068b32de 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bedb658fa6b1d3391dd610294780fb65176be639", + "version": "1.3.10", + "port-version": 0 + }, { "git-tree": "2cab251773b17791187e59d83a27ec09d344a49c", "version": "1.3.9", diff --git a/versions/o-/open62541pp.json b/versions/o-/open62541pp.json index d7f9fa0531c054..0988c0caab1144 100644 --- a/versions/o-/open62541pp.json +++ b/versions/o-/open62541pp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec958a6215e6f08519e24ece87789a9e5ff5e276", + "version": "0.13.0", + "port-version": 0 + }, { "git-tree": "2923db9f93aa0d81cb6c2f9bc11f1f8dee713e4f", "version": "0.12.0",