From 101f1197bcdb3d14b46cdb9f572740f8b918d017 Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com>
Date: Thu, 15 Sep 2022 21:18:00 -0600
Subject: [PATCH] sys_patch_dict: Fix Safari 16 support for macOS Monterey

---
 CHANGELOG.md           |  3 +++
 data/sys_patch_dict.py | 10 ++++++++++
 resources/constants.py |  2 +-
 resources/sys_patch.py |  4 ++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5cd10060..2c64eb984 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@
 - Implement deeper macOS installer parsing
   - Provides better version detection than Apple provides in .app
 - Ensure WhateverGreen is always installed on Mac Pro configurations
+- Resolve Safari 16 rendering in macOS 12.6
+- Increment Binaries:
+  - PatcherSupportPkg 0.5.3 - release
 
 ## 0.4.10
 - Resolve Nvidia Kepler support in macOS 12.5 Beta 3 and newer
diff --git a/data/sys_patch_dict.py b/data/sys_patch_dict.py
index 1d60999ee..74aeaacbf 100644
--- a/data/sys_patch_dict.py
+++ b/data/sys_patch_dict.py
@@ -49,6 +49,11 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                         "SkyLight.framework":  f"10.14.6-{os_major}",
                     },
                 },
+                "Install Non-Root": {
+                    "/Library/Apple/System/Library/StagedFrameworks/Safari": {
+                        **({ "WebKit.framework":  "11.6" } if os_major >= os_data.os_data.monterey else {}),
+                    },
+                },
                 "Remove": {
                     "/System/Library/Extensions": [
                         "AMDRadeonX4000.kext",
@@ -185,6 +190,11 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                         "WebKit.framework": "11.6",
                     },
                 },
+                "Install Non-Root": {
+                    "/Library/Apple/System/Library/StagedFrameworks/Safari": {
+                        "WebKit.framework":  "11.6"
+                    },
+                },
             },
 
             # Resolve AppleGVACore crashing on MacBookPro11,3 due to mixed GPU combo
diff --git a/resources/constants.py b/resources/constants.py
index 8e62ac311..79613868c 100644
--- a/resources/constants.py
+++ b/resources/constants.py
@@ -13,7 +13,7 @@ class Constants:
     def __init__(self):
         # Patcher Versioning
         self.patcher_version = "0.4.11"  # OpenCore-Legacy-Patcher
-        self.patcher_support_pkg_version = "0.5.2"  #  PatcherSupportPkg
+        self.patcher_support_pkg_version = "0.5.3"  #  PatcherSupportPkg
         self.url_patcher_support_pkg = "https://github.com/dortania/PatcherSupportPkg/releases/download/"
         self.nightly_url_patcher_support_pkg = "https://nightly.link/dortania/PatcherSupportPkg/workflows/build/master/"
         self.discord_link = "https://discord.gg/rqdPgH8xSN"
diff --git a/resources/sys_patch.py b/resources/sys_patch.py
index 43d9efac3..5d0973ecc 100644
--- a/resources/sys_patch.py
+++ b/resources/sys_patch.py
@@ -296,6 +296,10 @@ class PatchSysVolume:
         # .kexts and .apps are deleted and replaced
         file_name_str = str(file_name)
 
+        if not Path(destination_folder).exists():
+            print(f"  - Skipping {file_name}, cannot locate {source_folder}")
+            return
+
         if file_name_str.endswith(".framework"):
             # merge with rsync
             print(f"  - Installing: {file_name}")