From abc1ca5ec93942bdec4e45cba15bde4fcab89ce0 Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com>
Date: Sat, 19 Jun 2021 20:47:32 -0600
Subject: [PATCH] Fix Google Fonts rendering for HD4000

---
 CHANGELOG.md           | 5 +++--
 Resources/Constants.py | 6 +++++-
 Resources/SysPatch.py  | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bb5154f1..81d986c1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,13 +3,14 @@
 ## 0.2.0
 
 - Refactor device probe logic
-- Implement PatcherSupportPkg v0.0.3
+- Implement PatcherSupportPkg v0.0.6
   - Reduces binary sizes depending on OS
   - Deprecates Apple-Binaries-OCLP
-- Fix full screen and Airplay to Mac support for Intel HD4000 iGPUs
+- Fix full screen and Airplay to Mac support for Intel HD4000 iGPUs in Monterey
 - Automatically set `CMIO_Unit_Input_ASC.DoNotUseOpenCL` on TeraScale 2 GPUs
 - Fix Country Code detection on Wireless Cards
 - Add Windows detection and prompt during installation
+- Fix Google Fonts rendering for Intel HD4000 iGPUs in Monterey
 
 ## 0.1.9
 - Fix incorrect AMFI and SIP detection
diff --git a/Resources/Constants.py b/Resources/Constants.py
index 0690bf6e7..682ad4231 100644
--- a/Resources/Constants.py
+++ b/Resources/Constants.py
@@ -42,7 +42,7 @@ class Constants:
         self.debugenhancer_version = "1.0.3"
         self.innie_version = "1.3.0"
         self.fw_kext = "1.0.0"
-        self.patcher_support_pkg_version = "0.0.4"  # PatcherSupportPkg
+        self.patcher_support_pkg_version = "0.0.6"  # PatcherSupportPkg
 
         # Get resource path
         self.current_path = Path(__file__).parent.parent.resolve()
@@ -435,6 +435,10 @@ class Constants:
     def payload_apple_frameworks_path_accel_ts2(self):
         return self.payload_apple_frameworks_path / Path("Graphics-Acceleration-TeraScale-2")
 
+    @property
+    def payload_apple_frameworks_path_accel_ivy(self):
+        return self.payload_apple_frameworks_path / Path("Graphics-Acceleration-Ivy-Bridge")
+
     @property
     def payload_apple_lauchd_path(self):
         return self.payload_apple_root_path / Path("LaunchDaemons")
diff --git a/Resources/SysPatch.py b/Resources/SysPatch.py
index 066419ad9..755c88af1 100644
--- a/Resources/SysPatch.py
+++ b/Resources/SysPatch.py
@@ -203,6 +203,8 @@ class PatchSysVolume:
         self.add_new_binaries(SysPatchArray.AddIntelGen3Accel, self.constants.legacy_intel_gen3_path)
         print("- Fixing Acceleration in CoreMedia")
         subprocess.run(["defaults", "write", "com.apple.coremedia", "hardwareVideoDecoder", "-string", "disable"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
+        print("- Merging Ivy Bridge Frameworks")
+        self.elevated(["ditto", self.constants.payload_apple_frameworks_path_accel_ivy, self.mount_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
 
     def gpu_accel_legacy_extended(self):
         print("- Merging general legacy Frameworks")