From 9be221bc5cb19975792e94e4a0687bfe6dfc39f8 Mon Sep 17 00:00:00 2001
From: RT2 <contact@rt2.fr>
Date: Wed, 22 May 2024 23:11:13 +0200
Subject: [PATCH 1/4] [quill] Update to 4.0.0

---
 ports/quill/portfile.cmake | 34 ++--------------------------------
 ports/quill/vcpkg.json     | 15 ++-------------
 2 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake
index 8af3498828a4ad..0ad666464d4b59 100644
--- a/ports/quill/portfile.cmake
+++ b/ports/quill/portfile.cmake
@@ -1,41 +1,11 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO odygrd/quill
     REF v${VERSION}
-    SHA512 ac5d0432fb8bdf074906f5858f1e795f2e4cb9b28a9e2cb5f16c5ddc172bdd6676880a1ab4f0ab073ba5b24fb76a37020c8ff3a58ece462cd8dfd4676122a4ee
+    SHA512 ab9efd4da3078e532bcff381149dcfc048c08af37f889ceb49eaad311c4235cd42fd7c503aa375134b5a301fd8b8cf96ca698ce3273c28e626e0c85577ca1ca7
     HEAD_REF master
 )
 
-if(VCPKG_TARGET_IS_ANDROID)
-    set(ADDITIONAL_OPTIONS -DQUILL_NO_THREAD_NAME_SUPPORT=ON)
-endif()
-
-vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS
-        -DQUILL_FMT_EXTERNAL=ON
-        ${ADDITIONAL_OPTIONS}
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/quill/bundled")
-
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
-endif()
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-    file(RENAME "${CURRENT_PACKAGES_DIR}/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
-endif()
-vcpkg_fixup_pkgconfig()
-
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL")
-if(VCPKG_TARGET_IS_ANDROID)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_NO_THREAD_NAME_SUPPORT" "#define QUILL_NO_THREAD_NAME_SUPPORT")
-endif()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(COPY ${SOURCE_PATH}/quill/include/ DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json
index 891ab5c78dcd47..53b6b68e7953b5 100644
--- a/ports/quill/vcpkg.json
+++ b/ports/quill/vcpkg.json
@@ -1,18 +1,7 @@
 {
   "name": "quill",
-  "version": "3.9.0",
+  "version": "4.0.0",
   "description": "C++14 Asynchronous Low Latency Logging Library",
   "homepage": "https://github.com/odygrd/quill/",
-  "license": "MIT",
-  "dependencies": [
-    "fmt",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
+  "license": "MIT"
 }

From 80d983f2ee7fc4b8dbe3c4995ce7604c144ebe24 Mon Sep 17 00:00:00 2001
From: RT2 <contact@rt2.fr>
Date: Wed, 22 May 2024 23:11:14 +0200
Subject: [PATCH 2/4] [quill] Update version files

---
 versions/baseline.json | 2 +-
 versions/q-/quill.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index a6aa9b6f284b7d..28ab966e5f7b74 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7521,7 +7521,7 @@
       "port-version": 9
     },
     "quill": {
-      "baseline": "3.9.0",
+      "baseline": "4.0.0",
       "port-version": 0
     },
     "quirc": {
diff --git a/versions/q-/quill.json b/versions/q-/quill.json
index 1706933f490cec..7aa70ff44728ca 100644
--- a/versions/q-/quill.json
+++ b/versions/q-/quill.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "224e0a690d0ac339efb2a214eb17cac414686f9f",
+      "version": "4.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "37bdd037d3be8510199f4b6cf39287542a65aff2",
       "version": "3.9.0",

From e2a0a068ab5b8d8017c1231666c4509dfa413248 Mon Sep 17 00:00:00 2001
From: RT2 <contact@rt2.fr>
Date: Sat, 25 May 2024 17:30:58 +0200
Subject: [PATCH 3/4] [quill] Update to 4.1.0

---
 ports/quill/portfile.cmake | 2 +-
 ports/quill/vcpkg.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake
index 0ad666464d4b59..f318549d1a8bf0 100644
--- a/ports/quill/portfile.cmake
+++ b/ports/quill/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO odygrd/quill
     REF v${VERSION}
-    SHA512 ab9efd4da3078e532bcff381149dcfc048c08af37f889ceb49eaad311c4235cd42fd7c503aa375134b5a301fd8b8cf96ca698ce3273c28e626e0c85577ca1ca7
+    SHA512 5bd77416f1cc2218a72d49a51eefd04a08ccd535b798d6754eb5e80931c750d9d07a80b231b5c5f839235867392320792e78fde5d4b8cdb751f3dabc1d41c6e8
     HEAD_REF master
 )
 
diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json
index 53b6b68e7953b5..b1f45d3f1190fc 100644
--- a/ports/quill/vcpkg.json
+++ b/ports/quill/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "quill",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "C++14 Asynchronous Low Latency Logging Library",
   "homepage": "https://github.com/odygrd/quill/",
   "license": "MIT"

From f31753abb470d40100ff2d281b35935dc03206b9 Mon Sep 17 00:00:00 2001
From: RT2 <contact@rt2.fr>
Date: Sat, 25 May 2024 17:34:01 +0200
Subject: [PATCH 4/4] [quill] Update version files

---
 versions/baseline.json | 2 +-
 versions/q-/quill.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 28ab966e5f7b74..83dfc3ef44ce2d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7521,7 +7521,7 @@
       "port-version": 9
     },
     "quill": {
-      "baseline": "4.0.0",
+      "baseline": "4.1.0",
       "port-version": 0
     },
     "quirc": {
diff --git a/versions/q-/quill.json b/versions/q-/quill.json
index 7aa70ff44728ca..ec223f2588a4d8 100644
--- a/versions/q-/quill.json
+++ b/versions/q-/quill.json
@@ -1,8 +1,8 @@
 {
   "versions": [
     {
-      "git-tree": "224e0a690d0ac339efb2a214eb17cac414686f9f",
-      "version": "4.0.0",
+      "git-tree": "917d334c1a784bef09f68036b78d415761f4dbbb",
+      "version": "4.1.0",
       "port-version": 0
     },
     {