improve patch & delete launchpad patch

pyquick · pyquick · commit 8ba19fcc4c6b · 2025-11-30T17:38:00.000+08:00
diff --git a/.github/workflows/build-app-wxpython.yml b/.github/workflows/build-app-wxpython.yml
@@ -29,7 +29,7 @@ jobs:
           rm -rf *pay*.dmg
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install -r requirements.txt
 
-          aria2c -x 16 "https://github.com/hackdoc/PatcherSupportPkg/releases/download/1.10.1-pre/Universal-Binaries.dmg"
+          aria2c -x 16 "https://github.com/hackdoc/PatcherSupportPkg/releases/download/1.10.1/Universal-Binaries.dmg"
 
       - name: Force Universal2 charset for Python
         run: |
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -25,5 +25,5 @@ jobs:
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install -r requirements.txt
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install packaging
           rm -rf Univ*
-          aria2c -x 16 "https://github.com/hackdoc/PatcherSupportPkg/releases/download/1.10.1-pre/Universal-Binaries.dmg"
+          aria2c -x 16 "https://github.com/hackdoc/PatcherSupportPkg/releases/download/1.10.1/Universal-Binaries.dmg"
           /Library/Frameworks/Python.framework/Versions/3.11/bin/python3 OCLP-R-GUI.command --validate
diff --git a/oclp_r/constants.py b/oclp_r/constants.py
@@ -48,7 +48,6 @@ def __init__(self) -> None:
         self.cslvfixup_version:          str = "2.6.1"  #      CSLVFixup
         self.autopkg_version:            str = "1.0.4"  #      AutoPkgInstaller
         self.cryptexfixup_version:       str = "1.0.4"  #      CryptexFixup
-        self.launchpad_version:          str = "26.0 Beta 4"
 
 
         ## Apple
@@ -165,7 +164,7 @@ def __init__(self) -> None:
         ## Hardware
         self.computer: device_probe.Computer = None  # type: ignore
         self.custom_model:     Optional[str] = None
-        self.change_launchpad:bool = False
+        
         self.applehda_version:str="15.6"
 
         ## OpenCore Settings
diff --git a/oclp_r/sys_patch/patchsets/detect.py b/oclp_r/sys_patch/patchsets/detect.py
@@ -41,19 +41,21 @@
     display_backlight,
     gmux,
     keyboard_backlight,
-    legacy_audio,
-    legacy_usb11,
-    modern_audio,
     apfs_aligned,
-    Launch,
-    modern_usb,
     pcie_webcam,
     t1_security,
     cpu_missing_avx,
-    voodoo_audio,
     
 )
-
+from .hardware.USB import (
+    modern_usb,
+    legacy_usb11,
+)
+from .hardware.audio import(
+    legacy_audio,
+    modern_audio,
+    voodoo_audio,
+)
 from ... import constants
 
 from ...datasets import sip_data
@@ -138,7 +140,6 @@ def __init__(self, constants: constants.Constants,
             intel_wireless_tahoe.IntelWireless,
             modern_audio.ModernAudio,
             apfs_aligned.APFSP,
-            Launch.LaunchPad,
             voodoo_audio.VoodooAudio,
             modern_usb.LegacyUSBHost,
             display_backlight.DisplayBacklight,
diff --git a/oclp_r/sys_patch/patchsets/hardware/USB/legacy_usb11.py b/oclp_r/sys_patch/patchsets/hardware/USB/legacy_usb11.py
@@ -68,7 +68,7 @@ def hardware_variant(self) -> HardwareVariant:
         """
         Type of hardware variant
         """
-        return HardwareVariant.MISCELLANEOUS
+        return HardwareVariant.USB
 
 
     def _base_patches(self) -> dict:
diff --git a/oclp_r/sys_patch/patchsets/hardware/USB/modern_usb.py b/oclp_r/sys_patch/patchsets/hardware/USB/modern_usb.py
@@ -48,7 +48,7 @@ def hardware_variant(self) -> HardwareVariant:
         """
         Type of hardware variant
         """
-        return HardwareVariant.MISCELLANEOUS
+        return HardwareVariant.USB
 
 
     def _legacy_usb_patches(self) -> dict:
diff --git a/oclp_r/sys_patch/patchsets/hardware/audio/legacy_audio.py b/oclp_r/sys_patch/patchsets/hardware/audio/legacy_audio.py
@@ -81,7 +81,7 @@ def hardware_variant(self) -> HardwareVariant:
         """
         Type of hardware variant
         """
-        return HardwareVariant.MISCELLANEOUS
+        return HardwareVariant.AUDIO
 
 
     def _missing_gop_patches(self) -> dict:
diff --git a/oclp_r/sys_patch/patchsets/hardware/audio/modern_audio.py b/oclp_r/sys_patch/patchsets/hardware/audio/modern_audio.py
@@ -61,7 +61,7 @@ def hardware_variant(self) -> HardwareVariant:
         """
         Type of hardware variant
         """
-        return HardwareVariant.MISCELLANEOUS
+        return HardwareVariant.AUDIO
 
 
     def _modern_audio_patches(self) -> dict:
@@ -75,6 +75,12 @@ def _modern_audio_patches(self) -> dict:
                         "AppleHDA.kext":      f"{self._constants.applehda_version}",
                     },
                 },
