[dimcli/draco/refprop-headers/coolprop] Update version (#13679)

* [manyports] Update version 5

* [coolprop] Update version

* Update CONTROL

* Update ports/refprop-headers/CONTROL

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

5 files changed, 64 insertions, 48 deletions

diff --git a/ports/coolprop/CONTROL b/ports/coolprop/CONTROL
index ab6b355c7..ed0612bde 100644
--- a/ports/coolprop/CONTROL
+++ b/ports/coolprop/CONTROL
@@ -1,5 +1,5 @@
 Source: coolprop
-Version: 6.1.0-5
+Version: 6.4.1
 Homepage: https://github.com/CoolProp/CoolProp
 Description: Thermophysical properties for the masses
 Build-Depends: catch, eigen3, pybind11, if97, fmt, rapidjson, msgpack, refprop-headers
diff --git a/ports/coolprop/fix-builderror.patch b/ports/coolprop/fix-builderror.patch
index a0d4a9b61..0c2f9c4ca 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 ce86cf6..681db13 100644
+index 4152f01..e5986ca 100644
 --- a/src/ODEIntegrators.cpp
 +++ b/src/ODEIntegrators.cpp
 @@ -4,6 +4,8 @@
diff --git a/ports/coolprop/fix-dependency.patch b/ports/coolprop/fix-dependency.patch
new file mode 100644
index 000000000..69d3f1806
--- /dev/null
+++ b/ports/coolprop/fix-dependency.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d61aff..80ac50a 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")
+ 
+ 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")
+ 
diff --git a/ports/coolprop/fmt-fix.patch b/ports/coolprop/fmt-fix.patch
index bf2d11deb..9baeb2c62 100644
--- a/ports/coolprop/fmt-fix.patch
+++ b/ports/coolprop/fmt-fix.patch
@@ -1,39 +1,39 @@
-diff --git a/include/CPstrings.h b/include/CPstrings.h

-index 2e5a5af..87f6b7c 100644

---- a/include/CPstrings.h

-+++ b/include/CPstrings.h

-@@ -5,6 +5,8 @@

-     #include <iterator>

-     #include <algorithm>

-     #include <functional>

-+    #include <vector>

-+    #include <string>

- 

- #if !defined(NO_CPPFORMAT)

-     #ifndef FMT_HEADER_ONLY

-@@ -13,9 +15,6 @@

-     #include "fmt/format.h" // For addition of the string formatting functions and macros from cppformat

-     #include "fmt/printf.h" // For sprintf

-     #undef FMT_HEADER_ONLY

--#else

--    #include <vector>

--    #include <string>

- #endif

- 

-     #include "Exceptions.h"

-@@ -57,11 +56,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, ...);

- #else

--    // Missing std::string formatting function - provided by the cppformat library

--    inline std::string format(const char *format, fmt::ArgList args) {

--      return fmt::sprintf(format, args);

-+    template<class...Args>

-+    std::string format(const Args & ... args)

-+    {

-+        return fmt::sprintf(args...);

-     }

--    FMT_VARIADIC(std::string, format, const char *)

- #endif

- 

-     // Missing string split - like in Python

+diff --git a/include/CPstrings.h b/include/CPstrings.h
+index b99820a..fe6a2aa 100644
+--- a/include/CPstrings.h
++++ b/include/CPstrings.h
+@@ -6,6 +6,8 @@
+     #include <algorithm>
+     #include <functional>
+     #include <cctype>
++    #include <vector>
++    #include <string>
+ 
+ #if !defined(NO_FMTLIB)
+     #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
+-#else
+-    #include <vector>
+-    #include <string>
+ #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, ...);
+ #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<class...Args>
++    std::string format(const Args & ... args)
++    {
++        return fmt::sprintf(args...);
+     }
+-    FMT_VARIADIC(std::string, format, const char *)
+     // For latest FMTLIB
+     /*template <typename... Args>
+     inline std::string format(const char *format_str, const Args & ... args) {
diff --git a/ports/coolprop/portfile.cmake b/ports/coolprop/portfile.cmake
index b560531e2..2ba5a7ec5 100644
--- a/ports/coolprop/portfile.cmake
+++ b/ports/coolprop/portfile.cmake
@@ -3,12 +3,13 @@ set(PORT_VERSION 6.1.0)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CoolProp/CoolProp
-    REF 0e934e842e9ce83eea64fda1d4ab8e59adf9d8cd
-    SHA512 a44eafc84f2b88259d7bcf6cfa81daeb81ea9d55bd356e59b3ef77b6f68ea405961c7cb54ba899e3896bb2a02d3e01119a4a51f72899126c8da6081fa2ece948
+    REF f5ebb4e655add4c23bb327ab5209f3dbf919bc6d # v6.4.1
+    SHA512 916d00777fe56035171ed0a6cbe09b8d4487317772802e4fe9b43f5965f3212dcb3754e18fe1db9c748a4d17facbbe6cb2244451cf5cf66334465760fc1701b7
     HEAD_REF master
     PATCHES
         fmt-fix.patch
         fix-builderror.patch
+        fix-dependency.patch
 )
 
 vcpkg_find_acquire_program(PYTHON2)
@@ -116,8 +117,4 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/${TARGET_FOLDER} ${CURRENT_PACKAGES_DIR}/${TARGET_FOLDER})
 
 # Handle copyright
-file(
-  INSTALL ${SOURCE_PATH}/LICENSE
-  DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
-  RENAME copyright
-)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)