From 60f251356d072ffb4b04bf6026ba767e629b672e Mon Sep 17 00:00:00 2001
From: David Matson <davidmatson@users.noreply.github.com>
Date: Wed, 31 May 2023 18:46:16 -0700
Subject: [PATCH] Use Ninja rather than MSBuild in BlingFire to support UWP.
 (#31331)

Fixes #31330.
---
 ports/blingfire/ninja.patch    | 9 +++++++++
 ports/blingfire/portfile.cmake | 3 ++-
 ports/blingfire/vcpkg.json     | 3 ++-
 versions/b-/blingfire.json     | 5 +++++
 versions/baseline.json         | 2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 ports/blingfire/ninja.patch

diff --git a/ports/blingfire/ninja.patch b/ports/blingfire/ninja.patch
new file mode 100644
index 0000000000..ae7e654f3e
--- /dev/null
+++ b/ports/blingfire/ninja.patch
@@ -0,0 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 818a3da..e8b3bed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,3 +19,3 @@ IF (WIN32 AND MSVC)
+   set (CMAKE_CXX_FLAGS " -DNDEBUG")
+-  add_compile_options("/O2" "/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256")
++  add_compile_options("/W4" "/GS" "/Gy" "/guard:cf" "/Gm-" "/Zc:inline" "/fp:precise" "/GF" "/EHsc" "/ZH:SHA_256")
+   add_compile_options("$<$<CONFIG:Debug>:/Od>")
diff --git a/ports/blingfire/portfile.cmake b/ports/blingfire/portfile.cmake
index fff750c3eb..ed09b83e45 100644
--- a/ports/blingfire/portfile.cmake
+++ b/ports/blingfire/portfile.cmake
@@ -4,11 +4,12 @@ vcpkg_from_github(
     REF c0381c68b6aa6d1b4e569888bae1642e40494a99
     SHA512 0fa15791fc815a992023bae6f30c84dda1d477bcdedcf1343d4dbe4b09b51e17fd87bf130d58e50f378ca94982a6306d7f980e3ff4522091be036428684bdcbb
     HEAD_REF master
+    PATCHES
+        ninja.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    WINDOWS_USE_MSBUILD
     OPTIONS
         ${ADDITIONAL_OPTIONS}
     )
diff --git a/ports/blingfire/vcpkg.json b/ports/blingfire/vcpkg.json
index 1a2b531a19..57e11ede93 100644
--- a/ports/blingfire/vcpkg.json
+++ b/ports/blingfire/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "blingfire",
   "version": "0.1.8.1",
+  "port-version": 1,
   "description": "BlingFire is a lightning fast Finite State machine and REgular expression manipulation library.",
   "license": "MIT",
-  "supports": "windows & !static & !uwp",
+  "supports": "windows & !static",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/versions/b-/blingfire.json b/versions/b-/blingfire.json
index 019810537d..ce4a39c589 100644
--- a/versions/b-/blingfire.json
+++ b/versions/b-/blingfire.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "70822350369b68d60a5640eca1b668e1829c8054",
+      "version": "0.1.8.1",
+      "port-version": 1
+    },
     {
       "git-tree": "8352e7a158da2568b5c67c973b3692681be8b0d6",
       "version": "0.1.8.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index 1797bb8a01..888c5998eb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -602,7 +602,7 @@
     },
     "blingfire": {
       "baseline": "0.1.8.1",
-      "port-version": 0
+      "port-version": 1
     },
     "blitz": {
       "baseline": "2020-03-25",