Skip to content

Commit ab368dc

Browse files
pugaizaiMingcongBai
authored andcommitted
flclash: update to 0.8.90
1 parent f4a74fa commit ab368dc

File tree

9 files changed

+120
-106
lines changed

9 files changed

+120
-106
lines changed

app-proxy/flclash/autobuild/build

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
abinfo "Building FlClash core .."
22
pushd "$SRCDIR"/core
3-
go build -v -ldflags='-w -s' -tags=with_gvisor -o \
3+
CGO_ENABLED=0 go build -v -ldflags='-w -s' -tags=with_gvisor -o \
44
"$SRCDIR"/libclash/linux/FlClashCore
55
popd
66

77
abinfo "Building FlClash app .."
8-
fvm flutter build linux --dart-define="APP_ENV=stable" --release
8+
fvm flutter build linux --dart-define="APP_ENV=stable" --release --verbose
99

1010
abinfo "Installing FlClash"
1111
install -Dvm644 "$SRCDIR"/assets/images/icon.png \
12-
"$PKGDIR"/usr/share/pixmaps/FlClash.png
13-
install -Dvm755 "$SRCDIR"/build/linux/"$FLUTTER_ARCH"/release/bundle/FlClash \
14-
-t "$PKGDIR"/usr/lib/"$PKGNAME"
15-
install -Dvm755 \
16-
"$SRCDIR"/build/linux/"$FLUTTER_ARCH"/release/bundle/FlClashCore -t \
17-
"$PKGDIR"/usr/lib/"$PKGNAME"
18-
cp -rv "$SRCDIR"/build/linux/"$FLUTTER_ARCH"/release/bundle/* \
19-
"$PKGDIR"/usr/lib/"$PKGNAME"
12+
"$PKGDIR"/usr/share/pixmaps/flclash.png
13+
install -dvm755 "$PKGDIR"/usr/lib/flclash
14+
cp -av "$FLUTTER_OUT"/* "$PKGDIR"/usr/lib/flclash/
2015

2116
abinfo "Creating symlink to /usr/bin ..."
22-
install -dv "$PKGDIR"/usr/bin
23-
ln -sv ../lib/"$PKGNAME"/FlClash "$PKGDIR"/usr/bin
17+
install -dvm755 "$PKGDIR"/usr/bin
18+
ln -sv ../lib/flclash/FlClash "$PKGDIR"/usr/bin/flclash

app-proxy/flclash/autobuild/defines

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ PKGNAME=flclash
22
PKGSEC=net
33
PKGDEP="gcc-runtime glib glibc gtk-3 keybinder-3.0 libayatana-appindicator \
44
mihomo-rules-dat"
5-
BUILDDEP="fvm go llvm git"
5+
BUILDDEP="fvm git go llvm"
66
PKGDES="Proxy client based on Mihomo"
77

8+
ABTYPE=self
89
USECLANG=1
910

1011
# Note: Flutter only supports amd64 and arm64

app-proxy/flclash/autobuild/overrides/usr/share/applications/FlClash.desktop renamed to app-proxy/flclash/autobuild/overrides/usr/share/applications/flclash.desktop

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
Type=Application
33
Name=FlClash
44
GenericName=FlClash
5-
Icon=FlClash
6-
Exec=FlClash %U
5+
Icon=flclash
6+
Exec=flclash %U
77
Categories=Network;
88
Keywords=FlClash;Clash;ClashMeta;Proxy;
99
StartupNotify=true

app-proxy/flclash/autobuild/patches/0002-use-system-assets.patch renamed to app-proxy/flclash/autobuild/patches/0001-Use-system-mihomo-rules-dat.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From ac1f68b5fe6e25e547e13bd2d91858dc2e5e666d Mon Sep 17 00:00:00 2001
1+
From 9372c0bed291e95289f24997a1a577e8cb03c93b Mon Sep 17 00:00:00 2001
22
From: pugaizai <[email protected]>
3-
Date: Sat, 27 Sep 2025 18:57:04 +0800
4-
Subject: [PATCH 2/4] use-system-assets
3+
Date: Tue, 30 Sep 2025 21:02:50 +0800
4+
Subject: [PATCH 1/3] Use system mihomo rules dat
55

66
---
77
lib/common/constant.dart | 8 ++++----
@@ -29,10 +29,10 @@ index b7320b0..7aac933 100644
2929
? !system.isMacOS
3030
? 40
3131
diff --git a/lib/core/controller.dart b/lib/core/controller.dart
32-
index 1cf31b6..22a9a56 100644
32+
index a8cdaf5..392ddea 100644
3333
--- a/lib/core/controller.dart
3434
+++ b/lib/core/controller.dart
35-
@@ -48,9 +48,10 @@ class CoreController {
35+
@@ -50,9 +50,10 @@ class CoreController {
3636
if (isExists) {
3737
continue;
3838
}
@@ -47,7 +47,7 @@ index 1cf31b6..22a9a56 100644
4747
} catch (e) {
4848
exit(0);
4949
diff --git a/pubspec.yaml b/pubspec.yaml
50-
index 87fac8f..fc5a232 100755
50+
index f5ce5c4..16f4205 100755
5151
--- a/pubspec.yaml
5252
+++ b/pubspec.yaml
5353
@@ -75,7 +75,6 @@ dev_dependencies:

app-proxy/flclash/autobuild/patches/0001-fix-submodules.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.

app-proxy/flclash/autobuild/patches/0003-rm-checkupdate.patch renamed to app-proxy/flclash/autobuild/patches/0002-Remove-check-update.patch

Lines changed: 69 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,61 @@
1-
From 1283d93aab20f6e53d30dbf87b8732f60fb07d8c Mon Sep 17 00:00:00 2001
1+
From d8826eee1973587a8453273cf78c903c8e1177e6 Mon Sep 17 00:00:00 2001
22
From: pugaizai <[email protected]>
3-
Date: Sat, 27 Sep 2025 19:04:25 +0800
4-
Subject: [PATCH 3/4] rm-checkupdate
3+
Date: Tue, 30 Sep 2025 21:11:06 +0800
4+
Subject: [PATCH 2/3] Remove check update
55

66
---
7-
lib/controller.dart | 45 -------------------
7+
arb/intl_en.arb | 9 +---
8+
lib/controller.dart | 42 ------------------
89
lib/l10n/intl/messages_en.dart | 17 --------
910
lib/l10n/intl/messages_ja.dart | 9 ----
1011
lib/l10n/intl/messages_ru.dart | 17 --------
1112
lib/l10n/intl/messages_zh_CN.dart | 7 ---
1213
lib/l10n/l10n.dart | 70 ------------------------------
1314
lib/views/about.dart | 20 ---------
1415
lib/views/application_setting.dart | 24 ----------
15-
8 files changed, 209 deletions(-)
16+
9 files changed, 1 insertion(+), 214 deletions(-)
1617

18+
diff --git a/arb/intl_en.arb b/arb/intl_en.arb
19+
index 0a77a23..390c494 100644
20+
--- a/arb/intl_en.arb
21+
+++ b/arb/intl_en.arb
22+
@@ -49,8 +49,6 @@
23+
"autoRunDesc": "Auto run when the application is opened",
24+
"logcat": "Logcat",
25+
"logcatDesc": "Disabling will hide the log entry",
26+
- "autoCheckUpdate": "Auto check updates",
27+
- "autoCheckUpdateDesc": "Auto check for updates when the app starts",
28+
"accessControl": "AccessControl",
29+
"accessControlDesc": "Configure application access proxy",
30+
"application": "Application",
31+
@@ -124,7 +122,6 @@
32+
"desc": "A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.",
33+
"startVpn": "Starting VPN...",
34+
"stopVpn": "Stopping VPN...",
35+
- "discovery": "Discovery a new version",
36+
"compatible": "Compatibility mode",
37+
"compatibleDesc": "Opening it will lose part of its application ability and gain the support of full amount of Clash.",
38+
"notSelectedTip": "The current proxy group cannot be selected.",
39+
@@ -147,10 +144,6 @@
40+
"addressHelp": "WebDAV server address",
41+
"addressTip": "Please enter a valid WebDAV address",
42+
"password": "Password",
43+
- "checkUpdate": "Check for updates",
44+
- "discoverNewVersion": "Discover the new version",
45+
- "checkUpdateError": "The current application is already the latest version",
46+
- "goDownload": "Go to download",
47+
"unknown": "Unknown",
48+
"geoData": "GeoData",
49+
"externalResources": "External resources",
50+
@@ -435,4 +428,4 @@
51+
"crashlyticsTip": "When enabled, automatically uploads crash logs without sensitive information when the app crashes",
52+
"appendSystemDns": "Append System DNS",
53+
"appendSystemDnsTip": "Forcefully append system DNS to the configuration"
54+
-}
55+
\ No newline at end of file
56+
+}
1757
diff --git a/lib/controller.dart b/lib/controller.dart
18-
index 9d3cad6..74eb259 100644
58+
index 294b78c..af42ad6 100644
1959
--- a/lib/controller.dart
2060
+++ b/lib/controller.dart
2161
@@ -16,7 +16,6 @@ import 'package:flutter/material.dart';
@@ -26,7 +66,7 @@ index 9d3cad6..74eb259 100644
2666

2767
import 'common/common.dart';
2868
import 'models/models.dart';
29-
@@ -456,49 +455,6 @@ class AppController {
69+
@@ -469,46 +468,6 @@ class AppController {
3070
globalState.config = Config(themeProps: defaultThemeProps);
3171
}
3272

@@ -40,9 +80,6 @@ index 9d3cad6..74eb259 100644
4080
- Map<String, dynamic>? data,
4181
- bool handleError = false,
4282
- }) async {
43-
- if (globalState.isPre) {
44-
- return;
45-
- }
4683
- if (data != null) {
4784
- final tagName = data['tag_name'];
4885
- final body = data['body'];
@@ -76,7 +113,7 @@ index 9d3cad6..74eb259 100644
76113
Future<void> _handlePreference() async {
77114
if (await preferences.isInit) {
78115
return;
79-
@@ -534,7 +490,6 @@ class AppController {
116+
@@ -544,7 +503,6 @@ class AppController {
80117
};
81118
updateTray(true);
82119
autoUpdateProfiles();
@@ -85,10 +122,10 @@ index 9d3cad6..74eb259 100644
85122
if (!_ref.read(appSettingProvider).silentLaunch) {
86123
window?.show();
87124
diff --git a/lib/l10n/intl/messages_en.dart b/lib/l10n/intl/messages_en.dart
88-
index 89d27ab..73472d4 100644
125+
index 193dd3a..5587255 100644
89126
--- a/lib/l10n/intl/messages_en.dart
90127
+++ b/lib/l10n/intl/messages_en.dart
91-
@@ -105,12 +105,6 @@ class MessageLookup extends MessageLookupByLibrary {
128+
@@ -111,12 +111,6 @@ class MessageLookup extends MessageLookupByLibrary {
92129
"Modify application related settings",
93130
),
94131
"auto": MessageLookupByLibrary.simpleMessage("Auto"),
@@ -101,7 +138,7 @@ index 89d27ab..73472d4 100644
101138
"autoCloseConnections": MessageLookupByLibrary.simpleMessage(
102139
"Auto close connections",
103140
),
104-
@@ -161,10 +155,6 @@ class MessageLookup extends MessageLookupByLibrary {
141+
@@ -167,10 +161,6 @@ class MessageLookup extends MessageLookupByLibrary {
105142
"Cancel select all",
106143
),
107144
"checkError": MessageLookupByLibrary.simpleMessage("Check error"),
@@ -112,7 +149,7 @@ index 89d27ab..73472d4 100644
112149
"checking": MessageLookupByLibrary.simpleMessage("Checking..."),
113150
"clearData": MessageLookupByLibrary.simpleMessage("Clear Data"),
114151
"clipboardExport": MessageLookupByLibrary.simpleMessage("Export clipboard"),
115-
@@ -252,12 +242,6 @@ class MessageLookup extends MessageLookupByLibrary {
152+
@@ -258,12 +248,6 @@ class MessageLookup extends MessageLookupByLibrary {
116153
"This software is only used for non-commercial purposes such as learning exchanges and scientific research. It is strictly prohibited to use this software for commercial purposes. Any commercial activity, if any, has nothing to do with this software.",
117154
),
118155
"disconnected": MessageLookupByLibrary.simpleMessage("Disconnected"),
@@ -125,7 +162,7 @@ index 89d27ab..73472d4 100644
125162
"dnsDesc": MessageLookupByLibrary.simpleMessage(
126163
"Update DNS related settings",
127164
),
128-
@@ -338,7 +322,6 @@ class MessageLookup extends MessageLookupByLibrary {
165+
@@ -344,7 +328,6 @@ class MessageLookup extends MessageLookupByLibrary {
129166
),
130167
"global": MessageLookupByLibrary.simpleMessage("Global"),
131168
"go": MessageLookupByLibrary.simpleMessage("Go"),
@@ -134,10 +171,10 @@ index 89d27ab..73472d4 100644
134171
"Do you want to cache the changes?",
135172
),
136173
diff --git a/lib/l10n/intl/messages_ja.dart b/lib/l10n/intl/messages_ja.dart
137-
index fe347aa..c1639e2 100644
174+
index e87ef2e..8603349 100644
138175
--- a/lib/l10n/intl/messages_ja.dart
139176
+++ b/lib/l10n/intl/messages_ja.dart
140-
@@ -83,10 +83,6 @@ class MessageLookup extends MessageLookupByLibrary {
177+
@@ -87,10 +87,6 @@ class MessageLookup extends MessageLookupByLibrary {
141178
"application": MessageLookupByLibrary.simpleMessage("アプリケーション"),
142179
"applicationDesc": MessageLookupByLibrary.simpleMessage("アプリ関連設定を変更"),
143180
"auto": MessageLookupByLibrary.simpleMessage("自動"),
@@ -148,7 +185,7 @@ index fe347aa..c1639e2 100644
148185
"autoCloseConnections": MessageLookupByLibrary.simpleMessage("接続を自動閉じる"),
149186
"autoCloseConnectionsDesc": MessageLookupByLibrary.simpleMessage(
150187
"ノード変更後に接続を自動閉じる",
151-
@@ -119,8 +115,6 @@ class MessageLookup extends MessageLookupByLibrary {
188+
@@ -123,8 +119,6 @@ class MessageLookup extends MessageLookupByLibrary {
152189
),
153190
"cancelSelectAll": MessageLookupByLibrary.simpleMessage("全選択解除"),
154191
"checkError": MessageLookupByLibrary.simpleMessage("確認エラー"),
@@ -157,7 +194,7 @@ index fe347aa..c1639e2 100644
157194
"checking": MessageLookupByLibrary.simpleMessage("確認中..."),
158195
"clearData": MessageLookupByLibrary.simpleMessage("データを消去"),
159196
"clipboardExport": MessageLookupByLibrary.simpleMessage("クリップボードにエクスポート"),
160-
@@ -194,8 +188,6 @@ class MessageLookup extends MessageLookupByLibrary {
197+
@@ -198,8 +192,6 @@ class MessageLookup extends MessageLookupByLibrary {
161198
"本ソフトウェアは学習交流や科学研究などの非営利目的でのみ使用されます。商用利用は厳禁です。いかなる商用活動も本ソフトウェアとは無関係です。",
162199
),
163200
"disconnected": MessageLookupByLibrary.simpleMessage("切断済み"),
@@ -166,7 +203,7 @@ index fe347aa..c1639e2 100644
166203
"dnsDesc": MessageLookupByLibrary.simpleMessage("DNS関連設定の更新"),
167204
"dnsHijacking": MessageLookupByLibrary.simpleMessage("DNSハイジャッキング"),
168205
"dnsMode": MessageLookupByLibrary.simpleMessage("DNSモード"),
169-
@@ -258,7 +250,6 @@ class MessageLookup extends MessageLookupByLibrary {
206+
@@ -262,7 +254,6 @@ class MessageLookup extends MessageLookupByLibrary {
170207
"getOriginRules": MessageLookupByLibrary.simpleMessage("元のルールを取得"),
171208
"global": MessageLookupByLibrary.simpleMessage("グローバル"),
172209
"go": MessageLookupByLibrary.simpleMessage("移動"),
@@ -175,10 +212,10 @@ index fe347aa..c1639e2 100644
175212
"host": MessageLookupByLibrary.simpleMessage("ホスト"),
176213
"hostsDesc": MessageLookupByLibrary.simpleMessage("ホストを追加"),
177214
diff --git a/lib/l10n/intl/messages_ru.dart b/lib/l10n/intl/messages_ru.dart
178-
index 858b0f4..a1ea1cf 100644
215+
index 9a7cfc9..61318bf 100644
179216
--- a/lib/l10n/intl/messages_ru.dart
180217
+++ b/lib/l10n/intl/messages_ru.dart
181-
@@ -102,12 +102,6 @@ class MessageLookup extends MessageLookupByLibrary {
218+
@@ -108,12 +108,6 @@ class MessageLookup extends MessageLookupByLibrary {
182219
"Изменение настроек, связанных с приложением",
183220
),
184221
"auto": MessageLookupByLibrary.simpleMessage("Авто"),
@@ -191,7 +228,7 @@ index 858b0f4..a1ea1cf 100644
191228
"autoCloseConnections": MessageLookupByLibrary.simpleMessage(
192229
"Автоматическое закрытие соединений",
193230
),
194-
@@ -162,10 +156,6 @@ class MessageLookup extends MessageLookupByLibrary {
231+
@@ -168,10 +162,6 @@ class MessageLookup extends MessageLookupByLibrary {
195232
"Отменить выбор всего",
196233
),
197234
"checkError": MessageLookupByLibrary.simpleMessage("Ошибка проверки"),
@@ -202,7 +239,7 @@ index 858b0f4..a1ea1cf 100644
202239
"checking": MessageLookupByLibrary.simpleMessage("Проверка..."),
203240
"clearData": MessageLookupByLibrary.simpleMessage("Очистить данные"),
204241
"clipboardExport": MessageLookupByLibrary.simpleMessage(
205-
@@ -259,12 +249,6 @@ class MessageLookup extends MessageLookupByLibrary {
242+
@@ -265,12 +255,6 @@ class MessageLookup extends MessageLookupByLibrary {
206243
"Это программное обеспечение используется только в некоммерческих целях, таких как учебные обмены и научные исследования. Запрещено использовать это программное обеспечение в коммерческих целях. Любая коммерческая деятельность, если таковая имеется, не имеет отношения к этому программному обеспечению.",
207244
),
208245
"disconnected": MessageLookupByLibrary.simpleMessage("Отключено"),
@@ -215,7 +252,7 @@ index 858b0f4..a1ea1cf 100644
215252
"dnsDesc": MessageLookupByLibrary.simpleMessage(
216253
"Обновление настроек, связанных с DNS",
217254
),
218-
@@ -353,7 +337,6 @@ class MessageLookup extends MessageLookupByLibrary {
255+
@@ -359,7 +343,6 @@ class MessageLookup extends MessageLookupByLibrary {
219256
),
220257
"global": MessageLookupByLibrary.simpleMessage("Глобальный"),
221258
"go": MessageLookupByLibrary.simpleMessage("Перейти"),
@@ -224,10 +261,10 @@ index 858b0f4..a1ea1cf 100644
224261
"Хотите сохранить изменения в кэше?",
225262
),
226263
diff --git a/lib/l10n/intl/messages_zh_CN.dart b/lib/l10n/intl/messages_zh_CN.dart
227-
index 537b4f0..bf7c11e 100644
264+
index ddc255f..a94a89b 100644
228265
--- a/lib/l10n/intl/messages_zh_CN.dart
229266
+++ b/lib/l10n/intl/messages_zh_CN.dart
230-
@@ -79,8 +79,6 @@ class MessageLookup extends MessageLookupByLibrary {
267+
@@ -81,8 +81,6 @@ class MessageLookup extends MessageLookupByLibrary {
231268
"application": MessageLookupByLibrary.simpleMessage("应用程序"),
232269
"applicationDesc": MessageLookupByLibrary.simpleMessage("修改应用程序相关设置"),
233270
"auto": MessageLookupByLibrary.simpleMessage("自动"),
@@ -236,7 +273,7 @@ index 537b4f0..bf7c11e 100644
236273
"autoCloseConnections": MessageLookupByLibrary.simpleMessage("自动关闭连接"),
237274
"autoCloseConnectionsDesc": MessageLookupByLibrary.simpleMessage(
238275
"切换节点后自动关闭连接",
239-
@@ -109,8 +107,6 @@ class MessageLookup extends MessageLookupByLibrary {
276+
@@ -111,8 +109,6 @@ class MessageLookup extends MessageLookupByLibrary {
240277
"cancelFilterSystemApp": MessageLookupByLibrary.simpleMessage("取消过滤系统应用"),
241278
"cancelSelectAll": MessageLookupByLibrary.simpleMessage("取消全选"),
242279
"checkError": MessageLookupByLibrary.simpleMessage("检测失败"),
@@ -245,7 +282,7 @@ index 537b4f0..bf7c11e 100644
245282
"checking": MessageLookupByLibrary.simpleMessage("检测中..."),
246283
"clearData": MessageLookupByLibrary.simpleMessage("清除数据"),
247284
"clipboardExport": MessageLookupByLibrary.simpleMessage("导出剪贴板"),
248-
@@ -180,8 +176,6 @@ class MessageLookup extends MessageLookupByLibrary {
285+
@@ -182,8 +178,6 @@ class MessageLookup extends MessageLookupByLibrary {
249286
"本软件仅供学习交流、科研等非商业性质的用途,严禁将本软件用于商业目的。如有任何商业行为,均与本软件无关。",
250287
),
251288
"disconnected": MessageLookupByLibrary.simpleMessage("已断开"),
@@ -254,7 +291,7 @@ index 537b4f0..bf7c11e 100644
254291
"dnsDesc": MessageLookupByLibrary.simpleMessage("更新DNS相关设置"),
255292
"dnsHijacking": MessageLookupByLibrary.simpleMessage("DNS劫持"),
256293
"dnsMode": MessageLookupByLibrary.simpleMessage("DNS模式"),
257-
@@ -234,7 +228,6 @@ class MessageLookup extends MessageLookupByLibrary {
294+
@@ -236,7 +230,6 @@ class MessageLookup extends MessageLookupByLibrary {
258295
"getOriginRules": MessageLookupByLibrary.simpleMessage("获取原始规则"),
259296
"global": MessageLookupByLibrary.simpleMessage("全局"),
260297
"go": MessageLookupByLibrary.simpleMessage("前往"),
@@ -263,7 +300,7 @@ index 537b4f0..bf7c11e 100644
263300
"host": MessageLookupByLibrary.simpleMessage("主机"),
264301
"hostsDesc": MessageLookupByLibrary.simpleMessage("追加Hosts"),
265302
diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dart
266-
index a38084d..59f5879 100644
303+
index 59747e1..d2e77d4 100644
267304
--- a/lib/l10n/l10n.dart
268305
+++ b/lib/l10n/l10n.dart
269306
@@ -404,26 +404,6 @@ class AppLocalizations {

0 commit comments

Comments
 (0)