[inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision (#13584)

* [inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision

* Fix license path for fastrtps and remove bin with static build for kd-soap

4 files changed, 142 insertions, 144 deletions

diff --git a/ports/jsonnet/001-enable-msvc.patch b/ports/jsonnet/001-enable-msvc.patch
index 12ddbed86..499c6713d 100644
--- a/ports/jsonnet/001-enable-msvc.patch
+++ b/ports/jsonnet/001-enable-msvc.patch
@@ -1,80 +1,81 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0418d4a..ac8f0f2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,6 +2,8 @@
- cmake_minimum_required(VERSION 2.8.7)
- project(jsonnet C CXX)
- 
-+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-+
- include(ExternalProject)
- include(GNUInstallDirs)
- 
-@@ -89,6 +91,7 @@ else()
- endif()
- 
- # Compiler flags.
-+if (0)
- if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR
-         ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-     set(OPT "-O3")
-@@ -98,6 +101,7 @@ else()
-     # TODO: Windows support.
-     message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported")
- endif()
-+endif()
- 
- # Look for libraries in global output path.
- link_directories(${GLOBAL_OUTPUT_PATH})
-diff --git a/cmd/CMakeLists.txt b/cmd/CMakeLists.txt
-index c032f02..d80d2a0 100644
---- a/cmd/CMakeLists.txt
-+++ b/cmd/CMakeLists.txt
-@@ -13,5 +13,5 @@ if (BUILD_JSONNETFMT OR BUILD_TESTS)
-     add_dependencies(jsonnetfmt libjsonnet_for_binaries)
-     target_link_libraries(jsonnetfmt libjsonnet_for_binaries)
- 
--	install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+	install(TARGETS jsonnetfmt DESTINATION tools/jsonnet)
- endif()
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 60fdcb1..82fb7c2 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE
-     string_utils.cpp
-     vm.cpp)
- 
--add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
-+add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
- add_dependencies(libjsonnet md5 stdlib)
- target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json)
- 
-@@ -46,7 +46,7 @@ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet
- 	PUBLIC_HEADER "${LIB_HEADER}")
- install(TARGETS libjsonnet
- 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
--	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+	ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}"
- 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
- 
- if (BUILD_STATIC_LIBS)
-diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt
-index a481d9f..0dc3ab6 100644
---- a/stdlib/CMakeLists.txt
-+++ b/stdlib/CMakeLists.txt
-@@ -2,6 +2,7 @@
- 
- add_executable(to_c_array to_c_array.cpp)
- 
-+if (0)
- # Custom command that will only build stdlib when it changes.
- add_custom_command(
- 	OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h
-@@ -13,3 +14,4 @@ add_custom_command(
- # Standard library build target that libjsonnet can depend on.
- add_custom_target(stdlib ALL
- 	DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h)
-+endif()
-\ No newline at end of file
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 385ea82..ebd12b6 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -2,6 +2,8 @@

+ cmake_minimum_required(VERSION 2.8.7)

+ project(jsonnet C CXX)

+ 

++add_definitions(-D_CRT_SECURE_NO_WARNINGS)

++

+ include(ExternalProject)

+ include(GNUInstallDirs)

+ 

+@@ -33,6 +35,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH})

+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH})

+ 

+ # Compiler flags.

++if (0)

+ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR

+         ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")

+     set(OPT "-O3")

+@@ -42,7 +45,7 @@ else()

+     # TODO: Windows support.

+     message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported")

+ endif()

+-

++endif()

+ set(CMAKE_CXX_STANDARD 11)

+ 

+ 

+diff --git a/cmd/CMakeLists.txt b/cmd/CMakeLists.txt

+index c032f02..d80d2a0 100644

+--- a/cmd/CMakeLists.txt

++++ b/cmd/CMakeLists.txt

+@@ -13,5 +13,5 @@ if (BUILD_JSONNETFMT OR BUILD_TESTS)

+     add_dependencies(jsonnetfmt libjsonnet_for_binaries)

+     target_link_libraries(jsonnetfmt libjsonnet_for_binaries)

+ 

+-	install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}")

++	install(TARGETS jsonnetfmt DESTINATION tools/jsonnet)

+ endif()

+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt

+index d277872..bbf67f7 100644

+--- a/core/CMakeLists.txt

++++ b/core/CMakeLists.txt

+@@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE

+     string_utils.cpp

+     vm.cpp)

+ 

+-add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})

++add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})

+ add_dependencies(libjsonnet md5 stdlib)

+ target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json)

+ 

+@@ -46,7 +46,7 @@ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet

+ 	PUBLIC_HEADER "${LIB_HEADER}")

+ install(TARGETS libjsonnet

+ 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

+-	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

++	ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}"

+ 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

+ 

+ if (BUILD_STATIC_LIBS)

+diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt

+index a481d9f..2f58d2f 100644

+--- a/stdlib/CMakeLists.txt

++++ b/stdlib/CMakeLists.txt

+@@ -2,6 +2,7 @@

+ 

+ add_executable(to_c_array to_c_array.cpp)

+ 

++if(0)

+ # Custom command that will only build stdlib when it changes.

