YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-11-11 10:59:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] prevent connection crashes on older iOS versions

Browse Source
This commit is contained in:
dijunkun
2026-11-11 01:38:26 +08:00
parent 6898df7cdc
commit f0f0a68ec6
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/CrossDeskMobile.xcodeproj/project.pbxproj
+2 -2
View File
@@ -515,7 +515,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 6;
ENABLE_BITCODE = NO;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -567,7 +567,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 6;
ENABLE_BITCODE = NO;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
apps/ios/scripts/build_minirtc_ios.sh
+10 -3
View File
@@ -282,7 +282,7 @@ TEMP_MANIFEST="${MERGE_MANIFEST}.tmp"
trap 'rm -f "${TEMP_LIBRARY}" "${TEMP_MANIFEST}"' EXIT
# Check the actual archive, including when reusing cached build products.
verify_no_openh264() {
verify_native_symbols() {
local symbols
symbols="$(DEVELOPER_DIR="${XMAKE_DEVELOPER_DIR}" xcrun nm -g "$1")"
if [[ "${symbols}" == *WelsCreateDecoder* || \
@@ -291,6 +291,13 @@ verify_no_openh264() {
print -u2 "OpenH264 symbols must not be present in the iOS native archive: $1"
exit 65
fi
# New Apple SDKs export pipe2 as a weak import for older deployment targets.
# GLib must use pipe + fcntl; an unconditional pipe2 call crashes during ICE
# setup on iOS versions that do not provide it. Check cached archives too.
if print -r -- "${symbols}" | /usr/bin/awk '$NF == "_pipe2" { found = 1 } END { exit !found }'; then
print -u2 "pipe2 must not be present in the iOS native archive; rebuild GLib with the iOS compatibility recipe: $1"
exit 65
fi
}
# Hash contents as well as paths so same-size archives replaced within the same
@@ -299,7 +306,7 @@ verify_no_openh264() {
shasum -a 256 "${SCRIPT_DIR}/build_minirtc_ios.sh" "${MINIRTC_LIBRARY}" \
"${DEPENDENCY_ARCHIVES[@]}" "${WIRE_LIBRARY}" > "${TEMP_MANIFEST}"
if [[ -f "${OUTPUT_LIBRARY}" ]] && cmp -s "${TEMP_MANIFEST}" "${MERGE_MANIFEST}"; then
verify_no_openh264 "${OUTPUT_LIBRARY}"
verify_native_symbols "${OUTPUT_LIBRARY}"
print "Up to date: ${OUTPUT_LIBRARY}"
exit 0
fi
@@ -309,7 +316,7 @@ fi
/usr/bin/libtool -static -no_warning_for_no_symbols -o "${TEMP_LIBRARY}" \
"${MINIRTC_LIBRARY}" "${MERGE_ARCHIVES[@]}" \
"${WIRE_LIBRARY}"
verify_no_openh264 "${TEMP_LIBRARY}"
verify_native_symbols "${TEMP_LIBRARY}"
mv -f "${TEMP_LIBRARY}" "${OUTPUT_LIBRARY}"
mv -f "${TEMP_MANIFEST}" "${MERGE_MANIFEST}"