From 0cdde69abc63cba6ff640f146fdadb69083b1ea5 Mon Sep 17 00:00:00 2001
From: Matthew Oliver <protogonoi@gmail.com>
Date: Wed, 20 Oct 2021 12:30:40 +1100
Subject: [PATCH] [fribidi][harfbuzz] Update to latest versions (#20818)

* [fribidi] Update to 1.0.11

* [harfbuzz] Update to 3.0.0

* update vcpkg.json

* update version

Co-authored-by: Jonliu1993 <13720414433@163.com>
---
 ports/fribidi/portfile.cmake  | 4 ++--
 ports/fribidi/vcpkg.json      | 3 +--
 ports/harfbuzz/portfile.cmake | 4 ++--
 ports/harfbuzz/vcpkg.json     | 2 +-
 versions/baseline.json        | 6 +++---
 versions/f-/fribidi.json      | 5 +++++
 versions/h-/harfbuzz.json     | 5 +++++
 7 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake
index 7e71fe68e2ba2c..351681839d5a8a 100644
--- a/ports/fribidi/portfile.cmake
+++ b/ports/fribidi/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fribidi/fribidi
-    REF 5464c284034da9c058269377b7f5013bb089f553 # v1.0.10
-    SHA512 82e42b022f23d6ecebac5071f997c9f46db6aa41c36f87a7f1a28a79b4ccaada10d68b233bbf687c552fc94d91f4b47161e0ef4909fd1de0b483089f1d1377f9
+    REF v1.0.11
+    SHA512 9ddb0dbfb28ee4f1d9dd5d46fe1fff75c5446bfdacaabf8647847c36ef72eec823f6e6d6d1369d67c292d680004f7113c9e69114a8fae1d73ab11a58c66a8b8a
     HEAD_REF master
 )
 
diff --git a/ports/fribidi/vcpkg.json b/ports/fribidi/vcpkg.json
index 130fbe0de0f9cb..486571ca17b405 100644
--- a/ports/fribidi/vcpkg.json
+++ b/ports/fribidi/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "fribidi",
-  "version-string": "1.0.10",
-  "port-version": 3,
+  "version": "1.0.11",
   "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)",
   "supports": "!(uwp | arm)",
   "dependencies": [
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index bb5cdc37f68a78..816dec15a75cff 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO harfbuzz/harfbuzz
-    REF 9aa6f8a93f035dd0a1e3978da495d830049480c8 # 2.9.0
-    SHA512 7ef82298e6f5e0d8a78bb6a408e2ec0a4016c7931ef69d52e75ed8e9e0b31628f2ae5ea913dcbfa7d5159412ae487400ea1391254477064ba8fb1aa0cdbe5ed9
+    REF 3.0.0
+    SHA512 69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5
     HEAD_REF master
     PATCHES
         # This patch is a workaround that is needed until the following issues are resolved upstream:
diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json
index 4bab551741e0e2..13207c7228ebd8 100644
--- a/ports/harfbuzz/vcpkg.json
+++ b/ports/harfbuzz/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "harfbuzz",
-  "version-semver": "2.9.0",
+  "version-semver": "3.0.0",
   "description": "HarfBuzz OpenType text shaping engine",
   "homepage": "https://github.com/harfbuzz/harfbuzz",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index ff150e67c6a04e..e8e77a69ff60a6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2257,8 +2257,8 @@
       "port-version": 0
     },
     "fribidi": {
-      "baseline": "1.0.10",
-      "port-version": 3
+      "baseline": "1.0.11",
+      "port-version": 0
     },
     "frozen": {
       "baseline": "2021-04-22",
@@ -2617,7 +2617,7 @@
       "port-version": 0
     },
     "harfbuzz": {
-      "baseline": "2.9.0",
+      "baseline": "3.0.0",
       "port-version": 0
     },
     "hayai": {
diff --git a/versions/f-/fribidi.json b/versions/f-/fribidi.json
index 5a3f12f4a8cbdc..86abb9f8683bd8 100644
--- a/versions/f-/fribidi.json
+++ b/versions/f-/fribidi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0e040a494c14a4fade7878bf200a0463abc21e96",
+      "version": "1.0.11",
+      "port-version": 0
+    },
     {
       "git-tree": "88696509b4e846e3f04283bcf928db39800cc4eb",
       "version-string": "1.0.10",
diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json
index 928a7b385e0edb..84a3c02af7913b 100644
--- a/versions/h-/harfbuzz.json
+++ b/versions/h-/harfbuzz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ec7e9e00eba714984a7c4b22b5c51ce0fe1c4e08",
+      "version-semver": "3.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7bc55c4f88d240855ec6c7da3907811600e61b28",
       "version-semver": "2.9.0",