From 62f783268cb7c95311106ba50df7fb7d06c3b0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=95=E3=81=8F=E3=82=89=E3=81=BF=E3=81=93?=
 <lin@sz.cn.eu.org>
Date: Mon, 23 Dec 2024 09:40:41 +0300
Subject: [PATCH] fixup from upstream

---
 ports/lief/fix-fmt-v11-join.patch | 108 ------------------------------
 ports/lief/portfile.cmake         |  16 ++---
 2 files changed, 8 insertions(+), 116 deletions(-)
 delete mode 100644 ports/lief/fix-fmt-v11-join.patch

diff --git a/ports/lief/fix-fmt-v11-join.patch b/ports/lief/fix-fmt-v11-join.patch
deleted file mode 100644
index b49625613c1ed3..00000000000000
--- a/ports/lief/fix-fmt-v11-join.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/src/MachO/BuildVersion.cpp b/src/MachO/BuildVersion.cpp
-index 6b02196..980d14e 100644
---- a/src/MachO/BuildVersion.cpp
-+++ b/src/MachO/BuildVersion.cpp
-@@ -14,6 +14,7 @@
-  * limitations under the License.
-  */
- #include <spdlog/fmt/fmt.h>
-+#include <spdlog/fmt/ranges.h>
- #include "LIEF/Visitor.hpp"
- 
- #include "frozen.hpp"
-diff --git a/src/MachO/DylibCommand.cpp b/src/MachO/DylibCommand.cpp
-index f571f84..c4768d1 100644
---- a/src/MachO/DylibCommand.cpp
-+++ b/src/MachO/DylibCommand.cpp
-@@ -14,6 +14,7 @@
-  * limitations under the License.
-  */
- #include "spdlog/fmt/fmt.h"
-+#include <spdlog/fmt/ranges.h>
- #include "LIEF/utils.hpp"
- #include "LIEF/Visitor.hpp"
- 
-diff --git a/src/MachO/SourceVersion.cpp b/src/MachO/SourceVersion.cpp
-index b217229..7b49768 100644
---- a/src/MachO/SourceVersion.cpp
-+++ b/src/MachO/SourceVersion.cpp
-@@ -14,6 +14,7 @@
-  * limitations under the License.
-  */
- #include "spdlog/fmt/fmt.h"
-+#include <spdlog/fmt/ranges.h>
- #include "LIEF/Visitor.hpp"
- 
- #include "LIEF/MachO/SourceVersion.hpp"
-diff --git a/src/MachO/VersionMin.cpp b/src/MachO/VersionMin.cpp
-index e6a6c1f..c29fe65 100644
---- a/src/MachO/VersionMin.cpp
-+++ b/src/MachO/VersionMin.cpp
-@@ -14,6 +14,7 @@
-  * limitations under the License.
-  */
- #include "spdlog/fmt/fmt.h"
-+#include <spdlog/fmt/ranges.h>
- #include "LIEF/Visitor.hpp"
- 
- #include "LIEF/MachO/VersionMin.hpp"
-diff --git a/src/PE/Header.cpp b/src/PE/Header.cpp
-index 0e5d254..53f38bd 100644
---- a/src/PE/Header.cpp
-+++ b/src/PE/Header.cpp
-@@ -23,6 +23,7 @@
- #include "frozen.hpp"
- 
- #include <spdlog/fmt/fmt.h>
-+#include <spdlog/fmt/ranges.h>
- 
- namespace LIEF {
- namespace PE {
-diff --git a/src/PE/OptionalHeader.cpp b/src/PE/OptionalHeader.cpp
-index 1f03ec2..67c1d58 100644
---- a/src/PE/OptionalHeader.cpp
-+++ b/src/PE/OptionalHeader.cpp
-@@ -23,6 +23,7 @@
- #include "PE/Structures.hpp"
- 
- #include <spdlog/fmt/fmt.h>
-+#include <spdlog/fmt/ranges.h>
- 
- namespace LIEF {
- namespace PE {
-diff --git a/src/PE/TLS.cpp b/src/PE/TLS.cpp
-index 6655244..6a643f0 100644
---- a/src/PE/TLS.cpp
-+++ b/src/PE/TLS.cpp
-@@ -21,6 +21,7 @@
- #include "PE/Structures.hpp"
- 
- #include "spdlog/fmt/fmt.h"
-+#include <spdlog/fmt/ranges.h>
- 
- namespace LIEF {
- namespace PE {
-diff --git a/src/internal_utils.hpp b/src/internal_utils.hpp
-index b01b0c7..47ce1e2 100644
---- a/src/internal_utils.hpp
-+++ b/src/internal_utils.hpp
-@@ -22,6 +22,7 @@
- #include <unordered_map>
- #include <sstream>
- #include "spdlog/fmt/fmt.h"
-+#include <spdlog/fmt/ranges.h>
- 
- #include "LIEF/span.hpp"
- #include "LIEF/errors.hpp"
-diff --git a/src/logging.hpp b/src/logging.hpp
-index 61a872b..1151b63 100644
---- a/src/logging.hpp
-+++ b/src/logging.hpp
-@@ -24,6 +24,7 @@
- 
- #include <spdlog/spdlog.h>
- #include <spdlog/fmt/fmt.h>
-+#include <spdlog/fmt/ranges.h>
- 
- #define LIEF_TRACE(...) LIEF::logging::Logger::instance().trace(__VA_ARGS__)
- #define LIEF_DEBUG(...) LIEF::logging::Logger::instance().debug(__VA_ARGS__)
diff --git a/ports/lief/portfile.cmake b/ports/lief/portfile.cmake
index 64d4dbf69eee38..fb092865883107 100644
--- a/ports/lief/portfile.cmake
+++ b/ports/lief/portfile.cmake
@@ -1,3 +1,10 @@
+vcpkg_download_distfile(
+    FIX_FMT_V11_JOIN_LINUX_INCLUDE_MEMORY_PATCH
+    URLS https://github.com/lief-project/LIEF/commit/41166332a2435fdb7d2bdc5c73f9ff9b442c5459.patch?full_index=1
+    FILENAME fix-fmt-v11-join-linux-include-memory-41166332a2435fdb7d2bdc5c73f9ff9b442c5459.patch
+    SHA512 14d5f7380352bd340c16447905b8185dbd2d977c8ba245e01d982fe7fbbdffb71004b9d4fdd732bc13e71a11aa3f46a4822cdeb2277e2cec6b841492d0de5606
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lief-project/LIEF
@@ -8,18 +15,11 @@ vcpkg_from_github(
         fix-cmakelists.patch
         fix-liefconfig-cmake-in.patch
         fix-vcpkg-includes.patch
-        fix-fmt-v11-join.patch
+        "${FIX_FMT_V11_JOIN_LINUX_INCLUDE_MEMORY_PATCH}"
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/third-party")
 
-if (VCPKG_TARGET_IS_LINUX)
-    vcpkg_replace_string("${SOURCE_PATH}/src/internal_utils.hpp"
-        [[#include "LIEF/iterators.hpp"]]
-        "#include <LIEF/iterators.hpp>\n#include <memory>"
-    )
-endif()
-
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         "c-api"          LIEF_C_API             # C API