[fmt] Updated to 6.1.2

ports/fmt/CONTROL

@@ -1,4 +1,4 @@
 Source: fmt
-Version: 6.0.0-1
+Version: 6.1.2
 Homepage: https://github.com/fmtlib/fmt
 Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.

ports/fmt/fix-warning4189.patch

@@ -1,12 +1,12 @@
-diff --git a/include/fmt/format.h b/include/fmt/format.h
-index efec5d6..9b15b48 100644
---- a/include/fmt/format.h
-+++ b/include/fmt/format.h
-@@ -33,6 +33,7 @@
+diff -Nur a/include/fmt/format.h b/include/fmt/format.h
+--- a/include/fmt/format.h      2020-01-10 15:49:58.457275100 +0100
++++ b/include/fmt/format.h      2020-01-10 15:50:23.227747100 +0100
+@@ -33,6 +33,8 @@
  #ifndef FMT_FORMAT_H_
  #define FMT_FORMAT_H_
- 
+
 +#pragma warning(disable:4189)
++
+ #include "core.h"
+
  #include <algorithm>
- #include <cassert>
- #include <cmath>

ports/fmt/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fmtlib/fmt
-    REF 6.0.0
-    SHA512 7deb5bd843ae6b9d4b58dca9c68c1cfe7b55a41040f358247f5309655188d1ae194ff414437c068f74367f078faa214b5883e8c9e634c7623dcda50850e24766
+    REF 6.1.2
+    SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
     HEAD_REF master
     PATCHES fix-warning4189.patch
 )

ports/spdlog/CONTROL

@@ -1,5 +1,5 @@
 Source: spdlog
-Version: 1.4.2
+Version: 1.5.0
 Homepage: https://github.com/gabime/spdlog
 Description: Very fast, header only, C++ logging library
 Build-Depends: fmt

ports/spdlog/disable-master-project-check.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 12320fb..70f611b 100644
+index 508a0b65..92846d4f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -33,13 +33,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
+@@ -41,13 +41,7 @@ endif()
  # Set SPDLOG_MASTER_PROJECT to ON if we are building spdlog
  #---------------------------------------------------------------------------------------
  # Check if spdlog is being used directly or via add_subdirectory, but allow overriding
@@ -14,6 +14,6 @@ index 12320fb..70f611b 100644
 -    endif()
 -endif ()
 +set(SPDLOG_MASTER_PROJECT OFF)
- 
+
  # build shared option
  if(NOT WIN32)

ports/spdlog/fix-error-4275.patch

@@ -1,15 +1,16 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cd17178..c9910e1 100644
+index 508a0b65..c3482e43 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -126,6 +126,10 @@ if(SPDLOG_FMT_EXTERNAL)
-
+@@ -152,6 +152,10 @@ if(SPDLOG_FMT_EXTERNAL OR SPDLOG_FMT_EXTERNAL_HO)
+     target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL)
      target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL)
-     target_link_libraries(spdlog_header_only INTERFACE fmt::fmt)
-+    
+
 +    if (WIN32)
-+        target_compile_options(spdlog PRIVATE /wd4275)
++        target_compile_options(spdlog PRIVATE /wd4275 /wd4100)
 +    endif()
-
-     set(PKG_CONFIG_REQUIRES fmt) # add dependecy to pkg-config
- endif()
++
+     # use external fmt-header-nly
+     if(SPDLOG_FMT_EXTERNAL_HO)
+         target_link_libraries(spdlog PUBLIC fmt::fmt-header-only)
+

ports/spdlog/fix-feature-export.patch

@@ -1,14 +1,13 @@
 diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt
-index d087cf6..86483db 100644
+index 0ea88423..9913ae64 100644
 --- a/bench/CMakeLists.txt
 +++ b/bench/CMakeLists.txt
-@@ -26,3 +26,8 @@ add_executable(formatter-bench formatter-bench.cpp)
+@@ -24,3 +24,8 @@ target_link_libraries(latency PRIVATE benchmark::benchmark spdlog::spdlog)
+
+ add_executable(formatter-bench formatter-bench.cpp)
  target_link_libraries(formatter-bench PRIVATE benchmark::benchmark spdlog::spdlog)
-
- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs")
 +
 +install(TARGETS bench async_bench latency
 +        RUNTIME DESTINATION tools/spdlog
 +        LIBRARY DESTINATION lib
 +        ARCHIVE DESTINATION lib)
-\ No newline at end of file

ports/spdlog/fix-uwp.patch

@@ -1,26 +1,17 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 35425db..28c555a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -128,7 +128,7 @@ if(SPDLOG_FMT_EXTERNAL)
-     target_link_libraries(spdlog_header_only INTERFACE fmt::fmt)
-
-     if (WIN32)
--        target_compile_options(spdlog PRIVATE /wd4275)
-+        target_compile_options(spdlog PRIVATE /wd4275 /wd4100)
-     endif()
-
-     set(PKG_CONFIG_REQUIRES fmt) # add dependecy to pkg-config
 diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h
-index f436b0d..82f3510 100644
+index 8473eb09..6a4fd94b 100644
 --- a/include/spdlog/details/os-inl.h
 +++ b/include/spdlog/details/os-inl.h
-@@ -128,7 +128,7 @@ SPDLOG_INLINE void prevent_child_fd(FILE *f)
+@@ -130,9 +130,11 @@ SPDLOG_INLINE std::tm gmtime() SPDLOG_NOEXCEPT
+ SPDLOG_INLINE void prevent_child_fd(FILE *f)
  {
-
  #ifdef _WIN32
--#if !defined(__cplusplus_winrt)
 +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
-     auto file_handle = reinterpret_cast<HANDLE>(_get_osfhandle(_fileno(f)));
+     auto file_handle = reinterpret_cast<HANDLE>(_get_osfhandle(::_fileno(f)));
      if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0))
          SPDLOG_THROW(spdlog_ex("SetHandleInformation failed", errno));
++#endif
+ #else
+     auto fd = ::fileno(f);
+     if (::fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
+

ports/spdlog/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gabime/spdlog
-    REF 1549ff12f1aa61ffc4d9a8727c519034724392a0 #v1.4.2
-    SHA512 c159aea475baecad0a5a9eef965856203c96aa855b0480e82d751bcc050c6e08bb0aa458544da061f5d744e17dcd27bd9b6e31a62d502834f02d3591f29febec
+    REF v1.5.0
+    SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
     HEAD_REF v1.x
     PATCHES
         disable-master-project-check.patch