+ add_custom_command(

+ 	OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h

+@@ -13,3 +14,4 @@ add_custom_command(

+ # Standard library build target that libjsonnet can depend on.

+ add_custom_target(stdlib ALL

+ 	DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h)

++endif()

+\ No newline at end of file

diff --git a/ports/jsonnet/002-fix-dependency-and-install.patch b/ports/jsonnet/002-fix-dependency-and-install.patch
index 7c7b5da77..90640e56c 100644
--- a/ports/jsonnet/002-fix-dependency-and-install.patch
+++ b/ports/jsonnet/002-fix-dependency-and-install.patch
@@ -1,61 +1,58 @@
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 82fb7c2..a94b4ff 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -28,6 +28,7 @@ set(LIBJSONNET_SOURCE
-     string_utils.cpp
-     vm.cpp)
- 
-+if (BUILD_SHARED_BINARIES)
- add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
- add_dependencies(libjsonnet md5 stdlib)
- target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json)
-@@ -48,6 +49,7 @@ install(TARGETS libjsonnet
- 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}"
- 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+endif()
- 
- if (BUILD_STATIC_LIBS)
-     # Static library for jsonnet command-line tool.
-@@ -102,3 +104,6 @@ if (BUILD_TESTS)
-     add_test(jsonnet_test_snippet
-         ${GLOBAL_OUTPUT_PATH}/jsonnet -e ${TEST_SNIPPET})
- endif()
-+
-+
-+install(FILES ${LIB_HEADER} DESTINATION include)
-\ No newline at end of file
-diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
-index bf349df..6ed1442 100644
---- a/cpp/CMakeLists.txt
-+++ b/cpp/CMakeLists.txt
-@@ -8,9 +8,9 @@ set(LIBJSONNETPP_SOURCE
-     libjsonnet++.cpp
- )
- 
-+if (BUILD_SHARED_BINARIES)
- add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE})
--add_dependencies(libjsonnet++ jsonnet)
--# target_link_libraries(libjsonnet libjsonnet)
-+target_link_libraries(libjsonnet++ libjsonnet)
- 
- # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without
- # this step the output would be |liblibjsonnet|.
-@@ -22,6 +22,7 @@ install(TARGETS libjsonnet++
- 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+endif()
- 
- if (BUILD_STATIC_LIBS)
-     # Static library for jsonnet command-line tool.
-@@ -38,6 +39,8 @@ else()
-     add_library(libjsonnet++_for_binaries ALIAS libjsonnet++_static)
- endif()
- 
-+install(FILES ${LIBJSONNETPP_HEADERS} DESTINATION include)
-+
- # Tests
- function(add_test_executablepp test_name)
-     if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${test_name}.cpp)
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt

+index bbf67f7..7238a59 100644

+--- a/core/CMakeLists.txt

++++ b/core/CMakeLists.txt

+@@ -28,6 +28,7 @@ set(LIBJSONNET_SOURCE

+     string_utils.cpp

+     vm.cpp)

+ 

++if (BUILD_SHARED_BINARIES)

+ add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})

+ add_dependencies(libjsonnet md5 stdlib)

+ target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json)

+@@ -48,6 +49,7 @@ install(TARGETS libjsonnet

+ 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

+ 	ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}"

+ 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

++endif()

+ 

+ if (BUILD_STATIC_LIBS)

+     # Static library for jsonnet command-line tool.

+@@ -102,3 +104,5 @@ if (BUILD_TESTS)

+     add_test(jsonnet_test_snippet

+         ${GLOBAL_OUTPUT_PATH}/jsonnet -e ${TEST_SNIPPET})

+ endif()

++

++install(FILES ${LIB_HEADER} DESTINATION include)

+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt

+index 6b7b8c3..6dfa1fa 100644

+--- a/cpp/CMakeLists.txt

++++ b/cpp/CMakeLists.txt

+@@ -8,9 +8,9 @@ set(LIBJSONNETPP_SOURCE

+     libjsonnet++.cpp

+ )

+ 

++if (BUILD_SHARED_BINARIES)

+ add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE})

+-add_dependencies(libjsonnet++ jsonnet)

+-# target_link_libraries(libjsonnet libjsonnet)

++target_link_libraries(libjsonnet libjsonnet)

+ 

+ # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without

+ # this step the output would be |liblibjsonnet|.

+@@ -22,6 +22,7 @@ install(TARGETS libjsonnet++

+ 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

+ 	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

+ 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

++endif()

+ 

+ if (BUILD_STATIC_LIBS)

+     # Static library for jsonnet command-line tool.

+@@ -38,6 +39,7 @@ else()

+     add_library(libjsonnet++_for_binaries ALIAS libjsonnet++_static)

+ endif()

+ 

++install(FILES ${LIBJSONNETPP_HEADERS} DESTINATION include)

+ # Tests

+ function(add_test_executablepp test_name)

+     if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${test_name}.cpp)

diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL
index 78542024c..99d73af6c 100644
--- a/ports/jsonnet/CONTROL
+++ b/ports/jsonnet/CONTROL
@@ -1,5 +1,5 @@
 Source: jsonnet
-Version: 0.14.0-1
+Version: 0.16.0
 Homepage: https://github.com/google/jsonnet
 Description: Jsonnet - The data templating language
 Build-Depends: nlohmann-json
diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake
index 6b4a30a11..77e8b8783 100644
--- a/ports/jsonnet/portfile.cmake
+++ b/ports/jsonnet/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO google/jsonnet
-  REF 552d8ec6f6b973a6357b83eb9bacd707366d28f0 # v0.14.0
-  SHA512 a4a9c6285155addbc5b7ef1a0c02b99b4d941bfc8e6536eaf029bff77c9c303a5c36f654ca8ab6b9757d2710c100c3e4a05f310269d82b0385ae55ea6ead14ef
+  REF 3f58aa551c917d6a7a2c6d042ee27f93d895ac0b # v0.16.0
+  SHA512 448f4ff433a43ec21c3b67ea508d624e03dac420878e453e908a465cd517c79ae657f107c92e28a4ae2d2527baaf9a3ae1c6ea4c7e7e4f5062d3fad4e76e668c
   HEAD_REF master
   PATCHES
     001-enable-msvc.patch