Resolves an issue where Aperture fails launch under Rosetta 2.

cormiertyshawn895 · Nov 22, 2020 · 12b48a3 · 12b48a3 · Steigmeier · Aug 26, 2022
1 parent d972274
commit 12b48a3
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 12 deletions.
diff --git a/Retroactive.xcodeproj/project.pbxproj b/Retroactive.xcodeproj/project.pbxproj
@@ -987,7 +987,7 @@
 				CODE_SIGN_ENTITLEMENTS = Retroactive/Support/Retroactive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 85;
+				CURRENT_PROJECT_VERSION = 86;
 				INFOPLIST_FILE = Retroactive/Support/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1009,7 +1009,7 @@
 				CODE_SIGN_ENTITLEMENTS = Retroactive/Support/Retroactive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 85;
+				CURRENT_PROJECT_VERSION = 86;
 				INFOPLIST_FILE = Retroactive/Support/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/Retroactive/Dependencies/ApertureFixer/ApertureFixer.xcodeproj/project.pbxproj b/Retroactive/Dependencies/ApertureFixer/ApertureFixer.xcodeproj/project.pbxproj
@@ -275,7 +275,7 @@
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -303,7 +303,7 @@
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;

diff --git a/Retroactive/StepThree/ProgressViewController.swift b/Retroactive/StepThree/ProgressViewController.swift
@@ -304,6 +304,9 @@ class ProgressViewController: NSViewController, URLSessionDelegate, URLSessionDa
             let resolvedNewAppKitArg = maximizeCompatibility ? patchedAppKitPath : originalAppKitPath
             ProgressViewController.runTask(toolPath: "install_name_tool_packed", arguments: ["-change", "/Library/Frameworks/NyxAudioAnalysis.framework/Versions/A/NyxAudioAnalysis", "@executable_path/../Frameworks/NyxAudioAnalysis.framework/Versions/A/NyxAudioAnalysis", "\(appPath)/Contents/Frameworks/iLifeSlideshow.framework/Versions/A/iLifeSlideshow"], path: resourcePath)
             ProgressViewController.runTask(toolPath: "install_name_tool_packed", arguments: ["-change", maximizeCompatibility ? originalPluginManagerPath : patchedPluginManagerPath, maximizeCompatibility ? patchedPluginManagerPath : originalPluginManagerPath, "\(appPath)/Contents/MacOS/Aperture"], path: resourcePath)
+            if (maximizeCompatibility) {
+                self.runTask(toolPath: "/usr/bin/codesign", arguments: ["--force", "-s", "-", "\(pluginManagerPath)/Versions/B/PluginManager"])
+            }
             ProgressViewController.runTask(toolPath: "install_name_tool_packed", arguments: ["-change", resolvedOldAppKitArg, resolvedNewAppKitArg, "\(appPath)/Contents/Frameworks/ProKit.framework/Versions/A/ProKit"], path: resourcePath)
             ProgressViewController.runTask(toolPath: "install_name_tool_packed", arguments: ["-change", resolvedOldAppKitArg, resolvedNewAppKitArg, "\(appPath)/Contents/Frameworks/iLifeKit.framework/Versions/A/iLifeKit"], path: resourcePath)
             ProgressViewController.runTask(toolPath: "insert_dylib", arguments: [AppManager.shared.fixerBinaryRelativeToExecutablePath, "\(appPath)/Contents/MacOS/\(AppManager.shared.binaryNameOfChosenApp)", "--inplace"], path: resourcePath)

diff --git a/Retroactive/Support/ApertureFixer/Versions/A/ApertureFixer b/Retroactive/Support/ApertureFixer/Versions/A/ApertureFixer
diff --git a/Retroactive/Support/ApertureFixer/Versions/A/Resources/Info.plist b/Retroactive/Support/ApertureFixer/Versions/A/Resources/Info.plist
@@ -23,7 +23,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>8</string>
+	<string>9</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

diff --git a/Retroactive/Support/ApertureFixer/Versions/A/_CodeSignature/CodeResources b/Retroactive/Support/ApertureFixer/Versions/A/_CodeSignature/CodeResources
@@ -6,7 +6,7 @@
 	<dict>
 		<key>Resources/Info.plist</key>
 		<data>
-		CfxFYTs9HnCOP6kbb4u9WZxOboE=
+		eNo3So7AM0/IUgKn6/ZQNir15HU=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -37,11 +37,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			CfxFYTs9HnCOP6kbb4u9WZxOboE=
+			eNo3So7AM0/IUgKn6/ZQNir15HU=
 			</data>
 			<key>hash2</key>
 			<data>
-			iaBJ1O0sj1We8pE7kmX4WV5K3BPQNsN+iAjH/1nKueI=
+			KsWe/vU0SfFxHX9pzICupm1E2zT7YFEbWeRKuySN6F8=
 			</data>
 		</dict>
 	</dict>

