From 667697d042eae29b0a2192fb06e392a457904948 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Mon, 6 May 2024 10:58:11 +1200 Subject: [PATCH] Cleanup deps --- Cargo.lock | 570 ++++-------------- rog-control-center/Cargo.toml | 20 +- rog-control-center/src/main.rs | 6 +- .../translations/en/rog-control-center.po | 2 +- 4 files changed, 118 insertions(+), 480 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f04bbe49..04fe77a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -75,30 +75,9 @@ dependencies = [ "jni-sys", "libc", "log", - "ndk 0.8.0", + "ndk", "ndk-context", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum", - "thiserror", -] - -[[package]] -name = "android-activity" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" -dependencies = [ - "android-properties", - "bitflags 2.5.0", - "cc", - "cesu8", - "jni", - "jni-sys", - "libc", - "log", - "ndk 0.9.0", - "ndk-context", - "ndk-sys 0.6.0+11769913", + "ndk-sys", "num_enum", "thiserror", ] @@ -161,7 +140,7 @@ dependencies = [ "tinybmp", "tokio", "toml 0.5.11", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -188,7 +167,7 @@ dependencies = [ "systemd-zbus", "tokio", "udev 0.8.0", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -208,17 +187,7 @@ dependencies = [ "serde_derive", "serde_json", "smol", - "zbus 4.1.2", -] - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener 2.5.3", - "futures-core", + "zbus", ] [[package]] @@ -505,21 +474,22 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "betrayer" -version = "0.1.0" -source = "git+https://github.com/flukejones/betrayer.git#1a1277fabacc382149aac21ca45056420c47980e" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88df312fbb13c845a05ede7e91ab7b9fea442d9176d092bbdb954ae6db55ad5d" dependencies = [ - "async-io 1.13.0", - "block2 0.3.0", + "async-io 2.3.2", + "block2 0.4.0", "flume", - "icrate", + "icrate 0.1.2", "log", - "objc2 0.4.1", + "objc2 0.5.1", "once_cell", "parking_lot", "png", - "windows 0.52.0", - "winit 0.29.15", - "zbus 3.15.1", + "windows 0.56.0", + "winit", + "zbus", ] [[package]] @@ -602,10 +572,11 @@ dependencies = [ [[package]] name = "block2" -version = "0.5.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ff7d91d3c1d568065b06c899777d1e48dcf76103a672a0adbc238a7f247f1e" +checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" dependencies = [ + "block-sys", "objc2 0.5.1", ] @@ -774,7 +745,7 @@ checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", - "libloading 0.8.3", + "libloading", ] [[package]] @@ -923,7 +894,6 @@ dependencies = [ "objc-foundation", "objc_id", "smithay-clipboard", - "x11-clipboard", ] [[package]] @@ -1062,16 +1032,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "ctor" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" -dependencies = [ - "quote", - "syn 2.0.60", -] - [[package]] name = "cursor-icon" version = "1.1.0" @@ -1191,7 +1151,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading", ] [[package]] @@ -1208,12 +1168,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" -[[package]] -name = "dpi" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" - [[package]] name = "drm" version = "0.9.0" @@ -1715,16 +1669,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "gethostname" version = "0.4.3" @@ -1844,16 +1788,14 @@ dependencies = [ "core-foundation", "dispatch", "glutin_egl_sys", - "glutin_glx_sys", "glutin_wgl_sys", - "icrate", - "libloading 0.8.3", + "icrate 0.0.4", + "libloading", "objc2 0.4.1", "once_cell", "raw-window-handle 0.5.2", "wayland-sys", "windows-sys 0.48.0", - "x11-dl", ] [[package]] @@ -1865,7 +1807,7 @@ dependencies = [ "cfg_aliases 0.1.1", "glutin", "raw-window-handle 0.5.2", - "winit 0.29.15", + "winit", ] [[package]] @@ -1878,16 +1820,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "glutin_glx_sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a165fd686c10dcc2d45380b35796e577eacfd43d4660ee741ec8ebe2201b3b4f" -dependencies = [ - "gl_generator", - "x11-dl", -] - [[package]] name = "glutin_wgl_sys" version = "0.5.0" @@ -1990,18 +1922,6 @@ dependencies = [ "xkbcommon", ] -[[package]] -name = "i-slint-backend-qt" -version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#af070f306fb87868d7c737f05fd2c4b53be6a3ba" -dependencies = [ - "const-field-offset", - "i-slint-common", - "i-slint-core", - "i-slint-core-macros", - "vtable", -] - [[package]] name = "i-slint-backend-selector" version = "1.6.0" @@ -2009,7 +1929,6 @@ source = "git+https://github.com/slint-ui/slint.git#af070f306fb87868d7c737f05fd2 dependencies = [ "cfg-if", "i-slint-backend-linuxkms", - "i-slint-backend-qt", "i-slint-backend-winit", "i-slint-common", "i-slint-core", @@ -2020,7 +1939,6 @@ name = "i-slint-backend-winit" version = "1.6.0" source = "git+https://github.com/slint-ui/slint.git#af070f306fb87868d7c737f05fd2c4b53be6a3ba" dependencies = [ - "bytemuck", "cfg-if", "cfg_aliases 0.2.0", "cocoa", @@ -2034,18 +1952,16 @@ dependencies = [ "i-slint-core-macros", "i-slint-renderer-femtovg", "i-slint-renderer-skia", - "imgref", "lyon_path", "once_cell", "pin-weak", "raw-window-handle 0.5.2", - "rgb", "scoped-tls-hkt", "scopeguard", "softbuffer", "wasm-bindgen", "web-sys", - "winit 0.29.15", + "winit", ] [[package]] @@ -2056,7 +1972,7 @@ dependencies = [ "cfg-if", "derive_more", "fontdb", - "libloading 0.8.3", + "libloading", ] [[package]] @@ -2095,13 +2011,11 @@ source = "git+https://github.com/slint-ui/slint.git#af070f306fb87868d7c737f05fd2 dependencies = [ "auto_enums", "bitflags 2.5.0", - "bytemuck", "cfg-if", "clru", "const-field-offset", "derive_more", "euclid", - "fontdue", "gettext-rs", "i-slint-common", "i-slint-core-macros", @@ -2119,7 +2033,6 @@ dependencies = [ "raw-window-handle 0.6.1", "resvg", "rgb", - "rustybuzz", "scoped-tls-hkt", "scopeguard", "slab", @@ -2241,6 +2154,16 @@ dependencies = [ "objc2 0.4.1", ] +[[package]] +name = "icrate" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" +dependencies = [ + "block2 0.4.0", + "objc2 0.5.1", +] + [[package]] name = "idna" version = "0.5.0" @@ -2492,16 +2415,6 @@ version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libloading" version = "0.8.3" @@ -2644,7 +2557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15b2375aeabe771d0774a333bf20aa89ea1805f4f9d094fc45e7390bfc7da42a" dependencies = [ "serde", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -2835,28 +2748,13 @@ dependencies = [ "bitflags 2.5.0", "jni-sys", "log", - "ndk-sys 0.5.0+25.2.9519653", + "ndk-sys", "num_enum", "raw-window-handle 0.5.2", "raw-window-handle 0.6.1", "thiserror", ] -[[package]] -name = "ndk" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" -dependencies = [ - "bitflags 2.5.0", - "jni-sys", - "log", - "ndk-sys 0.6.0+11769913", - "num_enum", - "raw-window-handle 0.6.1", - "thiserror", -] - [[package]] name = "ndk-context" version = "0.1.1" @@ -2872,15 +2770,6 @@ dependencies = [ "jni-sys", ] -[[package]] -name = "ndk-sys" -version = "0.6.0+11769913" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" -dependencies = [ - "jni-sys", -] - [[package]] name = "nix" version = "0.26.4" @@ -2936,7 +2825,7 @@ dependencies = [ "mac-notification-sys", "serde", "tauri-winrt-notification", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -2980,7 +2869,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.60", @@ -3033,29 +2922,6 @@ dependencies = [ "objc2-encode 4.0.1", ] -[[package]] -name = "objc2-app-kit" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb79768a710a9a1798848179edb186d1af7e8a8679f369e4b8d201dd2a034047" -dependencies = [ - "block2 0.5.0", - "objc2 0.5.1", - "objc2-core-data", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-data" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e092bc42eaf30a08844e6a076938c60751225ec81431ab89f5d1ccd9f958d6c" -dependencies = [ - "block2 0.5.0", - "objc2 0.5.1", - "objc2-foundation", -] - [[package]] name = "objc2-encode" version = "3.0.0" @@ -3068,17 +2934,6 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88658da63e4cc2c8adb1262902cd6af51094df0488b760d6fd27194269c0950a" -[[package]] -name = "objc2-foundation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfaefe14254871ea16c7d88968c0ff14ba554712a20d76421eec52f0a7fb8904" -dependencies = [ - "block2 0.5.0", - "dispatch", - "objc2 0.5.1", -] - [[package]] name = "objc_exception" version = "0.1.2" @@ -3337,16 +3192,6 @@ dependencies = [ "syn 2.0.60", ] -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -3566,9 +3411,6 @@ dependencies = [ "dmi_id", "env_logger", "gumdrop", - "i-slint-backend-selector", - "i-slint-backend-winit", - "i-slint-core", "log", "nix 0.26.4", "notify-rust", @@ -3588,8 +3430,7 @@ dependencies = [ "tempfile", "tokio", "versions", - "winit 0.30.0", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -3606,7 +3447,7 @@ dependencies = [ "serde", "serde_derive", "typeshare", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -3620,7 +3461,7 @@ dependencies = [ "serde", "serde_derive", "typeshare", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -3634,7 +3475,7 @@ dependencies = [ "rog_platform", "rog_profiles", "rog_slash", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -3651,7 +3492,7 @@ dependencies = [ "serde_derive", "typeshare", "udev 0.8.0", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -3665,7 +3506,7 @@ dependencies = [ "serde_derive", "typeshare", "udev 0.8.0", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -3693,7 +3534,7 @@ dependencies = [ "serde", "serde_derive", "typeshare", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -3853,19 +3694,6 @@ dependencies = [ "tiny-skia", ] -[[package]] -name = "sctk-adwaita" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de61fa7334ee8ee1f5c3c58dcc414fb9361e7e8f5bff9d45f4d69eeb89a7169" -dependencies = [ - "ab_glyph", - "log", - "memmap2 0.9.4", - "smithay-client-toolkit", - "tiny-skia", -] - [[package]] name = "sdl2" version = "0.36.0" @@ -4172,7 +4000,6 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f266ce2aa23eaaaa4e758ed44495d505d00fb79f359d46f6c1900cb053123b62" dependencies = [ - "as-raw-xcb-connection", "bytemuck", "cfg_aliases 0.1.1", "cocoa", @@ -4186,14 +4013,12 @@ dependencies = [ "raw-window-handle 0.5.2", "redox_syscall 0.4.1", "rustix 0.38.34", - "tiny-xlib", "wasm-bindgen", "wayland-backend", "wayland-client", "wayland-sys", "web-sys", "windows-sys 0.48.0", - "x11rb 0.12.0", ] [[package]] @@ -4269,7 +4094,7 @@ dependencies = [ "serde_json", "tokio", "udev 0.8.0", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -4311,7 +4136,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a98ac0c9c7b08a92b01576551942fbfc80c64e7f2354e04b57264d9349fd2b2e" dependencies = [ "serde", - "zbus 4.1.2", + "zbus", ] [[package]] @@ -4444,18 +4269,6 @@ dependencies = [ "strict-num", ] -[[package]] -name = "tiny-xlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" -dependencies = [ - "as-raw-xcb-connection", - "ctor", - "libloading 0.8.3", - "tracing", -] - [[package]] name = "tinybmp" version = "0.4.0" @@ -4537,17 +4350,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.21.1" @@ -5112,15 +4914,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "winapi-wsapoll" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -5137,16 +4930,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.5", -] - [[package]] name = "windows" version = "0.54.0" @@ -5157,6 +4940,16 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core 0.56.0", + "windows-targets 0.52.5", +] + [[package]] name = "windows-core" version = "0.51.1" @@ -5185,6 +4978,40 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "windows-result" version = "0.1.1" @@ -5406,7 +5233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" dependencies = [ "ahash", - "android-activity 0.5.2", + "android-activity", "atomic-waker", "bitflags 2.5.0", "bytemuck", @@ -5415,13 +5242,13 @@ dependencies = [ "core-foundation", "core-graphics", "cursor-icon", - "icrate", + "icrate 0.0.4", "js-sys", "libc", "log", "memmap2 0.9.4", - "ndk 0.8.0", - "ndk-sys 0.5.0+25.2.9519653", + "ndk", + "ndk-sys", "objc2 0.4.1", "once_cell", "orbclient", @@ -5430,7 +5257,7 @@ dependencies = [ "raw-window-handle 0.6.1", "redox_syscall 0.3.5", "rustix 0.38.34", - "sctk-adwaita 0.8.1", + "sctk-adwaita", "smithay-client-toolkit", "smol_str", "unicode-segmentation", @@ -5444,57 +5271,7 @@ dependencies = [ "web-time 0.2.4", "windows-sys 0.48.0", "x11-dl", - "x11rb 0.13.1", - "xkbcommon-dl", -] - -[[package]] -name = "winit" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e6d5d66cbf702e0dd820302144f51b69a95acdc495dd98ca280ff206562b1" -dependencies = [ - "ahash", - "android-activity 0.6.0", - "atomic-waker", - "bitflags 2.5.0", - "bytemuck", - "calloop", - "cfg_aliases 0.2.0", - "concurrent-queue", - "core-foundation", - "core-graphics", - "cursor-icon", - "dpi", - "js-sys", - "libc", - "memmap2 0.9.4", - "ndk 0.9.0", - "objc2 0.5.1", - "objc2-app-kit", - "objc2-foundation", - "orbclient", - "percent-encoding", - "pin-project", - "raw-window-handle 0.6.1", - "redox_syscall 0.4.1", - "rustix 0.38.34", - "sctk-adwaita 0.9.0", - "smithay-client-toolkit", - "smol_str", - "tracing", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-plasma", - "web-sys", - "web-time 1.1.0", - "windows-sys 0.52.0", - "x11-dl", - "x11rb 0.13.1", + "x11rb", "xkbcommon-dl", ] @@ -5525,16 +5302,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "x11-clipboard" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98785a09322d7446e28a13203d2cae1059a0dd3dfb32cb06d0a225f023d8286" -dependencies = [ - "libc", - "x11rb 0.13.1", -] - [[package]] name = "x11-dl" version = "2.21.0" @@ -5546,23 +5313,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" -dependencies = [ - "as-raw-xcb-connection", - "gethostname 0.3.0", - "libc", - "libloading 0.7.4", - "nix 0.26.4", - "once_cell", - "winapi", - "winapi-wsapoll", - "x11rb-protocol 0.12.0", -] - [[package]] name = "x11rb" version = "0.13.1" @@ -5570,21 +5320,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", - "gethostname 0.4.3", + "gethostname", "libc", - "libloading 0.8.3", + "libloading", "once_cell", "rustix 0.38.34", - "x11rb-protocol 0.13.1", -] - -[[package]] -name = "x11rb-protocol" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix 0.26.4", + "x11rb-protocol", ] [[package]] @@ -5662,54 +5403,13 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" -[[package]] -name = "zbus" -version = "3.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acecd3f8422f198b1a2f954bcc812fe89f3fa4281646f3da1da7925db80085d" -dependencies = [ - "async-broadcast 0.5.1", - "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process 1.8.1", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "byteorder", - "derivative", - "enumflags2", - "event-listener 2.5.3", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.26.4", - "once_cell", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros 3.15.1", - "zbus_names 2.6.1", - "zvariant 3.15.1", -] - [[package]] name = "zbus" version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" dependencies = [ - "async-broadcast 0.7.0", + "async-broadcast", "async-executor", "async-fs 2.1.2", "async-io 2.3.2", @@ -5737,23 +5437,9 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.1.2", - "zbus_names 3.0.0", - "zvariant 4.0.2", -] - -[[package]] -name = "zbus_macros" -version = "3.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2207eb71efebda17221a579ca78b45c4c5f116f074eb745c3a172e688ccf89f5" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils", + "zbus_macros", + "zbus_names", + "zvariant", ] [[package]] @@ -5762,7 +5448,7 @@ version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "regex", @@ -5770,17 +5456,6 @@ dependencies = [ "zvariant_utils", ] -[[package]] -name = "zbus_names" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" -dependencies = [ - "serde", - "static_assertions", - "zvariant 3.15.1", -] - [[package]] name = "zbus_names" version = "3.0.0" @@ -5789,7 +5464,7 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.0.2", + "zvariant", ] [[package]] @@ -5821,20 +5496,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "zvariant" -version = "3.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b4fcf3660d30fc33ae5cd97e2017b23a96e85afd7a1dd014534cd0bf34ba67" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive 3.15.1", -] - [[package]] name = "zvariant" version = "4.0.2" @@ -5845,20 +5506,7 @@ dependencies = [ "enumflags2", "serde", "static_assertions", - "zvariant_derive 4.0.2", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0277758a8a0afc0e573e80ed5bfd9d9c2b48bd3108ffe09384f9f738c83f4a55" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils", + "zvariant_derive", ] [[package]] @@ -5867,7 +5515,7 @@ version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", diff --git a/rog-control-center/Cargo.toml b/rog-control-center/Cargo.toml index 57cad2ae..ec98cf5b 100644 --- a/rog-control-center/Cargo.toml +++ b/rog-control-center/Cargo.toml @@ -13,10 +13,9 @@ edition.workspace = true #mocking = [] [dependencies] - -betrayer = { git = "https://github.com/flukejones/betrayer.git", features = [ - "winit", -] } +nix = "^0.26.1" +tempfile = "3.3.0" +betrayer = { version = "0.2.0", features = ["winit"] } asusd = { path = "../asusd" } config-traits = { path = "../config-traits" } @@ -43,27 +42,18 @@ notify-rust.workspace = true concat-idents.workspace = true png_pong.workspace = true - versions.workspace = true -nix = "^0.26.1" -tempfile = "3.3.0" - -i-slint-backend-selector = { git = "https://github.com/slint-ui/slint.git" } -i-slint-core = { git = "https://github.com/slint-ui/slint.git" } -i-slint-backend-winit = { git = "https://github.com/slint-ui/slint.git" } -winit = "*" - [dependencies.slint] git = "https://github.com/slint-ui/slint.git" default-features = false features = [ "std", "gettext", - "compat-1-0", + "compat-1-2", "backend-winit-wayland", "backend-linuxkms", - "renderer-femtovg", + "renderer-winit-femtovg", ] [build-dependencies.slint-build] diff --git a/rog-control-center/src/main.rs b/rog-control-center/src/main.rs index 163b1079..d5ddb104 100644 --- a/rog-control-center/src/main.rs +++ b/rog-control-center/src/main.rs @@ -123,7 +123,7 @@ async fn main() -> Result<()> { } thread_local! { pub static UI: std::cell::RefCell> = Default::default()}; - i_slint_backend_selector::with_platform(|_| Ok(())).unwrap(); + // i_slint_backend_selector::with_platform(|_| Ok(())).unwrap(); let mut do_once = !startup_in_background; @@ -159,7 +159,7 @@ async fn main() -> Result<()> { sleep(Duration::from_millis(50)); let config_copy = config.clone(); - i_slint_core::api::invoke_from_event_loop(move || { + slint::invoke_from_event_loop(move || { UI.with(|ui| { let mut ui = ui.borrow_mut(); if let Some(ui) = ui.as_mut() { @@ -193,7 +193,7 @@ async fn main() -> Result<()> { } } - i_slint_core::api::invoke_from_event_loop(move || { + slint::invoke_from_event_loop(move || { UI.with(|ui| { let mut ui = ui.take(); if let Some(ui) = ui.borrow_mut() { diff --git a/rog-control-center/translations/en/rog-control-center.po b/rog-control-center/translations/en/rog-control-center.po index 9833258d..246003db 100644 --- a/rog-control-center/translations/en/rog-control-center.po +++ b/rog-control-center/translations/en/rog-control-center.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-05-05 21:32+0000\n" +"POT-Creation-Date: 2024-05-05 22:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"