From 9a2f3699c1c987eda16d0ecae85c8a452837f36b Mon Sep 17 00:00:00 2001
From: kevinlul <6320810+kevinlul@users.noreply.github.com>
Date: Tue, 7 Jul 2020 11:01:34 -0400
Subject: [PATCH 1/8] [fmt] Update to 7.0.0

---
 ports/fmt/CONTROL        | 2 +-
 ports/fmt/portfile.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL
index ce04fe4371a0b8..301edea24fdfc4 100644
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@@ -1,4 +1,4 @@
 Source: fmt
-Version: 6.2.1
+Version: 7.0.0
 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 c44da534a6654c..3c90d593df6c93 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 5173a76ba49936d252a85ee49b7eb96e3dff4033#version 7.0.0
+    SHA512 4a27931d3bef9f792cf9bbe64ceac42303ade5be27d6e00f398c53be8693ed81c6da3f41568f85c219eb50b05d8c9ab7e2b9454f75dcd87ab9c4c01dd52fe3d1
     HEAD_REF master
     PATCHES fix-warning4189.patch
 )

From e746be3e64166a8d0e22fd60814ba0292959747a Mon Sep 17 00:00:00 2001
From: kevinlul <6320810+kevinlul@users.noreply.github.com>
Date: Tue, 7 Jul 2020 14:08:57 -0400
Subject: [PATCH 2/8] [fmt] Update to 7.0.1

---
 ports/fmt/CONTROL        | 2 +-
 ports/fmt/portfile.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL
index 301edea24fdfc4..543bd03c0f4947 100644
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@@ -1,4 +1,4 @@
 Source: fmt
-Version: 7.0.0
+Version: 7.0.1
 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 3c90d593df6c93..241ebd79b8e381 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 5173a76ba49936d252a85ee49b7eb96e3dff4033#version 7.0.0
-    SHA512 4a27931d3bef9f792cf9bbe64ceac42303ade5be27d6e00f398c53be8693ed81c6da3f41568f85c219eb50b05d8c9ab7e2b9454f75dcd87ab9c4c01dd52fe3d1
+    REF f19b1a521ee8b606dedcadfda69fd10ddf882753#version 7.0.1
+    SHA512 381ed49c286b541fed1e8d6206bb9535969140d3dd6cd5cfb05ebecbe47114c91367671a3c5e3c055198bf92155ee7eee628beadd05179476a2f3109fcbeb3a2
     HEAD_REF master
     PATCHES fix-warning4189.patch
 )

From e581999591e889c4e227d6dd1ba5e413b20e5ec3 Mon Sep 17 00:00:00 2001
From: kevinlul <6320810+kevinlul@users.noreply.github.com>
Date: Fri, 10 Jul 2020 20:05:34 -0400
Subject: [PATCH 3/8] [spdlog] Update to 1.7.0

---
 ports/spdlog/CONTROL        | 2 +-
 ports/spdlog/portfile.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL
index 9005193609cad1..8636d8ba951701 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 0c8b0df72c3458..844575c134759a 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
 )
 

From aec0695a9b5aa26ca88ddb025a3e9b76f7290901 Mon Sep 17 00:00:00 2001
From: Kevin Lu <6320810+kevinlul@users.noreply.github.com>
Date: Fri, 17 Jul 2020 02:06:08 -0400
Subject: [PATCH 4/8] [quill] Patch for fmt 7.x

---
 ports/quill/CONTROL        |  1 +
 ports/quill/portfile.cmake | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/quill/CONTROL b/ports/quill/CONTROL
index c69e4ffab6da44..4142f13436904f 100644
--- a/ports/quill/CONTROL
+++ b/ports/quill/CONTROL
@@ -1,5 +1,6 @@
 Source: quill
 Version: 1.3.1
+Port-Version: 1
 Homepage: https://github.com/odygrd/quill/
 Description: C++14 Asynchronous Low Latency Logging Library
 Supports: !(arm|arm64|uwp|android)
diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake
index 9f35ddc2b28681..c8868145d4141b 100644
--- a/ports/quill/portfile.cmake
+++ b/ports/quill/portfile.cmake
@@ -9,8 +9,13 @@ vcpkg_from_github(
 )
 
 # remove bundled fmt
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/quill/quill/include/quill/bundled/fmt)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/quill/quill/src/bundled/fmt)
+file(REMOVE_RECURSE ${SOURCE_PATH}/quill/include/quill/bundled/fmt)
+file(REMOVE_RECURSE ${SOURCE_PATH}/quill/src/bundled/fmt)
+
+vcpkg_replace_string(${SOURCE_PATH}/quill/include/quill/detail/LogMacros.h
+    "fmt::internal"
+    "fmt::detail"
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -24,5 +29,5 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/quill)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-					
+
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

From 97dcc3cd6409a9ec0ecb400ab50ac8af88d2700b Mon Sep 17 00:00:00 2001
From: kevinlul <6320810+kevinlul@users.noreply.github.com>
Date: Wed, 29 Jul 2020 23:10:07 -0400
Subject: [PATCH 5/8] [fmt] Update to 7.0.2

---
 ports/fmt/CONTROL        | 2 +-
 ports/fmt/portfile.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL
index 543bd03c0f4947..c14780bbbb051e 100644
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@@ -1,4 +1,4 @@
 Source: fmt
-Version: 7.0.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 241ebd79b8e381..41daef948bce45 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 f19b1a521ee8b606dedcadfda69fd10ddf882753#version 7.0.1
-    SHA512 381ed49c286b541fed1e8d6206bb9535969140d3dd6cd5cfb05ebecbe47114c91367671a3c5e3c055198bf92155ee7eee628beadd05179476a2f3109fcbeb3a2
+    REF b9d749095e3397f154e2938f96dd11912f2d9300#version 7.0.2
+    SHA512 5e81369ba97fb9e7fbaeed87b23fc7f1db1459d5c67eba1d92a697840fa004097d714127381aa2aa1437f5730b27e38a71e3ddf6a4a73c8d5eeaa32b3efb3d80
     HEAD_REF master
     PATCHES fix-warning4189.patch
 )

From 73dceb304e8b13eaa423da7fba6ffe390a5c1b16 Mon Sep 17 00:00:00 2001
From: kevinlul <6320810+kevinlul@users.noreply.github.com>
Date: Thu, 30 Jul 2020 22:35:57 -0400
Subject: [PATCH 6/8] [quill] Update baseline

---
 scripts/ci.baseline.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 5546c1f1ae9aec..2c1f3d4760e378 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -629,9 +629,9 @@ jinja2cpplight:arm-uwp=fail
 jinja2cpplight:x64-uwp=fail
 keystone:arm-uwp=fail
 keystone:x64-uwp=fail
-kfr:arm64-windows=fail
+kfr:arm64-windows=fail
 kfr:arm-uwp=fail
-kfr:x64-linux=fail
+kfr:x64-linux=fail
 kinectsdk1:arm64-windows=fail
 kinectsdk1:arm-uwp=fail
 kinectsdk1:x64-linux=fail
@@ -1465,9 +1465,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

From 67b9e6cd8c6940328d54a60262a6faa7d4906bea Mon Sep 17 00:00:00 2001
From: kevinlul <6320810+kevinlul@users.noreply.github.com>
Date: Thu, 30 Jul 2020 23:03:32 -0400
Subject: [PATCH 7/8] [fmt] Use vcpkg_replace_string

---
 ports/fmt/portfile.cmake | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index 41daef948bce45..f4ea7b4abf0750 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -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)

From 288cf69b17e75e202cf9a5d1a76efa2b5b67d600 Mon Sep 17 00:00:00 2001
From: Nicole Mazzuca <mazzucan@outlook.com>
Date: Wed, 5 Aug 2020 16:24:59 -0700
Subject: [PATCH 8/8] remove unnecessary change to `SOURCE_PATH`

---
 ports/quill/portfile.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake
index e270fcc5839f8b..61ad68227be8a9 100644
--- a/ports/quill/portfile.cmake
+++ b/ports/quill/portfile.cmake
@@ -9,8 +9,8 @@ vcpkg_from_github(
 )
 
 # remove bundled fmt
-file(REMOVE_RECURSE ${SOURCE_PATH}/quill/include/quill/bundled/fmt)
-file(REMOVE_RECURSE ${SOURCE_PATH}/quill/src/bundled/fmt)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/quill/quill/include/quill/bundled/fmt)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/quill/quill/src/bundled/fmt)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -24,5 +24,5 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/quill)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
+					
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)