From 3d8c3f5ec09d5539f07ed0fc6d8d90c4b420ff77 Mon Sep 17 00:00:00 2001
From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
Date: Sun, 9 Oct 2022 06:47:42 +0200
Subject: [PATCH] [mfl] Fix supports for building on normal triplets (#26951)

* fbthrift

* mfl

* version

* Disable tests

* version

* revert fbthrift
---
 ports/mfl/disable-tests.patch | 22 ++++++++++++++++++++++
 ports/mfl/portfile.cmake      | 14 ++++++--------
 ports/mfl/vcpkg.json          | 12 ++++++++++--
 versions/baseline.json        |  2 +-
 versions/m-/mfl.json          |  5 +++++
 5 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 ports/mfl/disable-tests.patch

diff --git a/ports/mfl/disable-tests.patch b/ports/mfl/disable-tests.patch
new file mode 100644
index 0000000000..276e183282
--- /dev/null
+++ b/ports/mfl/disable-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c411d11..9336e1d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,17 +18,6 @@ include(cmake/StaticAnalyzers.cmake)
+ 
+ 
+ add_subdirectory(src)
+-add_subdirectory(tests/fonts_for_tests)
+-add_subdirectory(tests/unit_tests)
+-
+-# Building approval tests causes ICE on msvc
+-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+-    add_subdirectory(tests/approval_tests)
+-endif()
+-
+-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+-    add_subdirectory(tests/fuzz_tests)
+-endif()
+ 
+ include(GNUInstallDirs)
+ 
diff --git a/ports/mfl/portfile.cmake b/ports/mfl/portfile.cmake
index 3bb9cbceb5..7c5694ca80 100644
--- a/ports/mfl/portfile.cmake
+++ b/ports/mfl/portfile.cmake
@@ -10,15 +10,13 @@ vcpkg_from_github(
     REF v0.0.1
     SHA512 a609b4ff23a01e9f9d9bf60bfa6e0b2346b054cf0c27e74e6da574dcfd2a6ead30dcb8464cf03cae2bb9995f15f01ffda5f862c0ec2744a9ad38b856ff27f073
     HEAD_REF master
+    PATCHES
+        disable-tests.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-)
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+vcpkg_cmake_install()
 
-vcpkg_install_cmake()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mfl)
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mfl)
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/mfl/vcpkg.json b/ports/mfl/vcpkg.json
index 88dc46f3c0..17f28d4cc0 100644
--- a/ports/mfl/vcpkg.json
+++ b/ports/mfl/vcpkg.json
@@ -1,16 +1,24 @@
 {
   "name": "mfl",
   "version": "0.0.1",
+  "port-version": 1,
   "description": "Computes the layout information for mathematical formulas provided in TeX-like syntax.",
   "homepage": "https://github.com/cpp-niel/mfl",
   "license": "MIT",
-  "supports": "static",
   "dependencies": [
     "cairo",
     "doctest",
     "fmt",
     "freetype",
     "harfbuzz",
-    "range-v3"
+    "range-v3",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index b171e2e9ff..93141b57d5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4722,7 +4722,7 @@
     },
     "mfl": {
       "baseline": "0.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "mgnlibs": {
       "baseline": "2019-09-29",
diff --git a/versions/m-/mfl.json b/versions/m-/mfl.json
index 37f9797621..909eeef75e 100644
--- a/versions/m-/mfl.json
+++ b/versions/m-/mfl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5ad7af919e311136c6d46434a2a71b5e064a2d67",
+      "version": "0.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "a01a0e6d38ab404c3ae58d21d734969a089ef82c",
       "version": "0.0.1",