juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 00:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
SoftFever
2026-01-05 13:32:25 +08:00
parent 444e191c2b
commit 5771f63edd
4 changed files with 42 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/modules/MacOSXBundleInfo.plist.in
View File

@@ -131,13 +131,22 @@
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<key>NSAppTransportSecurity</key>
<key>NSAppTransportSecurity</key>
<dict>
<!-- Disable App Transport Security. Resolves https://github.com/OrcaSlicer/OrcaSlicer/issues/791 -->
<key>NSAllowsArbitraryLoads</key>
<true/>
<true/>
<key>NSAllowsArbitraryLoadsInWebContent</key>
<true/>
</dict>
<!-- Sparkle 2 Auto-Update Configuration -->
<key>SUFeedURL</key>
<string>https://check-version.orcaslicer.com/appcast.xml</string>
<key>SUPublicEDKey</key>
<string>eLFARgt9i0VZQR4FtXiTL6jdwjkGr2RMPjfYCCfBWeM=</string>
<key>SUEnableAutomaticChecks</key>
<true/>
<key>SUAllowsAutomaticUpdates</key>
<true/>
</dict>
</plist>

1
src/CMakeLists.txt
View File

@@ -105,7 +105,6 @@ endif()
# Process mainfests for various platforms.
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dev-utils/platform/msw/OrcaSlicer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.rc @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dev-utils/platform/msw/OrcaSlicer.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/OrcaSlicer.manifest @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dev-utils/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
if (WIN32)
add_library(OrcaSlicer SHARED OrcaSlicer.cpp OrcaSlicer.hpp)
else ()

148
src/dev-utils/platform/osx/Info.plist.in
View File

@@ -1,148 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
<string>@SLIC3R_APP_KEY@</string>
<key>CFBundleGetInfoString</key>
<string>@SLIC3R_APP_NAME@ Copyright(C) 2021-2023 Lunkuo All Rights Reserved</string>
<key>CFBundleIconFile</key>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleName</key>
<string>@SLIC3R_APP_KEY@</string>
<key>CFBundleShortVersionString</key>
<string>@SLIC3R_APP_NAME@ @SLIC3R_BUILD_ID@</string>
<key>CFBundleIdentifier</key>
<string>com.softfever3d.orca-slic3r/</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>@SLIC3R_BUILD_ID@</string>
<key>CFBundleURLTypes</key>
<key>ATSApplicationFontsPath</key>
<string>fonts/</string>
<array>
<dict>
<key>CFBundleURLName</key>
<string>orcasliceropen url</string>
<key>CFBundleURLSchemes</key>
<array>
<string>orcasliceropen</string>
<string>orcaslicer</string>
</array>
</dict>
</array>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>stl</string>
<string>STL</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>images/stl.icns</string>
<key>CFBundleTypeName</key>
<string>STL</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LISsAppleDefaultForType</key>
<true/>
<key>LSHandlerRank</key>
<string>Alternate</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>obj</string>
<string>OBJ</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>STL</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LISsAppleDefaultForType</key>
<true/>
<key>LSHandlerRank</key>
<string>Alternate</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>amf</string>
<string>AMF</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>AMF</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LISsAppleDefaultForType</key>
<true/>
<key>LSHandlerRank</key>
<string>Alternate</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>3mf</string>
<string>3MF</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>images/OrcaSlicer.icns</string>
<key>CFBundleTypeName</key>
<string>3MF</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LISsAppleDefaultForType</key>
<true/>
<key>LSHandlerRank</key>
<string>Alternate</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>gcode</string>
<string>GCODE</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>images/gcode.icns</string>
<key>CFBundleTypeName</key>
<string>GCODE</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LISsAppleDefaultForType</key>
<true/>
<key>LSHandlerRank</key>
<string>Alternate</string>
</dict>
</array>
<key>LSMinimumSystemVersion</key>
<string>10.10</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSHighResolutionCapable</key>
<true/>
<key>LSEnvironment</key>
<dict>
<key>ASAN_OPTIONS</key>
<string>detect_container_overflow=0</string>
</dict>
<!-- Sparkle 2 Auto-Update Configuration -->
<key>SUFeedURL</key>
<string>https://check-version.orcaslicer.com/appcast.xml</string>
<key>SUPublicEDKey</key>
<string>eLFARgt9i0VZQR4FtXiTL6jdwjkGr2RMPjfYCCfBWeM=</string>
<key>SUEnableAutomaticChecks</key>
<true/>
<key>SUAllowsAutomaticUpdates</key>
<true/>
</dict>
</plist>

44
src/slic3r/GUI/UpdateManagerMac.mm
View File

@@ -88,21 +88,39 @@ void UpdateManager::init(const std::string& appcast_url, const std::string& publ
BOOST_LOG_TRIVIAL(info) << "UpdateManager: Initializing Sparkle 2";
@autoreleasepool {
// Create the delegate
s_updater_delegate = [[OrcaSparkleDelegate alloc] init];
@try {
// Create the delegate
s_updater_delegate = [[OrcaSparkleDelegate alloc] init];
// Create the standard updater controller
// This reads SUFeedURL and SUPublicEDKey from Info.plist
s_updater_controller = [[SPUStandardUpdaterController alloc]
initWithStartingUpdater:YES
updaterDelegate:s_updater_delegate
userDriverDelegate:nil];
// Create the standard updater controller
// Use startingUpdater:NO to defer startup and avoid immediate XPC errors
// This allows the app to start even if code signing prevents XPC communication
s_updater_controller = [[SPUStandardUpdaterController alloc]
initWithStartingUpdater:NO
updaterDelegate:s_updater_delegate
userDriverDelegate:nil];
if (s_updater_controller) {
s_initialized = true;
BOOST_LOG_TRIVIAL(info) << "UpdateManager: Sparkle 2 initialized successfully";
} else {
BOOST_LOG_TRIVIAL(error) << "UpdateManager: Failed to initialize Sparkle 2";
if (s_updater_controller) {
// Try to start the updater - may fail on ad-hoc signed builds
NSError *error = nil;
if ([s_updater_controller.updater startUpdater:&error]) {
s_initialized = true;
BOOST_LOG_TRIVIAL(info) << "UpdateManager: Sparkle 2 initialized successfully";
} else {
BOOST_LOG_TRIVIAL(warning) << "UpdateManager: Sparkle updater failed to start: "
<< [[error localizedDescription] UTF8String];
BOOST_LOG_TRIVIAL(warning) << "UpdateManager: This is expected for ad-hoc signed builds. "
<< "Auto-update will work in properly signed release builds.";
// Keep controller alive for potential future use
s_initialized = true;
}
} else {
BOOST_LOG_TRIVIAL(error) << "UpdateManager: Failed to create Sparkle controller";
}
}
@catch (NSException *exception) {
BOOST_LOG_TRIVIAL(error) << "UpdateManager: Exception during Sparkle init: "
<< [[exception reason] UTF8String];
}
}
}