Skip to content

Commit 11d548b

Browse files
krille-chankrille-chan
authored
Merge pull request #1298 from krille-chan/krille/fix-build-linux-flutter-3-24-1
build: Fix build linux after flutter 3.24.1 and add handy_window
2 parents e6948ee + 3ce4df8 commit 11d548b

6 files changed

+43
-54
lines changed

‎linux/flutter/generated_plugin_registrant.cc

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <file_selector_linux/file_selector_plugin.h>
1313
#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
1414
#include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
15+
#include <handy_window/handy_window_plugin.h>
1516
#include <pasteboard/pasteboard_plugin.h>
1617
#include <record_linux/record_linux_plugin.h>
1718
#include <sqlcipher_flutter_libs/sqlite3_flutter_libs_plugin.h>
@@ -37,6 +38,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
3738
g_autoptr(FlPluginRegistrar) flutter_webrtc_registrar =
3839
fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterWebRTCPlugin");
3940
flutter_web_r_t_c_plugin_register_with_registrar(flutter_webrtc_registrar);
41+
g_autoptr(FlPluginRegistrar) handy_window_registrar =
42+
fl_plugin_registry_get_registrar_for_plugin(registry, "HandyWindowPlugin");
43+
handy_window_plugin_register_with_registrar(handy_window_registrar);
4044
g_autoptr(FlPluginRegistrar) pasteboard_registrar =
4145
fl_plugin_registry_get_registrar_for_plugin(registry, "PasteboardPlugin");
4246
pasteboard_plugin_register_with_registrar(pasteboard_registrar);

‎linux/flutter/generated_plugins.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
99
file_selector_linux
1010
flutter_secure_storage_linux
1111
flutter_webrtc
12+
handy_window
1213
pasteboard
1314
record_linux
1415
sqlcipher_flutter_libs

‎linux/my_application.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@ static void my_application_activate(GApplication* application) {
6161
}
6262

6363
gtk_window_set_default_size(window, 864, 680);
64-
gtk_widget_show(GTK_WIDGET(window));
6564

6665
g_autoptr(FlDartProject) project = fl_dart_project_new();
6766
fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
6867

6968
FlView* view = fl_view_new(project);
70-
gtk_widget_show(GTK_WIDGET(view));
7169
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
7270

7371
fl_register_plugins(FL_PLUGIN_REGISTRY(view));
7472

73+
gtk_widget_show(GTK_WIDGET(window));
74+
gtk_widget_show(GTK_WIDGET(view));
7575
gtk_widget_grab_focus(GTK_WIDGET(view));
7676
}
7777

‎pubspec.lock

+26-18
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,14 @@ packages:
848848
url: "https://pub.dev"
849849
source: hosted
850850
version: "1.0.1"
851+
handy_window:
852+
dependency: "direct main"
853+
description:
854+
name: handy_window
855+
sha256: "56b813e58a68b0ee2ab22051400b8b1f1b5cfe88b8cd32288623defb3926245a"
856+
url: "https://pub.dev"
857+
source: hosted
858+
version: "0.4.0"
851859
highlighter:
852860
dependency: transitive
853861
description:
@@ -1082,18 +1090,18 @@ packages:
10821090
dependency: transitive
10831091
description:
10841092
name: leak_tracker
1085-
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
1093+
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
10861094
url: "https://pub.dev"
10871095
source: hosted
1088-
version: "10.0.4"
1096+
version: "10.0.5"
10891097
leak_tracker_flutter_testing:
10901098
dependency: transitive
10911099
description:
10921100
name: leak_tracker_flutter_testing
1093-
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
1101+
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
10941102
url: "https://pub.dev"
10951103
source: hosted
1096-
version: "3.0.3"
1104+
version: "3.0.5"
10971105
leak_tracker_testing:
10981106
dependency: transitive
10991107
description:
@@ -1194,10 +1202,10 @@ packages:
11941202
dependency: transitive
11951203
description:
11961204
name: material_color_utilities
1197-
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
1205+
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
11981206
url: "https://pub.dev"
11991207
source: hosted
1200-
version: "0.8.0"
1208+
version: "0.11.1"
12011209
matrix:
12021210
dependency: "direct main"
12031211
description:
@@ -1210,10 +1218,10 @@ packages:
12101218
dependency: transitive
12111219
description:
12121220
name: meta
1213-
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
1221+
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
12141222
url: "https://pub.dev"
12151223
source: hosted
1216-
version: "1.12.0"
1224+
version: "1.15.0"
12171225
mgrs_dart:
12181226
dependency: transitive
12191227
description:
@@ -1442,10 +1450,10 @@ packages:
14421450
dependency: transitive
14431451
description:
14441452
name: platform
1445-
sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
1453+
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
14461454
url: "https://pub.dev"
14471455
source: hosted
1448-
version: "3.1.4"
1456+
version: "3.1.5"
14491457
platform_detect:
14501458
dependency: transitive
14511459
description:
@@ -1967,26 +1975,26 @@ packages:
19671975
dependency: transitive
19681976
description:
19691977
name: test
1970-
sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073"
1978+
sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e"
19711979
url: "https://pub.dev"
19721980
source: hosted
1973-
version: "1.25.2"
1981+
version: "1.25.7"
19741982
test_api:
19751983
dependency: transitive
19761984
description:
19771985
name: test_api
1978-
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
1986+
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
19791987
url: "https://pub.dev"
19801988
source: hosted
1981-
version: "0.7.0"
1989+
version: "0.7.2"
19821990
test_core:
19831991
dependency: transitive
19841992
description:
19851993
name: test_core
1986-
sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4"
1994+
sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696"
19871995
url: "https://pub.dev"
19881996
source: hosted
1989-
version: "0.6.0"
1997+
version: "0.6.4"
19901998
timezone:
19911999
dependency: transitive
19922000
description:
@@ -2279,10 +2287,10 @@ packages:
22792287
dependency: transitive
22802288
description:
22812289
name: vm_service
2282-
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
2290+
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
22832291
url: "https://pub.dev"
22842292
source: hosted
2285-
version: "14.2.1"
2293+
version: "14.2.5"
22862294
wakelock_plus:
22872295
dependency: "direct main"
22882296
description:

