From 1f615bcb70af3a97594a4b06d32de100e1dd7db1 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Fri, 10 Mar 2023 21:16:47 +0100
Subject: [PATCH] [mfl] fix clang build (#30102)

---
 ports/mfl/fix-clang-detection.patch | 13 +++++++++++++
 ports/mfl/portfile.cmake            |  1 +
 ports/mfl/vcpkg.json                |  2 +-
 scripts/ci.baseline.txt             |  4 +---
 versions/baseline.json              |  2 +-
 versions/m-/mfl.json                |  5 +++++
 6 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 ports/mfl/fix-clang-detection.patch

diff --git a/ports/mfl/fix-clang-detection.patch b/ports/mfl/fix-clang-detection.patch
new file mode 100644
index 0000000000..c970bb0d7b
--- /dev/null
+++ b/ports/mfl/fix-clang-detection.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake
+index 34f1cc8..bda884d 100644
+--- a/cmake/CompilerWarnings.cmake
++++ b/cmake/CompilerWarnings.cmake
+@@ -79,7 +79,7 @@ function(set_project_warnings project_name)
+ 
+     if(MSVC)
+         set(PROJECT_WARNINGS ${MSVC_WARNINGS})
+-    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
++    elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+         set(PROJECT_WARNINGS ${CLANG_WARNINGS})
+     else()
+         set(PROJECT_WARNINGS ${GCC_WARNINGS})
diff --git a/ports/mfl/portfile.cmake b/ports/mfl/portfile.cmake
index 7c5694ca80..845310f685 100644
--- a/ports/mfl/portfile.cmake
+++ b/ports/mfl/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         disable-tests.patch
+        fix-clang-detection.patch
 )
 
 vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
diff --git a/ports/mfl/vcpkg.json b/ports/mfl/vcpkg.json
index 17f28d4cc0..9cac2e0ca3 100644
--- a/ports/mfl/vcpkg.json
+++ b/ports/mfl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "mfl",
   "version": "0.0.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Computes the layout information for mathematical formulas provided in TeX-like syntax.",
   "homepage": "https://github.com/cpp-niel/mfl",
   "license": "MIT",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index ed2f3aac91..c418058ade 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -547,9 +547,7 @@ mecab:x86-windows        = skip
 # Missing dependent libraries.
 mesa:x64-linux=fail
 mesa:x64-osx=fail
-mfl:x64-linux=skip
-mfl:x64-osx=skip
-mfl:arm64-osx=skip
+mfl:x64-linux=fail # requires a c++20 compiler
 milerius-sfml-imgui:x64-windows-static=fail
 miniupnpc:arm-uwp=fail
 miniupnpc:x64-uwp=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 0326f9ae93..600f48acaf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5050,7 +5050,7 @@
     },
     "mfl": {
       "baseline": "0.0.1",
-      "port-version": 1
+      "port-version": 2
     },
     "mfx-dispatch": {
       "baseline": "1.35.1",
diff --git a/versions/m-/mfl.json b/versions/m-/mfl.json
index 909eeef75e..f495fb963d 100644
--- a/versions/m-/mfl.json
+++ b/versions/m-/mfl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a987e0da7b7b8bee335c9764cf2b8abcc6b68d2a",
+      "version": "0.0.1",
+      "port-version": 2
+    },
     {
       "git-tree": "5ad7af919e311136c6d46434a2a71b5e064a2d67",
       "version": "0.0.1",