Skip to content

Commit f876236

Browse files
pyquickpyquick
committed
Merge branch 'macos-next'
2 parents 8a4ab48 + cea0453 commit f876236

File tree

187 files changed

+11813
-4410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+11813
-4410
lines changed

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
open_collective: oclp-r

‎.github/workflows/build-app-wxpython.yml‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
name: CI - Build wxPython
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- 'docs/**'
7+
workflow_dispatch:
8+
release:
9+
types: [published]
10+
11+
jobs:
12+
build:
13+
name: Build wxPython
14+
runs-on: macos-15-intel
15+
if: github.repository_owner == 'hackdoc'
16+
17+
env:
18+
# GitHub Information
19+
branch: ${{ github.ref }}
20+
commiturl: ${{ github.event.head_commit.url }}${{ github.event.release.html_url }}
21+
commitdate: ${{ github.event.head_commit.timestamp }}${{ github.event.release.published_at }}
22+
23+
steps:
24+
- uses: actions/checkout@v4
25+
- name: Set up Python
26+
uses: actions/setup-python@v5
27+
with:
28+
python-version: '3.12'
29+
- name: Install Dependencies
30+
run: |
31+
rm -rf Univ*
32+
rm -rf *pay*.dmg
33+
/Library/Frameworks/Python.framework/Versions/3.12/bin/python3 -m pip install -r requirements.txt
34+
35+
- name: Force x86_64 charset for Python
36+
run: |
37+
/Library/Frameworks/Python.framework/Versions/3.12/bin/python3 -m pip uninstall -y charset_normalizer
38+
/Library/Frameworks/Python.framework/Versions/3.12/bin/python3 -m pip download --platform macosx_10_13_x86_64 --only-binary=:all: charset-normalizer
39+
/Library/Frameworks/Python.framework/Versions/3.12/bin/python3 -m pip install charset_normalizer-3.4.4-cp312-cp312-macosx_10_13_universal2.whl
40+
41+
- name: Prepare Assets (--prepare-assets)
42+
43+
run: >
44+
/Library/Frameworks/Python.framework/Versions/3.12/bin/python3 Build-Project.command
45+
--run-as-individual-steps
46+
--prepare-assets
47+
48+
- name: Prepare Application (--prepare-application)
49+
run: >
50+
/Library/Frameworks/Python.framework/Versions/3.12/bin/python3 Build-Project.command
51+
--git-branch "${{ env.branch }}" --git-commit-url "${{ env.commiturl }}" --git-commit-date "${{ env.commitdate }}"
52+
--reset-pyinstaller-cache
53+
--run-as-individual-steps
54+
--prepare-application
55+
56+
- name: Prepare Package (--prepare-package)
57+
run: >
58+
/Library/Frameworks/Python.framework/Versions/3.12/bin/python3 Build-Project.command
59+
--run-as-individual-steps
60+
--prepare-package
61+
- name: Upload AutoPkg Package to Artifacts
62+
uses: actions/upload-artifact@v4
63+
with:
64+
name: AutoPkg-Assets.pkg
65+
path: ./dist/AutoPkg-Assets.pkg
66+
67+
- name: Upload Installation Package to Artifacts
68+
uses: actions/upload-artifact@v4
69+
with:
70+
name: OCLP-R.pkg
71+
path: ./dist/OCLP-R.pkg
72+
73+
- name: Upload Uninstaller Package to Artifacts
74+
uses: actions/upload-artifact@v4
75+
with:
76+
name: OCLP-R-Uninstaller.pkg
77+
path: ./dist/OCLP-R-Uninstaller.pkg
78+
79+
- name: Upload AutoPkg Package to Release
80+
if: github.event_name == 'release'
81+
uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
82+
with:
83+
repo_token: ${{ secrets.GITHUB_TOKEN }}
84+
file: ./dist/AutoPkg-Assets.pkg
85+
tag: ${{ github.ref }}
86+
file_glob: true
87+
88+
- name: Upload Installation Package to Release
89+
if: github.event_name == 'release'
90+
uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
91+
with:
92+
repo_token: ${{ secrets.GITHUB_TOKEN }}
93+
file: ./dist/OCLP-R.pkg
94+
tag: ${{ github.ref }}
95+
file_glob: true
96+
97+
- name: Upload Uninstaller Package to Release
98+
if: github.event_name == 'release'
99+
uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
100+
with:
101+
repo_token: ${{ secrets.GITHUB_TOKEN }}
102+
file: ./dist/OCLP-R-Uninstaller.pkg
103+
tag: ${{ github.ref }}
104+
file_glob: true

