Merge branch 'rustdesk:master' into master

zhangbo8418 · Dec 9, 2024 · 1079952 · 1079952
2 parents 8eab41e + 63e22b7
commit 1079952
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/flutter/build_ios.sh b/flutter/build_ios.sh
@@ -2,4 +2,6 @@
 # https://docs.flutter.dev/deployment/ios
 # flutter build ipa --release --obfuscate --split-debug-info=./split-debug-info
 # no obfuscate, because no easy to check errors
+cd $(dirname $(dirname $(which flutter)))
+git apply ~/rustdesk/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
 flutter build ipa --release
diff --git a/flutter/ios/Podfile.lock b/flutter/ios/Podfile.lock
@@ -133,7 +133,7 @@ SPEC CHECKSUMS:
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
   video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
   wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
 

diff --git a/flutter/ios/Runner/AppDelegate.swift b/flutter/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

diff --git a/flutter/ios_arm64.sh b/flutter/ios_arm64.sh
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
+cd $(dirname $(dirname $(which flutter)))
+git apply ~/rustdesk/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
 cargo build --features flutter,hwcodec --release --target aarch64-apple-ios --lib
diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock
@@ -1364,13 +1364,13 @@ packages:
     source: hosted
     version: "6.2.2"
   url_launcher_ios:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: url_launcher_ios
-      sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03"
+      sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.4"
+    version: "6.3.2"
   url_launcher_linux:
     dependency: transitive
     description:

diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
@@ -36,6 +36,7 @@ dependencies:
   #firebase_analytics: ^9.1.5
   package_info_plus: ^4.2.0
   url_launcher: ^6.2.1
+  url_launcher_ios: ^6.3.2
   toggle_switch: ^2.1.0
   dash_chat_2:
     git: