From a3fc8c69a0894158d80f521944396bf8242fac0a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 Sep 2023 11:34:07 +0100
Subject: [PATCH 1/3] Update FontManager.ts (#11673)

(cherry picked from commit 39c4e0c41fa329570a5416b17c4213a71337af77)
---
 src/utils/FontManager.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/utils/FontManager.ts b/src/utils/FontManager.ts
index 089f800aad..7190646f65 100644
--- a/src/utils/FontManager.ts
+++ b/src/utils/FontManager.ts
@@ -31,10 +31,11 @@ function safariVersionCheck(ua: string): boolean {
             const safariVersionStr = safariVersionMatch[2];
             const macOSVersion = macOSVersionStr.split("_").map((n) => parseInt(n, 10));
             const safariVersion = safariVersionStr.split(".").map((n) => parseInt(n, 10));
-            const colrFontSupported = macOSVersion[0] >= 10 && macOSVersion[1] >= 14 && safariVersion[0] >= 12;
-            // https://www.colorfonts.wtf/ states safari supports COLR fonts from this version on
+            const colrFontSupported =
+                macOSVersion[0] >= 10 && macOSVersion[1] >= 14 && safariVersion[0] >= 12 && safariVersion[0] < 17;
+            // https://www.colorfonts.wtf/ states Safari supports COLR fonts from this version on but Safari 17 breaks it
             logger.log(
-                `COLR support on Safari requires macOS 10.14 and Safari 12, ` +
+                `COLR support on Safari requires macOS 10.14 and Safari 12-16, ` +
                     `detected Safari ${safariVersionStr} on macOS ${macOSVersionStr}, ` +
                     `COLR supported: ${colrFontSupported}`,
             );

From 837253b037cd0e454216e2f5b2a6c1eeade46ba6 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 29 Sep 2023 11:14:01 +0100
Subject: [PATCH 2/3] Prepare changelog for v3.81.1

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e10074e3f..306b63b1a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [3.81.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.81.1) (2023-09-29)
+=====================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix Emoji font on Safari 17 ([\#11673](https://github.com/matrix-org/matrix-react-sdk/pull/11673)).
+
 Changes in [3.81.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.81.0) (2023-09-26)
 =====================================================================================================
 

From ee8e9a1c9d6f84bc3591b876a5c50bc8a72aaced Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 29 Sep 2023 11:14:03 +0100
Subject: [PATCH 3/3] v3.81.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a67d4d8cde..266fef5fde 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "matrix-react-sdk",
-    "version": "3.81.0",
+    "version": "3.81.1",
     "description": "SDK for matrix.org using React",
     "author": "matrix.org",
     "repository": {