‎.github/workflows/validate.yml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
1-
name: Validate
2-
1+
name: CI - Validation
32
on:
43
push:
54
paths-ignore:
65
- 'docs/**'
76
workflow_dispatch:
87
release:
98
types: [published]
10-
119
jobs:
1210
build:
1311
name: Validate
14-
runs-on: macos-15
15-
if: github.repository_owner == 'intsant'
12+
runs-on: macOS-15-intel
13+
if: github.repository_owner == 'hackdoc'
1614
steps:
1715
- uses: actions/checkout@v4
18-
- name: Setup Python 3.11
16+
- name: Set up Python
1917
uses: actions/setup-python@v5
2018
with:
21-
python-version: '3.11'
19+
python-version: '3.12'
2220
- name: Validate
2321
run: |
24-
/Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install -r requirements.txt
25-
/Library/Frameworks/Python.framework/Versions/3.11/bin/python3 -m pip install packaging
26-
rm -rf Univ*
27-
aria2c -x 16 "https://github.com/intsant/PatcherSupportPkg/releases/download/push-8f0fc7d8311f13b55a05287db5e873d1a19fb5a8/Universal-Binaries.dmg"
28-
/Library/Frameworks/Python.framework/Versions/3.11/bin/python3 OCLP-R-GUI.command --validate
29-
22+
/Library/Frameworks/Python.framework/Versions/3.12/bin/python3 -m pip install --upgrade pip
23+
/Library/Frameworks/Python.framework/Versions/3.12/bin/python3 -m pip install -r requirements.txt
24+
/Library/Frameworks/Python.framework/Versions/3.12/bin/python3 -m pip install packaging
25+
/Library/Frameworks/Python.framework/Versions/3.12/bin/python3 OCLP-R-GUI.command --validate

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ __pycache__/
3636
/Universal-Binaries.dmg
3737
/payloads/KDKInfo.plist
3838
/payloads/update.sh
39-
/payloads/OCLP-R.app
39+
/payloads/OpenCore-Patcher.app
4040
/.x86_64_venv
4141
*afdesign~lock~
42-
main.py
42+
main.py
43+
/.idea

‎.trae/documents/为support文件夹中的文件配置翻译.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# 为support文件夹中的文件配置翻译
2+
3+
## 目标
4+
为support文件夹中所有未配置翻译的文件创建对应的翻译函数，每个文件对应一个翻译函数。
5+
6+
## 已完成的翻译函数
7+
- arguements.py → arguements()
8+
- defaults.py → defaults()
9+
- generate_smbios.py → generate_smbios()
10+
- global_settings.py → global_settings()
11+
- install.py → install()
12+
- integrity_verification.py → integrity_verification()
13+
- kdk_handler.py → kdk_handler()
14+
15+
## 需要添加的翻译函数
16+
1. analytics_handler.py → analytics_handler()
17+
2. commit_info.py → commit_info()
18+
3. logging_handler.py → logging_handler()
19+
4. macos_installer_handler.py → macos_installer_handler()
20+
5. metallib_handler.py → metallib_handler()
21+
6. network_handler.py → network_handler()
22+
7. private.py → private()
23+
8. reroute_payloads.py → reroute_payloads()
24+
9. subprocess_wrapper.py → subprocess_wrapper()
25+
10. updates.py → updates()
26+
11. utilities.py → utilities()
27+
12. validation.py → validation()
28+
29+
## 实现步骤
30+
1. 为每个需要翻译的文件创建一个对应的翻译函数
31+
2. 每个翻译函数包含英文和中文两种语言的翻译字典
32+
3. 翻译字典包含该文件中所有需要翻译的文本
33+
4. 保持与现有翻译函数相同的格式和结构
34+
35+
## 注意事项
36+
- 每个翻译函数的命名格式为：`def 文件名():`
37+
- 翻译字典中键为英文文本，值为对应语言的翻译
38+
- 对于中文语言点(language_point==0)，提供中文翻译
39+
- 对于英文语言点(language_point==1)，保持英文原文
40+
- 确保所有需要翻译的文本都被包含在翻译字典中
41+
- 保持代码格式一致，使用相同的缩进和换行格式

