flclash: use local hotkey_manager_linux

Author: dongfengweixiao

archlinuxcn/flclash/0002-fix-early-return-when-hotkey-not-found-in-map.patch

@@ -0,0 +1,57 @@
+From fdb376d8e8189346338015eaa3e6dc6215f4ef01 Mon Sep 17 00:00:00 2001
+From: Dee HY <dongfengweixiao@hotmail.com>
+Date: Sun, 18 Jan 2026 18:12:51 +0800
+Subject: [PATCH] fix: early return when hotkey not found in map
+
+Avoid sending events for unregistered hotkeys and passing invalid
+values to keybinder_unbind by returning early when lookup fails.
+---
+ .../linux/hotkey_manager_linux_plugin.cc         | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/packages/hotkey_manager_linux/linux/hotkey_manager_linux_plugin.cc b/packages/hotkey_manager_linux/linux/hotkey_manager_linux_plugin.cc
+index 74fabe2..95fe80b 100644
+--- a/packages/hotkey_manager_linux/linux/hotkey_manager_linux_plugin.cc
++++ b/packages/hotkey_manager_linux/linux/hotkey_manager_linux_plugin.cc
+@@ -32,14 +32,14 @@ G_DEFINE_TYPE(HotkeyManagerLinuxPlugin,
+               g_object_get_type())
+ 
+ void handle_key_down(const char* keystring, void* user_data) {
+-  const char* identifier;
+-
+   std::string val = keystring;
+   auto result = std::find_if(hotkey_id_map.begin(), hotkey_id_map.end(),
+                              [val](const auto& e) { return e.second == val; });
+ 
+-  if (result != hotkey_id_map.end())
+-    identifier = result->first.c_str();
++  if (result == hotkey_id_map.end())
++    return;
++
++  const char* identifier = result->first.c_str();
+ 
+   g_autoptr(FlValue) event_data = fl_value_new_map();
+   fl_value_set_string_take(event_data, "identifier",
+@@ -103,14 +103,16 @@ static FlMethodResponse* hkm_unregister(_HotkeyManagerLinuxPlugin* self,
+                                         FlValue* args) {
+   const char* identifier =
+       fl_value_get_string(fl_value_lookup_string(args, "identifier"));
+-  const char* keystring;
+ 
+   std::string val = identifier;
+   auto result = std::find_if(hotkey_id_map.begin(), hotkey_id_map.end(),
+                              [val](const auto& e) { return e.first == val; });
+ 
+-  if (result != hotkey_id_map.end())
+-    keystring = result->second.c_str();
++  if (result == hotkey_id_map.end())
++    return FL_METHOD_RESPONSE(
++        fl_method_success_response_new(fl_value_new_bool(false)));
++
++  const char* keystring = result->second.c_str();
+ 
+   keybinder_unbind(keystring, handle_key_down);
+   hotkey_id_map.erase(identifier);
+-- 
+2.53.0
+

archlinuxcn/flclash/0002-fix-hotkey-manager.patch

@@ -0,0 +1,27 @@
+From 73ad9c98c66e9549ae51e1d42cb54bda14ae2a4b Mon Sep 17 00:00:00 2001
+From: Dee HY <dongfengweixiao@hotmail.com>
+Date: Wed, 8 Apr 2026 21:49:11 +0800
+Subject: [PATCH] use local hotkey_manager_linux
+
+---
+ pubspec.yaml | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/pubspec.yaml b/pubspec.yaml
+index cca65ac..7fbe2c7 100755
+--- a/pubspec.yaml
++++ b/pubspec.yaml
+@@ -82,6 +82,10 @@ dev_dependencies:
+ 
+   drift_dev: ^2.29.0
+ 
++dependency_overrides:
++  hotkey_manager_linux:
++    path: ../hotkey_manager/packages/hotkey_manager_linux
++
+ flutter:
+   uses-material-design: true
+   assets:
+-- 
+2.53.0
+

archlinuxcn/flclash/0003-use-local-hotkey_manager.patch

@@ -46,39 +46,36 @@ _pkgext="tar.gz"
 source=(
   "${pkgname}"::"git+https://github.com/chen08209/FlClash.git#tag=v$pkgver"
   "0001-fix-build-error.patch"
-  "0002-fix-hotkey-manager.patch"
+  "0002-fix-early-return-when-hotkey-not-found-in-map.patch"
+  "0003-use-local-hotkey_manager.patch"
   "com.follow.clash.desktop"
   "Clash.Meta::git+https://github.com/chen08209/Clash.Meta.git"
   "flutter_distributor::git+https://github.com/chen08209/flutter_distributor.git"
   "tray_manager::git+https://github.com/chen08209/tray_manager.git"
+  "hotkey_manager::git+https://github.com/leanflutter/hotkey_manager.git#tag=v0.2.3"
 )
 sha256sums=('aaf8c535929ecc642637334799f8396301fbc39a3ea25b2c9a8afdabf4a7e34d'
             'b551c46a1577758c13bdd07868d41e4de817c6184114e1b10d39e04ae572a76a'
-            '611a118c9c0c8674db1048f53923ebff655ba8303df7a6666710bd975512f864'
+            'b2791f04cd6d0752cc5b0746eec6b3b959def21eb21bfc3cf594deef8c8777d0'
+            '2c1b44a63729e8882e6f1e061d018f006450403d968aafd1046b0cdf79e50d90'
             '0601176d0b5df7aafb3c949417b7f0d98ab17d21b6fcc89c6f83a7e031bbe45d'
             'SKIP'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            '5e27abd0473496b5ec7879f10b0c934d4c886a348763eb32280f2bed65d36d66')
 
 prepare() {
-  cd "$srcdir/$pkgname"
+  cd "$srcdir/hotkey_manager"
+  patch -p1 -i "${srcdir}/0002-fix-early-return-when-hotkey-not-found-in-map.patch"
 
+  cd "$srcdir/$pkgname"
   git submodule init
   git config submodule.core/Clash.Meta.url "$srcdir/Clash.Meta"
   git config submodule.plugins/flutter_distributor.url "$srcdir/flutter_distributor"
   git config submodule.plugins/tray_manager.url "$srcdir/tray_manager"
   git -c protocol.file.allow=always submodule update
-
-  export FVM_CACHE_PATH="$SRCDEST/fvm-cache"
-  export PUB_CACHE="$SRCDEST/pub-cache"
-
-  fvm install 3.35.7
-  fvm use 3.35.7
-  fvm flutter --disable-analytics
-  fvm flutter --no-version-check pub get
-
   patch -p1 -i "${srcdir}/0001-fix-build-error.patch"
-  patch -p1 -d "${srcdir}/$pkgname/linux/flutter/ephemeral/.plugin_symlinks/hotkey_manager_linux" -i "${srcdir}/0002-fix-hotkey-manager.patch"
+  patch -p1 -i "${srcdir}/0003-use-local-hotkey_manager.patch"
 
   # go mod download
   cd "$srcdir/$pkgname/core"
@@ -87,7 +84,6 @@ prepare() {
 }
 
 build() {
-  echo "Build: $FVM_CACHE_PATH"
   # build core
   cd "$srcdir/$pkgname/core"
   if [ "$CARCH" == "aarch64" ]; then
@@ -101,7 +97,13 @@ build() {
   export TAGS="with_gvisor"
   go build -tags="$TAGS" -o "../libclash/linux/FlClashCore"
 
+  export FVM_CACHE_PATH="$SRCDEST/fvm-cache"
   cd "${srcdir}/$pkgname"
+
+  fvm install 3.35.7
+  fvm use 3.35.7
+  fvm flutter --disable-analytics
+  fvm flutter --no-version-check pub get
   fvm flutter build linux --release --dart-define=APP_ENV=stable
 }