diff --git a/Retroactive/Support/SupportPath.plist b/Retroactive/Support/SupportPath.plist
@@ -3,33 +3,36 @@
 <plist version="1.0">
 <dict>
 	<key>NewVersionVisibleTitle</key>
-    <string>Retroactive 1.9 (Build 85) adds new features and improves compatibility.</string>
+    <string>Retroactive 1.9 (Build 86) adds new features and improves compatibility.</string>
 	<key>NewVersionChangelog</key>
     <string>• Adds support for unlocking Xcode 11.7 on macOS Mojave
 • Adds support for unlocking Aperture, iPhoto and iTunes on macOS Big Sur
+• Addresses an issue where Aperture and iPhoto fail to launch under Rosetta 2
 • Resolves an issue where photos cannot be imported from removable media into Aperture
 • Fixes an issue where Final Cut Pro 7 may fail to find codecs
 </string>
 	<key>NewVersionVisibleTitlezhHans</key>
-	<string>新版本解印 1.9 (版本号 85) 包含新功能，并改进了兼容性</string>
+	<string>新版本解印 1.9 (版本号 86) 包含新功能，并改进了兼容性</string>
 	<key>NewVersionChangelogzhHans</key>
     <string>• 新增支持在 macOS Mojave 下解锁 Xcode 11.7
 • 新增支持在 macOS Big Sur 下解锁 Aperture、iPhoto 和 iTunes
+• 解决了无法在 Rosetta 2 下打开 Aperture 和 iPhoto 的问题
 • 解决了无法将照片从可移动存储介质导入至 Aperture 的问题
 • 修复了 Final Cut Pro 7 可能无法找到解码器的问题
 </string>
 	<key>NewVersionVisibleTitlezhHant</key>
-	<string>新版本解印 1.9 (版本號 85) 包含新功能，並改進了兼容性</string>
+	<string>新版本解印 1.9 (版本號 86) 包含新功能，並改進了兼容性</string>
 	<key>NewVersionChangelogzhHant</key>
     <string>• 新增支持在 macOS Mojave 下解鎖 Xcode 11.7
 • 新增支持在 macOS Big Sur 下解鎖 Aperture、iPhoto 和 iTunes
+• 解決了無法在 Rosetta 2 下打開 Aperture 和 iPhoto 的問題
 • 解決了無法將照片從可移動存儲介質導入至 Aperture 的問題
 • 修復了 Final Cut Pro 7 可能無法找到解碼器的問題
 </string>
 	<key>LatestZIP</key>
 	<string>https://github.com/cormiertyshawn895/Retroactive/releases/download/1.9/Retroactive.1.9.zip</string>
 	<key>LatestBuildNumber</key>
-	<integer>85</integer>
+	<integer>86</integer>
 	<key>SupportPathURL</key>
 	<string>https://raw.githubusercontent.com/cormiertyshawn895/Retroactive/master/Retroactive/Support/SupportPath.plist</string>
 	<key>ReleasePage</key>

diff --git a/Retroactive/Support/SupportPathTemplate.xml b/Retroactive/Support/SupportPathTemplate.xml
@@ -7,6 +7,7 @@
 	<key>NewVersionChangelog</key>
     <string>• Adds support for unlocking Xcode 11.7 on macOS Mojave
 • Adds support for unlocking Aperture, iPhoto and iTunes on macOS Big Sur
+• Addresses an issue where Aperture and iPhoto fail to launch under Rosetta 2
 • Resolves an issue where photos cannot be imported from removable media into Aperture
 • Fixes an issue where Final Cut Pro 7 may fail to find codecs
 </string>
@@ -15,6 +16,7 @@
 	<key>NewVersionChangelogzhHans</key>
     <string>• 新增支持在 macOS Mojave 下解锁 Xcode 11.7
 • 新增支持在 macOS Big Sur 下解锁 Aperture、iPhoto 和 iTunes
+• 解决了无法在 Rosetta 2 下打开 Aperture 和 iPhoto 的问题
 • 解决了无法将照片从可移动存储介质导入至 Aperture 的问题
 • 修复了 Final Cut Pro 7 可能无法找到解码器的问题
 </string>
@@ -23,6 +25,7 @@
 	<key>NewVersionChangelogzhHant</key>
     <string>• 新增支持在 macOS Mojave 下解鎖 Xcode 11.7
 • 新增支持在 macOS Big Sur 下解鎖 Aperture、iPhoto 和 iTunes
+• 解決了無法在 Rosetta 2 下打開 Aperture 和 iPhoto 的問題
 • 解決了無法將照片從可移動存儲介質導入至 Aperture 的問題
 • 修復了 Final Cut Pro 7 可能無法找到解碼器的問題
 </string>