‎Build-Project.command‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def main() -> None:
7878
if (args.run_as_individual_steps is False) or (args.run_as_individual_steps and args.prepare_application):
7979
# Prepare Privileged Helper Tool
8080
sign_notarize.SignAndNotarize(
81-
path=Path("./ci_tooling/privileged_helper_tool/com.intsant.oclp-r.privileged-helper"),
81+
path=Path("./ci_tooling/privileged_helper_tool/com.hackdoc.oclp-r.privileged-helper"),
8282
signing_identity=args.application_signing_identity,
8383
notarization_apple_id=args.notarization_apple_id,
8484
notarization_password=args.notarization_password,

‎CHANGELOG.md‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
1-
# OCLP-R changelog
2-
## 2.6.0
3-
## 2.5.0
1+
# OpenCore Legacy Patcher changelog
2+
3+
## 3.0.0
4+
- include 2.4.1 all changes
5+
- Add USB & WhateverGreen Patch
6+
- Add Modern Audio and VoodooHDA
7+
- Restore support for FileVault 2 on macOS 26
8+
- Add USB mappings for macOS 26
9+
- Adopt Liquid Glass-conformant app icon
10+
- Increment Binaries:
11+
- OpenCorePkg 1.0.5 - rolling (f03819e)
12+
- Some UI Update
13+
- Change the download configuration area
14+
- In China, you can use Github Proxy
15+
## 2.4.1
16+
417
- Add macOS 26 constants
518
- Allow macOS 26 Beta download
619
- Add macOS 26 USB-Map-Tahoe.kext
720
- Add macOS 15.5 apfs_aligned.efi to support FV on Tahoe
821
- Adopt Liquid Glass-conformant app icon
922
- Inject legacy USB map on USB 1.1 Macs
1023
- Enable Solarium on Nightly builds, adjust Liquid Glass icon
24+
1125
## 2.4.0
1226
- Reduce CPU usage on main UI thread
1327
- Thanks [goneng](https://github.com/goneng) for the implementation!

‎LICENSE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Redistribution and use in source and binary forms, with or without modification,
77
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
88
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
99
3. All advertising materials mentioning features or use of this software must display the following acknowledgement:
10-
This product includes software developed by Dortania and OCLP-R contributors.
11-
4. Neither the name of OCLP-R, nor the names of Dortania, Dhinak G, or Mykola Grymalyuk may be used to endorse or promote products derived from this software without specific prior written permission.
10+
This product includes software developed by Dortania and OpenCore Legacy Patcher contributors.
11+
4. Neither the name of OpenCore Legacy Patcher, nor the names of Dortania, Dhinak G, or Mykola Grymalyuk may be used to endorse or promote products derived from this software without specific prior written permission.
1212

1313
THIS SOFTWARE IS PROVIDED BY DHINAK G AND MYKOLA GRYMALYUK "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DHINAK G NOR MYKOLA GRYMALYUK BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎OCLP-R-GUI.command‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
"""
33
PyInstaller Entry Point
44
"""
5+
56
from oclp_r import main
7+
68
if __name__ == '__main__':
79
main()

‎OCLP-R-GUI.spec‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ from oclp_r import constants
1818
block_cipher = None
1919

2020
datas = [
21+
('payloads/Icon/AppIcons/Assets.car', '.'),
2122
('payloads.dmg', '.'),
2223
('Universal-Binaries.dmg', '.'),
2324
]
2425

2526
if Path("HackdocInternalResources.dmg").exists():
2627
datas.append(('HackdocInternalResources.dmg', '.'))
2728

28-
2929
a = Analysis(['OCLP-R-GUI.command'],
3030
pathex=[],
3131
binaries=[],
@@ -55,7 +55,7 @@ exe = EXE(pyz,
5555
upx=True,
5656
console=False,
5757
disable_windowed_traceback=False,
58-
target_arch="universal2",
58+
target_arch="x86_64",
5959
codesign_identity=None,
6060
entitlements_file=None)
6161

@@ -71,17 +71,18 @@ coll = COLLECT(exe,
7171
app = BUNDLE(coll,
7272
name='OCLP-R.app',
7373
icon="payloads/Icon/AppIcons/OC-Patcher.icns",
74-
bundle_identifier="com.intsant.oclp-r",
74+
bundle_identifier="com.hackdoc.oclp-r",
7575
info_plist={
7676
"CFBundleName": "OCLP-R",
7777
"CFBundleVersion": constants.Constants().patcher_version,
7878
"CFBundleShortVersionString": constants.Constants().patcher_version,
7979
"NSHumanReadableCopyright": constants.Constants().copyright_date,
80-
"LSMinimumSystemVersion": "10.10.0",
80+
"LSMinimumSystemVersion": "10.13.0",
8181
"NSRequiresAquaSystemAppearance": False,
8282
"NSHighResolutionCapable": True,
8383
"Build Date": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
8484
"BuildMachineOSBuild": subprocess.run(["/usr/bin/sw_vers", "-buildVersion"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode().strip(),
8585
"NSPrincipalClass": "NSApplication",
86-
"CFBundleIconName": "oclp",
86+
"CFBundleIconName": "oclp-r",
8787
})
88+

0 commit comments

Comments
 (0)