‎pubspec.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ dependencies:
5252
future_loading_dialog: ^0.3.0
5353
geolocator: ^7.6.2
5454
go_router: ^14.0.1
55+
handy_window: ^0.4.0
5556
hive: ^2.2.3
5657
hive_flutter: ^1.1.0
5758
html: ^0.15.4

‎snap/snapcraft.yaml

+9-34
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: fluffychat
22
title: FluffyChat
3-
base: core22
3+
base: core24
44
version: git
55
license: AGPL-3.0
66
summary: The cutest messenger in the Matrix network
@@ -44,9 +44,11 @@ description: |
4444
grade: stable
4545
confinement: strict
4646

47-
architectures:
48-
- build-on: amd64
49-
- build-on: arm64
47+
platforms:
48+
amd64:
49+
build-on: amd64
50+
arm64:
51+
build-on: arm64
5052

5153
parts:
5254
olm:
@@ -64,40 +66,13 @@ parts:
6466
stage-snaps:
6567
- zenity-integration
6668

67-
flutter-git:
68-
source: https://github.com/flutter/flutter.git
69-
source-tag: 3.19.6
70-
source-depth: 1
71-
plugin: nil
72-
override-build: |
73-
mkdir -p $CRAFT_PART_INSTALL/usr/bin
74-
mkdir -p $CRAFT_PART_INSTALL/usr/libexec
75-
cp -r $CRAFT_PART_SRC $CRAFT_PART_INSTALL/usr/libexec/flutter
76-
ln -s $CRAFT_PART_INSTALL/usr/libexec/flutter/bin/flutter $CRAFT_PART_INSTALL/usr/bin/flutter
77-
ln -s $SNAPCRAFT_PART_INSTALL/usr/libexec/flutter/bin/dart $SNAPCRAFT_PART_INSTALL/usr/bin/dart
78-
$CRAFT_PART_INSTALL/usr/bin/flutter doctor
79-
build-packages:
80-
- clang
81-
- cmake
82-
- curl
83-
- libgtk-3-dev
84-
- ninja-build
85-
- unzip
86-
- xz-utils
87-
- zip
88-
override-prime: ''
89-
9069
fluffychat:
91-
after: [flutter-git]
92-
plugin: nil
70+
plugin: flutter
9371
source: .
9472
override-build: |
9573
# Workaround for Flutter build error:
9674
rm -rf build
97-
98-
flutter build linux --release -v
99-
mkdir -p $CRAFT_PART_INSTALL/bin/
100-
cp -r build/linux/*/release/bundle/* $CRAFT_PART_INSTALL/bin/
75+
craftctl default
10176
build-packages:
10277
- libjsoncpp-dev
10378
- curl
@@ -114,7 +89,7 @@ slots:
11489

11590
apps:
11691
fluffychat:
117-
command: bin/fluffychat
92+
command: fluffychat
11893
extensions: [ gnome ]
11994
plugs:
12095
- audio-playback

0 commit comments

Comments
 (0)