From 4f9117c0dea8e58be6dc4102e40238f57b7b8533 Mon Sep 17 00:00:00 2001
From: Kevin Lu <6320810+kevinlul@users.noreply.github.com>
Date: Thu, 6 Aug 2020 20:09:10 -0400
Subject: [PATCH] [fmt] Update to 7.0.2 + [spdlog] Update to 1.7.0  (#12312)

* [fmt] Update to 7.0.0

* [fmt] Update to 7.0.1

* [spdlog] Update to 1.7.0

* [quill] Patch for fmt 7.x

* [fmt] Update to 7.0.2

* [quill] Update baseline

* [fmt] Use vcpkg_replace_string

* remove unnecessary change to `SOURCE_PATH`

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
---
 ports/fmt/CONTROL           |  2 +-
 ports/fmt/portfile.cmake    | 26 ++++++++++++++------------
 ports/spdlog/CONTROL        |  2 +-
 ports/spdlog/portfile.cmake |  4 ++--
 scripts/ci.baseline.txt     |  3 ---
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL
index ce04fe4371a..c14780bbbb0 100644
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@@ -1,4 +1,4 @@
 Source: fmt
-Version: 6.2.1
+Version: 7.0.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.
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index c44da534a66..f4ea7b4abf0 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fmtlib/fmt
-    REF 19bd751020a1f3c3363b2eb67a039852f139a8d3#version 6.2.1
-    SHA512 5d03445c64c3b7973bdf4e445238c63fa41bf0fa8c2d5b32cd56f0a6b3036b039d9c303a06300f3af87795a07f80f2ed28b90ddbf9c3f7398796d77906c21f40
+    REF b9d749095e3397f154e2938f96dd11912f2d9300#version 7.0.2
+    SHA512 5e81369ba97fb9e7fbaeed87b23fc7f1db1459d5c67eba1d92a697840fa004097d714127381aa2aa1437f5730b27e38a71e3ddf6a4a73c8d5eeaa32b3efb3d80
     HEAD_REF master
     PATCHES fix-warning4189.patch
 )
@@ -33,10 +33,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
         endif()
     endif()
 
-    # Force FMT_SHARED to 1
-    file(READ ${CURRENT_PACKAGES_DIR}/include/fmt/core.h FMT_CORE_H)
-    string(REPLACE "defined(FMT_SHARED)" "1" FMT_CORE_H "${FMT_CORE_H}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/include/fmt/core.h "${FMT_CORE_H}")
+    vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fmt/core.h
+        "defined(FMT_SHARED)"
+        "1"
+    )
 endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
@@ -45,14 +45,16 @@ vcpkg_fixup_pkgconfig()
 
 if(VCPKG_TARGET_IS_WINDOWS)
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE)
-        string(REPLACE "lib/fmtd.dll" "bin/fmtd.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE})
-        file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake "${FMT_DEBUG_MODULE}")
+        vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake
+            "lib/fmtd.dll"
+            "bin/fmtd.dll"
+        )
     endif()
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake FMT_RELEASE_MODULE)
-        string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_RELEASE_MODULE ${FMT_RELEASE_MODULE})
-        file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake "${FMT_RELEASE_MODULE}")
+        vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake
+            "lib/fmt.dll"
+            "bin/fmt.dll"
+        )
     endif()
 endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL
index 9005193609c..8636d8ba951 100644
--- a/ports/spdlog/CONTROL
+++ b/ports/spdlog/CONTROL
@@ -1,5 +1,5 @@
 Source: spdlog
-Version: 1.6.1
+Version: 1.7.0
 Homepage: https://github.com/gabime/spdlog
 Description: Very fast, header only, C++ logging library
 Build-Depends: fmt
diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake
index 0c8b0df72c3..844575c1347 100644
--- a/ports/spdlog/portfile.cmake
+++ b/ports/spdlog/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gabime/spdlog
-    REF 22a169bc319ac06948e7ee0be6b9b0ac81386604 #v1.6.1
-    SHA512 29eac6f1be8d9fc08a257eab7f59cf70d63b2978fa4b8b63c825b39cf77f2505083bfd9db3fa2925739cea71d07986c022fc3d236cce351b3570d543f100a8a5
+    REF 616caa5d30172b65cc3a06800894c575d70cb8e6 #v1.7.0
+    SHA512 47411e8a607a339bffe2d5e13b4568b825ee8a07d88e69cf32096b08b76cdb60cbd64003620506e9c5748d3f66d8df76fa8880bb1a092923b7b405fedd18ad0c
     HEAD_REF v1.x
 )
 
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 64b452074eb..ef012585c73 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1467,9 +1467,6 @@ quickfix:x64-uwp=fail
 quickfix:x64-windows-static=fail
 quickfix:x64-windows=fail
 quickfix:x86-windows=fail
-quill:arm64-windows=fail
-quill:arm-uwp=fail
-quill:x64-uwp=fail
 quirc:arm64-windows      = skip
 quirc:arm-uwp            = skip
 quirc:x64-linux          = skip