From b09cf765d34142fe53a4b4c58e1e01d57fbfe74a Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 21 Mar 2023 02:33:03 +0800 Subject: [PATCH] [msgpack] update version to 4.1.3 (#28117) * [msgpack] update version to 4.1.3 * update version * version * clean and fix license * clean and fix license * version * revert * revert * version * fix ci * version * fix coolprop and update version * update version * format patch * version * hash * revert patch * version * update patch * version * add new function * vdb --------- Co-authored-by: Monica --- ports/coolprop/fix-builderror.patch | 6 +-- ports/coolprop/fix-dependency.patch | 25 ++++++----- ports/coolprop/fix-install.patch | 68 +++++++++++++++++------------ ports/coolprop/fmt-fix.patch | 55 +++++++++++------------ ports/coolprop/portfile.cmake | 8 ++-- ports/coolprop/vcpkg.json | 3 +- ports/msgpack/portfile.cmake | 27 ++++-------- ports/msgpack/vcpkg.json | 4 +- versions/baseline.json | 8 ++-- versions/c-/coolprop.json | 5 +++ versions/m-/msgpack.json | 5 +++ 11 files changed, 115 insertions(+), 99 deletions(-) diff --git a/ports/coolprop/fix-builderror.patch b/ports/coolprop/fix-builderror.patch index 0c2f9c4ca2..432f4e18c6 100644 --- a/ports/coolprop/fix-builderror.patch +++ b/ports/coolprop/fix-builderror.patch @@ -1,5 +1,5 @@ diff --git a/src/ODEIntegrators.cpp b/src/ODEIntegrators.cpp -index 4152f01..e5986ca 100644 +index 23bd4c4..beab710 100644 --- a/src/ODEIntegrators.cpp +++ b/src/ODEIntegrators.cpp @@ -4,6 +4,8 @@ @@ -9,5 +9,5 @@ index 4152f01..e5986ca 100644 +#undef max +#undef min - bool ODEIntegrators::AdaptiveRK54(AbstractODEIntegrator &ode, double tstart, double tend, double hmin, double hmax, double eps_allowed, double step_relax) - { + bool ODEIntegrators::AdaptiveRK54(AbstractODEIntegrator& ode, double tstart, double tend, double hmin, double hmax, double eps_allowed, + double step_relax) { diff --git a/ports/coolprop/fix-dependency.patch b/ports/coolprop/fix-dependency.patch index 69d3f18062..7eed56f45c 100644 --- a/ports/coolprop/fix-dependency.patch +++ b/ports/coolprop/fix-dependency.patch @@ -1,19 +1,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d61aff..80ac50a 100644 +index 414f380..619dfeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -237,10 +237,10 @@ list(REMOVE_ITEM APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/Tests/CoolProp-Te - list(REMOVE_ITEM APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/CoolPropLib.cpp") +@@ -247,13 +247,10 @@ list(REMOVE_ITEM APP_SOURCES + list(REMOVE_ITEM APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/CoolPropLib.cpp") - set (APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}") --list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/Eigen") --list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/msgpack-c/include") --list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib/include") --list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib") # should be deprecated + set(APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}") +-list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/Eigen") +-list(APPEND APP_INCLUDE_DIRS +- "${CMAKE_CURRENT_SOURCE_DIR}/externals/msgpack-c/include") +-list(APPEND APP_INCLUDE_DIRS +- "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib/include") +-list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib" +-)# should be deprecated +find_package(Eigen3 CONFIG REQUIRED) +find_package(msgpack CONFIG REQUIRED) +find_package(fmt CONFIG REQUIRED) -+link_libraries(Eigen3::Eigen msgpackc msgpackc-cxx fmt::fmt) - list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include") - list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src") ++link_libraries(Eigen3::Eigen fmt::fmt msgpackc-cxx) + list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include") + list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src") diff --git a/ports/coolprop/fix-install.patch b/ports/coolprop/fix-install.patch index 73732f4dbd..33bef8ffca 100644 --- a/ports/coolprop/fix-install.patch +++ b/ports/coolprop/fix-install.patch @@ -1,31 +1,45 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 80ac50a..36819dd 100644 +index 619dfeb..f856613 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -493,13 +493,13 @@ IF ( COOLPROP_OBJECT_LIBRARY OR COOLPROP_STATIC_LIBRARY OR COOLPROP_SHARED_LIBRA - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY RELEASE_POSTFIX ) - modify_msvc_flags("/MD") # Note that the default is not used if ${COOLPROP_MSVC_REL} or ${COOLPROP_MSVC_DBG} is set - ENDIF (MSVC) -- INSTALL(TARGETS ${LIB_NAME} DESTINATION static_library/${CMAKE_SYSTEM_NAME}/${BITNESS}bit_${CMAKE_CXX_COMPILER_ID}_${CMAKE_CXX_COMPILER_VERSION} ) -- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION static_library) -+ INSTALL(TARGETS ${LIB_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION include) - ELSEIF (COOLPROP_SHARED_LIBRARY) - LIST(APPEND APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_SOURCE}") - ADD_LIBRARY(${LIB_NAME} SHARED ${APP_SOURCES} ${COOLPROP_LIBRARY_EXPORTS}) -- INSTALL(TARGETS ${LIB_NAME} DESTINATION shared_library/${CMAKE_SYSTEM_NAME}/${BITNESS}bit${CONVENTION} ) -- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION shared_library) -+ INSTALL(TARGETS ${LIB_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION include) - SET_PROPERTY (TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCOOLPROP_LIB") - # Now all the compiler specific settings for Visual Studio - IF (MSVC) -@@ -732,7 +732,7 @@ if (COOLPROP_EES_MODULE) - VERBATIM - ) +@@ -543,21 +543,24 @@ if(COOLPROP_OBJECT_LIBRARY + endif(MSVC) + install( + TARGETS ${LIB_NAME} +- DESTINATION +- static_library/${CMAKE_SYSTEM_NAME}/${BITNESS}bit_${CMAKE_CXX_COMPILER_ID}_${CMAKE_CXX_COMPILER_VERSION} ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib + ) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} +- DESTINATION static_library) ++ DESTINATION include) + elseif(COOLPROP_SHARED_LIBRARY) + list(APPEND APP_SOURCES + "${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_SOURCE}") + add_library(${LIB_NAME} SHARED ${APP_SOURCES} ${COOLPROP_LIBRARY_EXPORTS}) + install( + TARGETS ${LIB_NAME} +- DESTINATION shared_library/${CMAKE_SYSTEM_NAME}/${BITNESS}bit${CONVENTION} ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib + ) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} +- DESTINATION shared_library) ++ DESTINATION include) + set_property( + TARGET ${LIB_NAME} + APPEND_STRING +@@ -889,7 +892,9 @@ if(COOLPROP_EES_MODULE) + VERBATIM) # install the generated library and the other files -- install(TARGETS COOLPROP_EES DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}") -+ install(TARGETS COOLPROP_EES RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/CoolProp.htm" DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}") - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/CoolProp.LIB" DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}") - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/CoolProp_EES_Sample.EES" DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}") + install(TARGETS COOLPROP_EES +- DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}") ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/CoolProp.htm" + DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}") + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/CoolProp.LIB" diff --git a/ports/coolprop/fmt-fix.patch b/ports/coolprop/fmt-fix.patch index 9baeb2c628..1d5cc4778b 100644 --- a/ports/coolprop/fmt-fix.patch +++ b/ports/coolprop/fmt-fix.patch @@ -1,39 +1,40 @@ diff --git a/include/CPstrings.h b/include/CPstrings.h -index b99820a..fe6a2aa 100644 +index 711981c..9d379d2 100644 --- a/include/CPstrings.h +++ b/include/CPstrings.h @@ -6,6 +6,8 @@ - #include - #include - #include -+ #include -+ #include + #include + #include + #include ++#include ++#include #if !defined(NO_FMTLIB) - #ifndef FMT_HEADER_ONLY + # ifndef FMT_HEADER_ONLY @@ -14,9 +16,6 @@ - #include "fmt/format.h" // For addition of the string formatting functions and macros from fmtlib - #include "fmt/printf.h" // For sprintf - #undef FMT_HEADER_ONLY + # include "fmt/format.h" // For addition of the string formatting functions and macros from fmtlib + # include "fmt/printf.h" // For sprintf + # undef FMT_HEADER_ONLY -#else -- #include -- #include +-# include +-# include #endif - #include "Exceptions.h" -@@ -58,11 +57,11 @@ - // Missing string formatting function, this old guy is needed for ancient gcc compilers on PowerPC for VxWorks - inline std::string format(const char* fmt, ...); + #include "Exceptions.h" +@@ -75,11 +74,12 @@ inline bool endswith(const std::string& s1, const std::string& s2) { + // Missing string formatting function, this old guy is needed for ancient gcc compilers on PowerPC for VxWorks + inline std::string format(const char* fmt, ...); #else -- // Missing std::string formatting function - provided by the fmtlib library -- inline std::string format(const char *format, fmt::ArgList args) { -- return fmt::sprintf(format, args); -+ template -+ std::string format(const Args & ... args) -+ { -+ return fmt::sprintf(args...); - } -- FMT_VARIADIC(std::string, format, const char *) - // For latest FMTLIB - /*template +-// Missing std::string formatting function - provided by the fmtlib library +-inline std::string format(const char* format, fmt::ArgList args) { +- return fmt::sprintf(format, args); ++template ++std::string format(const Args & ... args) ++{ ++ return fmt::sprintf(args...); + } +-FMT_VARIADIC(std::string, format, const char*) ++ + // For latest FMTLIB + /*template inline std::string format(const char *format_str, const Args & ... args) { diff --git a/ports/coolprop/portfile.cmake b/ports/coolprop/portfile.cmake index e036e1da17..245cd6730f 100644 --- a/ports/coolprop/portfile.cmake +++ b/ports/coolprop/portfile.cmake @@ -1,10 +1,9 @@ -set(PORT_VERSION 6.1.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CoolProp/CoolProp - REF f5ebb4e655add4c23bb327ab5209f3dbf919bc6d # v6.4.1 - SHA512 916d00777fe56035171ed0a6cbe09b8d4487317772802e4fe9b43f5965f3212dcb3754e18fe1db9c748a4d17facbbe6cb2244451cf5cf66334465760fc1701b7 + REF "v${VERSION}" + SHA512 ccd868cb297d86f054318acec4c3bf9f8ec07b54c320d5e887853c4190adefbd3b2d188e7453896656b5ad0e81b32d133fd0ce67bf58e647d58c96918bc993eb HEAD_REF master PATCHES fmt-fix.patch @@ -45,7 +44,6 @@ file(COPY ) file(COPY - ${CURRENT_INSTALLED_DIR}/include/msgpack.h ${CURRENT_INSTALLED_DIR}/include/msgpack.hpp ${CURRENT_INSTALLED_DIR}/include/msgpack DESTINATION ${SOURCE_PATH}/externals/msgpack-c/include @@ -98,4 +96,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/coolprop/vcpkg.json b/ports/coolprop/vcpkg.json index 5599289bba..9690938cc4 100644 --- a/ports/coolprop/vcpkg.json +++ b/ports/coolprop/vcpkg.json @@ -1,7 +1,6 @@ { "name": "coolprop", - "version-semver": "6.4.1", - "port-version": 2, + "version-semver": "6.4.3", "description": "Thermophysical properties for the masses", "homepage": "https://github.com/CoolProp/CoolProp", "license": "MIT", diff --git a/ports/msgpack/portfile.cmake b/ports/msgpack/portfile.cmake index 9b597eb9a9..2bdc170e15 100644 --- a/ports/msgpack/portfile.cmake +++ b/ports/msgpack/portfile.cmake @@ -5,33 +5,24 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO msgpack/msgpack-c - REF cpp-3.3.0 - SHA512 33ed87b23d776cadcc230666e6435088e402c5813e7e4dce5ce79c8c3aceba5a36db8f395278042c6ac44c474b33018ff1635889d8b20bc41c5f6f1d1c963cae + REF cpp-4.1.3 + SHA512 1252a2d61b119e9a8db6cc3667d2ae3234784d6607e2d08b836ab2f561455aa8c14ac134de0e8bb47f85a9fa86a9b325babd0a5a437daa0f270143d07738adcf HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(MSGPACK_ENABLE_SHARED OFF) - set(MSGPACK_ENABLE_STATIC ON) -else() - set(MSGPACK_ENABLE_SHARED ON) - set(MSGPACK_ENABLE_STATIC OFF) -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DMSGPACK_ENABLE_SHARED=${MSGPACK_ENABLE_SHARED} - -DMSGPACK_ENABLE_STATIC=${MSGPACK_ENABLE_STATIC} -DMSGPACK_BUILD_EXAMPLES=OFF - -DMSGPACK_BUILD_TESTS=OFF) + -DMSGPACK_BUILD_TESTS=OFF + -DMSGPACK_BUILD_DOCS=OFF +) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/msgpack) +vcpkg_cmake_config_fixup(PACKAGE_NAME msgpackc-cxx CONFIG_PATH lib/cmake/msgpackc-cxx) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/msgpack/vcpkg.json b/ports/msgpack/vcpkg.json index 43cc6457c8..e3119a9fbd 100644 --- a/ports/msgpack/vcpkg.json +++ b/ports/msgpack/vcpkg.json @@ -1,11 +1,11 @@ { "name": "msgpack", - "version": "3.3.0", - "port-version": 4, + "version": "4.1.3", "description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.", "homepage": "https://github.com/msgpack/msgpack-c", "license": "BSL-1.0", "dependencies": [ + "boost", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index ff8ad61d33..3be89550c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1689,8 +1689,8 @@ "port-version": 0 }, "coolprop": { - "baseline": "6.4.1", - "port-version": 2 + "baseline": "6.4.3", + "port-version": 0 }, "coroutine": { "baseline": "1.5.0", @@ -5269,8 +5269,8 @@ "port-version": 0 }, "msgpack": { - "baseline": "3.3.0", - "port-version": 4 + "baseline": "4.1.3", + "port-version": 0 }, "msgpack11": { "baseline": "0.0.10", diff --git a/versions/c-/coolprop.json b/versions/c-/coolprop.json index 9386fc5a04..d264b48969 100644 --- a/versions/c-/coolprop.json +++ b/versions/c-/coolprop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecf4aa81e29286ea194307b2379ef1fd0e3e311f", + "version-semver": "6.4.3", + "port-version": 0 + }, { "git-tree": "b66373d8ddd7b8b887779bfb7c132b4000fe4c87", "version-semver": "6.4.1", diff --git a/versions/m-/msgpack.json b/versions/m-/msgpack.json index 1dc3df7646..7bfbfc1187 100644 --- a/versions/m-/msgpack.json +++ b/versions/m-/msgpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "006d17cf08d5bb92fdb2f4bf33ba97d18cbcc090", + "version": "4.1.3", + "port-version": 0 + }, { "git-tree": "bb5c0f8535c60c90ea150ac38ed5eccbb77845ef", "version": "3.3.0",