Merge pull request #322180 from helsinki-systems/upd/rustdesk-flutter

rustdesk-flutter: 1.2.3-2 -> 1.2.6
This commit is contained in:
0x4A6F 2024-06-25 14:07:13 +02:00 committed by GitHub
commit 467d625ad1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 945 additions and 1038 deletions

File diff suppressed because it is too large Load Diff

View File

@ -5,6 +5,7 @@
, fetchFromGitHub , fetchFromGitHub
, flutter316 , flutter316
, gst_all_1 , gst_all_1
, fuse
, libXtst , libXtst
, libaom , libaom
, libopus , libopus
@ -14,6 +15,7 @@
, libvpx , libvpx
, libxkbcommon , libxkbcommon
, libyuv , libyuv
, pam
, makeDesktopItem , makeDesktopItem
, rustPlatform , rustPlatform
, rustc , rustc
@ -23,7 +25,7 @@
flutterRustBridge = rustPlatform.buildRustPackage rec { flutterRustBridge = rustPlatform.buildRustPackage rec {
pname = "flutter_rust_bridge_codegen"; pname = "flutter_rust_bridge_codegen";
version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.2.3-2/.github/workflows/bridge.yml#L10 version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.2.6/.github/workflows/bridge.yml#L10
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fzyzcjy"; owner = "fzyzcjy";
@ -41,27 +43,27 @@
in flutter316.buildFlutterApplication rec { in flutter316.buildFlutterApplication rec {
pname = "rustdesk"; pname = "rustdesk";
version = "1.2.3-2"; version = "1.2.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rustdesk"; owner = "rustdesk";
repo = "rustdesk"; repo = "rustdesk";
rev = version; rev = version;
hash = "sha256-aIGaj338eb8/l1NTgBwrLmx5VCpgGoYpx+p/ViCJgjQ="; hash = "sha256-dEHWMtNmYeg2FSocNnzYbcW0f07zhC09G2uSC0yMZcY=";
}; };
strictDeps = true; strictDeps = true;
# Configure the Flutter/Dart build # Configure the Flutter/Dart build
sourceRoot = "${src.name}/flutter"; sourceRoot = "${src.name}/flutter";
# curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.2.3-2/flutter/pubspec.lock | yq # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.2.6/flutter/pubspec.lock | yq
pubspecLock = lib.importJSON ./pubspec.lock.json; pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = { gitHashes = {
dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow="; dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=";
desktop_multi_window = "sha256-jhhqV4srWd3oJwlKMHPpGvvdzyoH/kJtTg6AB4e9Udk="; desktop_multi_window = "sha256-YXIvTuMDj1Tx8NGtOD2Tpxy1fiQw0p5fbOMZYfKUkXQ=";
dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8="; dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=";
flutter_gpu_texture_renderer = "sha256-0znIHlZ0ashRTev2kAXU179eq/V1RJC9Hp4jAfiPh5Q="; flutter_gpu_texture_renderer = "sha256-0znIHlZ0ashRTev2kAXU179eq/V1RJC9Hp4jAfiPh5Q=";
flutter_improved_scrolling = "sha256-fKs1+JmhDVVfjyhr6Fl17pc6n++mCTjBo1PT3l/DUnc="; flutter_improved_scrolling = "sha256-fKs1+JmhDVVfjyhr6Fl17pc6n++mCTjBo1PT3l/DUnc=";
uni_links_desktop = "sha256-h3wlo31XnHELCCPlk7OSLglm9Xn/969yTllp5UkGY98="; uni_links_desktop = "sha256-h3wlo31XnHELCCPlk7OSLglm9Xn/969yT1lp5UkGY98=";
window_manager = "sha256-CUTcSl+W7Wz/Og5k9ujOdAlhKWv/gIYe58wurf9CJH4="; window_manager = "sha256-CUTcSl+W7Wz/Og5k9ujOdAlhKWv/gIYe58wurf9CJH4=";
window_size = "sha256-+lqY46ZURT0qcqPvHFXUnd83Uvfq79Xr+rw1AHqrpak="; window_size = "sha256-+lqY46ZURT0qcqPvHFXUnd83Uvfq79Xr+rw1AHqrpak=";
}; };
@ -69,25 +71,25 @@ in flutter316.buildFlutterApplication rec {
# Configure the Rust build # Configure the Rust build
cargoRoot = ".."; cargoRoot = "..";
cargoDeps = rustPlatform.importCargoLock { cargoDeps = rustPlatform.importCargoLock {
# Upstream lock file after running `cargo generate-lockfile --offline` and # Upstream lock file after removing the registry variant of core-foundation-sys
# removing the git variant of core-foundation-sys # and fixing the resulting errors by removing the other registry deps.
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"amf-0.1.0" = "sha256-4YVHndc6sCuuHhM2dc1zoOFMZt2J5nUg/UuKYsyiC+A=";
"android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4=";
"arboard-3.3.1" = "sha256-siFkyWK8VmDIhefCaRjNwVtHxRmAp95JvaTp37M6nCA="; "arboard-3.3.1" = "sha256-Pj111rxyed4/UPtB2w2yDs4R1oZktgGkbEog4o1g5IQ=";
"cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM=";
"confy-0.4.0-2" = "sha256-r5VeggXrIq5Cwxc2WSrxQDI5Gvbw979qIUQfMKHgBUI="; "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU=";
"core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g=";
"evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0=";
"hwcodec-0.2.0" = "sha256-bbAOQui7UY7FFKnwsxFUJYBG/zi9rpmOtcai3faeoeU="; "hwcodec-0.4.18" = "sha256-RTo83aWx6ZKgWCDic1IFneZZ2TC+ZCfanULeHTfOiec=";
"impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI=";
"keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; "keepawake-0.4.3" = "sha256-wDLjjhKWbCeaWbA896a5E5UMB0B/xI/84QRCUYNKX7I=";
"machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE=";
"magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg=";
"mouce-0.2.1" = "sha256-3PtNEmVMXgqKV4r3KiKTkk4oyCt4BKynniJREE+RyFk="; "mouce-0.2.1" = "sha256-3PtNEmVMXgqKV4r3KiKTkk4oyCt4BKynniJREE+RyFk=";
"pam-0.7.0" = "sha256-qe2GH6sfGEUnqLiQucYLB5rD/GyAaVtm9pAxWRb1H3Q="; "pam-0.7.0" = "sha256-aF3TkRkYuRpBcgg8RyherSfcspKNotvvxRhlg9yGwjk=";
"parity-tokio-ipc-0.7.3-3" = "sha256-oHygC811v1fXt4KWhIZU04cs4rD340I8/bczfbxpiok="; "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo=";
"parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY=";
"rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw=";
"reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc=";
"rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM=";
@ -95,8 +97,8 @@ in flutter316.buildFlutterApplication rec {
"sysinfo-0.29.10" = "sha256-O2zJGQdtXNiIwatmyIB6bu5eVyv1JS/IHkv//BDCpcY="; "sysinfo-0.29.10" = "sha256-O2zJGQdtXNiIwatmyIB6bu5eVyv1JS/IHkv//BDCpcY=";
"tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk=";
"tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU="; "tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU=";
"tokio-socks-0.5.1-2" = "sha256-x3aFJKo0XLaCGkZLtG9GYA+A/cGGedVZ8gOztWiYVUY="; "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI=";
"tray-icon-0.13.1" = "sha256-mgWgd9rafDpRFO/6YpsNDE5ZbRqCE2Y1F8PiNznLMyk="; "tray-icon-0.11.3" = "sha256-pzvrqv+R2AD8fOsTyYItLaJLa19w+lWDa8vNVGczZdY=";
"wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q=";
"webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE=";
"x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc=";
@ -107,10 +109,10 @@ in flutter316.buildFlutterApplication rec {
cargoBuildFlags = "--lib"; cargoBuildFlags = "--lib";
cargoBuildType = "release"; cargoBuildType = "release";
cargoBuildFeatures = [ cargoBuildFeatures = [
"linux-pkg-config"
"hwcodec"
"flutter" "flutter"
"flutter_texture_render" "hwcodec"
"linux-pkg-config"
"unix-file-copy-paste"
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -125,6 +127,7 @@ in flutter316.buildFlutterApplication rec {
]; ];
buildInputs = [ buildInputs = [
fuse
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gstreamer gst_all_1.gstreamer
libXtst libXtst
@ -136,6 +139,7 @@ in flutter316.buildFlutterApplication rec {
libvpx libvpx
libxkbcommon libxkbcommon
libyuv libyuv
pam
xdotool xdotool
]; ];

View File

@ -416,7 +416,7 @@
"description": { "description": {
"path": ".", "path": ".",
"ref": "HEAD", "ref": "HEAD",
"resolved-ref": "ef03db52a20a7899da135d694c071fa3866c8fb1", "resolved-ref": "60773827434eefe6d01eefa814dca9a032b970b3",
"url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window" "url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window"
}, },
"source": "git", "source": "git",
@ -984,14 +984,14 @@
"version": "0.2.1+1" "version": "0.2.1+1"
}, },
"intl": { "intl": {
"dependency": "transitive", "dependency": "direct overridden",
"description": { "description": {
"name": "intl", "name": "intl",
"sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.18.1" "version": "0.19.0"
}, },
"io": { "io": {
"dependency": "transitive", "dependency": "transitive",
@ -1057,21 +1057,21 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "material_color_utilities", "name": "material_color_utilities",
"sha256": "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41", "sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.5.0" "version": "0.8.0"
}, },
"meta": { "meta": {
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "meta", "name": "meta",
"sha256": "a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e", "sha256": "d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "1.10.0" "version": "1.11.0"
}, },
"mime": { "mime": {
"dependency": "transitive", "dependency": "transitive",
@ -1147,11 +1147,11 @@
"dependency": "direct main", "dependency": "direct main",
"description": { "description": {
"name": "path", "name": "path",
"sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917", "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "1.8.3" "version": "1.9.0"
}, },
"path_parsing": { "path_parsing": {
"dependency": "transitive", "dependency": "transitive",
@ -1903,11 +1903,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "web", "name": "web",
"sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", "sha256": "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.5.1" "version": "0.4.2"
}, },
"web_socket_channel": { "web_socket_channel": {
"dependency": "transitive", "dependency": "transitive",