From 6e5edabf65f772da6f833c7a1bb55369b888789c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Tue, 9 Aug 2022 20:33:30 +0000
Subject: [PATCH] [harfbuzz] Fix build error (#26229)

* [harfbuzz] Fix build error

* version
---
 ports/harfbuzz/fix-win32-build.patch | 19 ++++++++++++++++---
 ports/harfbuzz/vcpkg.json            |  2 +-
 versions/baseline.json               |  2 +-
 versions/h-/harfbuzz.json            |  5 +++++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ports/harfbuzz/fix-win32-build.patch b/ports/harfbuzz/fix-win32-build.patch
index e4ad0003ed..901def6275 100644
--- a/ports/harfbuzz/fix-win32-build.patch
+++ b/ports/harfbuzz/fix-win32-build.patch
@@ -1,11 +1,24 @@
 diff --git a/src/meson.build b/src/meson.build
-index e336037a2..a7c501b78 100644
+index e336037..35af00e 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -473,7 +473,7 @@ defs_list = [harfbuzz_def]
+@@ -349,6 +349,11 @@ hb_subset_sources = files(
+   'hb-subset.hh',
+ )
+ 
++extra_hb_cpp_args = []
++if cpp.get_argument_syntax() == 'msvc'
++  extra_hb_cpp_args += ['/bigobj']
++endif
++
+ hb_subset_headers = files(
+   'hb-subset.h',
+   'hb-subset-repacker.h'
+@@ -472,8 +477,7 @@ defs_list = [harfbuzz_def]
+ 
  version = '0.@0@.0'.format(hb_version_int)
  
- extra_hb_cpp_args = []
+-extra_hb_cpp_args = []
 -if cpp.get_id() == 'msvc'
 +if cpp.get_argument_syntax() == 'msvc'
    if get_option('default_library') != 'static'
diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json
index 00ffdb46db..13bed7c385 100644
--- a/ports/harfbuzz/vcpkg.json
+++ b/ports/harfbuzz/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "harfbuzz",
   "version": "5.0.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "HarfBuzz OpenType text shaping engine",
   "homepage": "https://github.com/harfbuzz/harfbuzz",
   "license": "MIT-Modern-Variant",
diff --git a/versions/baseline.json b/versions/baseline.json
index 4d0b22640d..04efbcfb08 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2794,7 +2794,7 @@
     },
     "harfbuzz": {
       "baseline": "5.0.1",
-      "port-version": 1
+      "port-version": 2
     },
     "hash-library": {
       "baseline": "8",
diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json
index ecf2a9a040..af7dd766c8 100644
--- a/versions/h-/harfbuzz.json
+++ b/versions/h-/harfbuzz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "64cea6fad2515aeabcdb82768bbb9b4b30db7af6",
+      "version": "5.0.1",
+      "port-version": 2
+    },
     {
       "git-tree": "890fd1dc4836a76fac4de6ee409c762ac0afe587",
       "version": "5.0.1",