+                PatchType.REMOVE_SYSTEM_VOLUME:{
+                    "/Library/Extensions":[
+                        "AppleHDADisabler.kext" ,
+                        "VoodooHDA.kext",
+                    ],
+                },
             },
         }
 
diff --git a/oclp_r/sys_patch/patchsets/hardware/audio/voodoo_audio.py b/oclp_r/sys_patch/patchsets/hardware/audio/voodoo_audio.py
@@ -40,7 +40,7 @@ def hardware_variant(self) -> HardwareVariant:
         """
         Type of hardware variant
         """
-        return HardwareVariant.MISCELLANEOUS
+        return HardwareVariant.AUDIO
 
 
     def _voodoo_audio_patches(self) -> dict:
diff --git a/oclp_r/sys_patch/patchsets/hardware/base.py b/oclp_r/sys_patch/patchsets/hardware/base.py
@@ -23,6 +23,7 @@ class HardwareVariant(StrEnum):
     NETWORKING:    str = "Networking"
     AUDIO:         str = "Audio"
     MISCELLANEOUS: str = "Miscellaneous"
+    USB:           str = "USB"
 
 
 class HardwareVariantGraphicsSubclass(StrEnum):
diff --git a/oclp_r/sys_patch/patchsets/hardware/misc/Launch.py b/oclp_r/sys_patch/patchsets/hardware/misc/Launch.py
diff --git a/oclp_r/sys_patch/patchsets/hardware/networking/intel_wireless_tahoe.py b/oclp_r/sys_patch/patchsets/hardware/networking/intel_wireless_tahoe.py
@@ -41,7 +41,7 @@ def present(self) -> bool:
 
     def native_os(self) -> bool:
         """
-        Dropped support with macOS 26, Tahoe
+        Only support with macOS 26, Tahoe
         """
         return  self._xnu_major < os_data.tahoe.value
 
@@ -55,7 +55,7 @@ def hardware_variant(self) -> HardwareVariant:
 
     def patches(self) -> dict:
         """
-        Patches for Modern Wireless
+        Patches for Intel Wireless
         """
         if self.native_os() is True:
             return {}
diff --git a/oclp_r/sys_patch/sys_patch.py b/oclp_r/sys_patch/sys_patch.py
@@ -581,15 +581,6 @@ def start_patch(self):
 
         self._patch_root_vol()
 
-    def load_launchpad(self):
-        if self.constants.change_launchpad is True:
-            logging.info("- LaunchPad patching enabled, runing command")
-            subprocess.run("mkdir -p /Library/Preferences/FeatureFlags/Domain",capture_output=True,text=True,shell=True)
-            subprocess.run("defaults write /Library/Preferences/FeatureFlags/Domain/SpotlightUI.plist SpotlightPlus -dict Enabled -bool false",capture_output=True,text=True,shell=True)
-        else:
-            logging.info("- LaunchPad patching disabled, skiping")
-            subprocess.run("mkdir -p /Library/Preferences/FeatureFlags/Domain",capture_output=True,text=True,shell=True)
-            subprocess.run("defaults write /Library/Preferences/FeatureFlags/Domain/SpotlightUI.plist SpotlightPlus -dict Enabled -bool true",capture_output=True,text=True,shell=True)
     def start_unpatch(self) -> None:
         """
         Entry function for unpatching the root volume
diff --git a/oclp_r/wx_gui/gui_settings.py b/oclp_r/wx_gui/gui_settings.py
@@ -760,21 +760,6 @@ def _settings(self) -> dict:
                     ],
                     "condition":self.audio_check()
                 },
-                "Launchpad Version Change": {
-                    "type": "choice",
-                    "choices": [
-                        "26.0 Beta 4",
-                        "26.0 Beta 2"
-                    ],
-                    "value": self.constants.launchpad_version,
-                    "variable": "launchpad_version",
-                    "constants_variable": "launchpad_version",
-                    "description": [
-                        "   - 26.0 Beta 4: Using macOS 26.0 Beta 4 socures.",
-                        "   - 26.0 Beta 2: Using macOS 26.0 Beta 2 socures.",
-                    ],
-                    "condition":self.condition_exp("LP")
-                },
                 "wrap_around 1": {
                     "type": "wrap_around",
                 },
@@ -789,17 +774,6 @@ def _settings(self) -> dict:
                     ],
                     "condition":self.condition_exp("USB")
                 },     
-                "Allow Launchpad Patch (Exp.)": {
-                    "type": "checkbox",
-                    "value": self.constants.change_launchpad,
-                    "variable": "change_launchpad",
-                    "constants_variable": "change_launchpad",
-                    "description": [
-                        "When enabled, this will patch the LaunchPad",
-                        "on Tahoe.",
-                    ],
-                    #"condition":self.condition_exp("LP")
-                },
                 "Allow APFS Patch For Non-T2": {
                     "type": "checkbox",
                     "value": self.constants.allow_apfs_aligned_patch,
