diff --git a/Cargo.lock b/Cargo.lock index 8e7f8929..0d335484 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,7 +30,7 @@ dependencies = [ "futures-util", "once_cell", "serde", - "zbus", + "zbus 3.15.1", ] [[package]] @@ -158,28 +158,12 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.6.8" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac22eda5891cc086690cb6fa10121c0390de0e3b04eb269f2d766b00d3f2d81" -dependencies = [ - "enumflags2", - "futures-channel", - "futures-util", - "once_cell", - "rand", - "serde", - "serde_repr", - "tokio", - "url", - "zbus", -] - -[[package]] -name = "ashpd" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01992ad7774250d5b7fe214e2676cb99bf92564436d8135ab44fe815e71769a9" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ + "async-fs 2.1.2", + "async-net", "enumflags2", "futures-channel", "futures-util", @@ -191,7 +175,7 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-protocols", - "zbus", + "zbus 4.2.1", ] [[package]] @@ -205,13 +189,24 @@ dependencies = [ ] [[package]] -name = "async-channel" -version = "2.3.0" +name = "async-broadcast" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener 5.3.0", + "event-listener-strategy 0.5.2", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", @@ -242,6 +237,17 @@ dependencies = [ "futures-lite 1.13.0", ] +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock 3.3.0", + "blocking", + "futures-lite 2.3.0", +] + [[package]] name = "async-io" version = "1.13.0" @@ -301,6 +307,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io 2.3.2", + "blocking", + "futures-lite 2.3.0", +] + [[package]] name = "async-process" version = "1.8.1" @@ -318,6 +335,26 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "async-process" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +dependencies = [ + "async-channel", + "async-io 2.3.2", + "async-lock 3.3.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.0", + "futures-lite 2.3.0", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-recursion" version = "1.1.1" @@ -326,7 +363,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -361,19 +398,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", -] - -[[package]] -name = "atk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "syn 2.0.64", ] [[package]] @@ -412,9 +437,9 @@ dependencies = [ "enumflags2", "serde", "static_assertions", - "zbus", - "zbus_names", - "zvariant", + "zbus 3.15.1", + "zbus_names 2.6.1", + "zvariant 3.15.1", ] [[package]] @@ -426,7 +451,7 @@ dependencies = [ "atspi-common", "atspi-proxies", "futures-lite 1.13.0", - "zbus", + "zbus 3.15.1", ] [[package]] @@ -437,7 +462,7 @@ checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" dependencies = [ "atspi-common", "serde", - "zbus", + "zbus 3.15.1", ] [[package]] @@ -590,7 +615,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -605,16 +630,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" -[[package]] -name = "cairo-sys-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" -dependencies = [ - "libc", - "system-deps", -] - [[package]] name = "calloop" version = "0.13.0" @@ -647,16 +662,6 @@ version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -881,15 +886,15 @@ dependencies = [ "cosmic-client-toolkit", "cosmic-protocols", "futures", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.8.0", "image 0.25.1", - "itertools", + "itertools 0.13.0", "libcosmic", "memmap2 0.9.4", "once_cell", "rand", - "rust-embed", + "rust-embed 8.4.0", "rustix 0.38.34", "serde", "switcheroo-control", @@ -898,7 +903,7 @@ dependencies = [ "tracing-log", "tracing-subscriber", "url", - "zbus", + "zbus 4.2.1", ] [[package]] @@ -906,12 +911,12 @@ name = "cosmic-applet-audio" version = "0.1.1" dependencies = [ "cosmic-time", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.8.0", "libcosmic", "libpulse-binding", "mpris2-zbus", - "rust-embed", + "rust-embed 8.4.0", "serde", "tokio", "tracing", @@ -919,7 +924,7 @@ dependencies = [ "tracing-subscriber", "url", "urlencoding", - "zbus", + "zbus 4.2.1", ] [[package]] @@ -929,17 +934,17 @@ dependencies = [ "cosmic-time", "drm", "futures", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.8.0", "libcosmic", "once_cell", - "rust-embed", + "rust-embed 8.4.0", "tokio", "tracing", "tracing-log", "tracing-subscriber", "udev", - "zbus", + "zbus 4.2.1", ] [[package]] @@ -950,12 +955,12 @@ dependencies = [ "bluer", "cosmic-time", "futures", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.8.0", "libcosmic", "once_cell", "rand", - "rust-embed", + "rust-embed 8.4.0", "tokio", "tracing", "tracing-log", @@ -968,12 +973,12 @@ version = "0.1.0" dependencies = [ "cosmic-comp-config", "cosmic-time", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.8.0", "libcosmic", "libpulse-binding", "once_cell", - "rust-embed", + "rust-embed 8.4.0", "serde", "tokio", "tracing", @@ -987,13 +992,13 @@ name = "cosmic-applet-minimize" version = "0.1.1" dependencies = [ "anyhow", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.8.0", "image 0.25.1", "libcosmic", "memmap2 0.9.4", "once_cell", - "rust-embed", + "rust-embed 8.4.0", "rustix 0.38.34", "tokio", "tracing", @@ -1010,16 +1015,16 @@ dependencies = [ "cosmic-time", "futures", "futures-util", - "i18n-embed", - "i18n-embed-fl", - "itertools", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.8.0", + "itertools 0.13.0", "libcosmic", - "rust-embed", + "rust-embed 8.4.0", "tokio", "tracing", "tracing-log", "tracing-subscriber", - "zbus", + "zbus 4.2.1", ] [[package]] @@ -1027,36 +1032,40 @@ name = "cosmic-applet-notifications" version = "0.1.0" dependencies = [ "anyhow", + "bytemuck", "cosmic-notifications-config", "cosmic-notifications-util", "cosmic-time", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", "libcosmic", - "rust-embed", + "ron", + "rust-embed 6.8.1", + "rust-embed-utils 7.8.1", + "sendfd", "tokio", "tracing", "tracing-log", "tracing-subscriber", "url", - "zbus", + "zbus 4.2.1", ] [[package]] name = "cosmic-applet-power" version = "0.1.0" dependencies = [ - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.8.0", "libcosmic", "logind-zbus", "once_cell", - "rust-embed", + "rust-embed 8.4.0", "rustix 0.38.34", "tracing", "tracing-log", "tracing-subscriber", - "zbus", + "zbus 4.2.1", ] [[package]] @@ -1070,7 +1079,7 @@ dependencies = [ "tracing", "tracing-log", "tracing-subscriber", - "zbus", + "zbus 4.2.1", ] [[package]] @@ -1082,11 +1091,11 @@ dependencies = [ "cosmic-comp-config", "cosmic-protocols", "cosmic-time", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.8.0", "libcosmic", "once_cell", - "rust-embed", + "rust-embed 8.4.0", "tokio", "tracing", "tracing-log", @@ -1099,11 +1108,11 @@ name = "cosmic-applet-time" version = "0.1.0" dependencies = [ "chrono", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.8.0", "libcosmic", "once_cell", - "rust-embed", + "rust-embed 8.4.0", "tokio", "tracing", "tracing-log", @@ -1118,11 +1127,11 @@ dependencies = [ "cosmic-client-toolkit", "cosmic-protocols", "futures", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.8.0", "libcosmic", "once_cell", - "rust-embed", + "rust-embed 8.4.0", "tokio", "tracing", "tracing-log", @@ -1176,7 +1185,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1192,13 +1201,13 @@ dependencies = [ "tokio", "tracing", "xdg", - "zbus", + "zbus 4.2.1", ] [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "quote", "syn 1.0.109", @@ -1207,21 +1216,21 @@ dependencies = [ [[package]] name = "cosmic-dbus-networkmanager" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#ce9c789fe6c26d01487fe37e968a8f88047e95e0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#badfc6a0bbe7c93927fe32692795699a675ae4c4" dependencies = [ "bitflags 2.5.0", "derive_builder", "procfs", "thiserror", "time", - "zbus", - "zvariant", + "zbus 4.2.1", + "zvariant 4.1.0", ] [[package]] name = "cosmic-notifications-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#1a1bbfaf8fd04d0831d77f452779d9a09b2c6d6e" +source = "git+https://github.com/pop-os/cosmic-notifications#d847eeb7a8db2849d795885d1c8b829596bcdd36" dependencies = [ "cosmic-config", "serde", @@ -1230,14 +1239,14 @@ dependencies = [ [[package]] name = "cosmic-notifications-util" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#1a1bbfaf8fd04d0831d77f452779d9a09b2c6d6e" +source = "git+https://github.com/pop-os/cosmic-notifications#d847eeb7a8db2849d795885d1c8b829596bcdd36" dependencies = [ "bytemuck", "fast_image_resize", "serde", "tracing", "url", - "zbus", + "zbus 4.2.1", ] [[package]] @@ -1256,7 +1265,7 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#ed5c0acb4495f14b3e08f31d4f3948bdea1c881f" +source = "git+https://github.com/pop-os/cosmic-panel#1495bfa2abc4057129c7c3b0e8530b3afd853204" dependencies = [ "anyhow", "cosmic-config", @@ -1284,9 +1293,9 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings?branch=cosmic-settings-daemon#a3c3bc278cee08632d41fbc321b9feeddae197a2" +source = "git+https://github.com/pop-os/dbus-settings-bindings#badfc6a0bbe7c93927fe32692795699a675ae4c4" dependencies = [ - "zbus", + "zbus 4.2.1", ] [[package]] @@ -1314,7 +1323,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "almost", "cosmic-config", @@ -1429,7 +1438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -1454,10 +1463,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f731440b39c73910e253cb465ec1fac97732b3c7af215639881ec0c2a38f4f69" dependencies = [ "darling 0.20.9", - "itertools", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", "synstructure", ] @@ -1516,7 +1525,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -1538,7 +1547,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core 0.20.9", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -1653,7 +1662,7 @@ dependencies = [ "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -1721,7 +1730,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -1749,7 +1758,7 @@ source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816 dependencies = [ "bitflags 2.5.0", "mime 0.1.0", - "raw-window-handle 0.6.1", + "raw-window-handle", "smithay-client-toolkit", "smithay-clipboard", ] @@ -1801,9 +1810,15 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] name = "enum-repr" @@ -1834,7 +1849,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -2148,7 +2163,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -2296,7 +2311,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -2329,36 +2344,6 @@ dependencies = [ "slab", ] -[[package]] -name = "gdk-pixbuf-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -2381,9 +2366,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -2436,19 +2421,6 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -[[package]] -name = "gio-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - [[package]] name = "gl_generator" version = "0.14.0" @@ -2466,16 +2438,6 @@ version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps", -] - [[package]] name = "glow" version = "0.13.1" @@ -2508,17 +2470,6 @@ dependencies = [ "wgpu", ] -[[package]] -name = "gobject-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -2577,24 +2528,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" -[[package]] -name = "gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps", -] - [[package]] name = "guillotiere" version = "0.6.2" @@ -2646,12 +2579,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - [[package]] name = "hermit-abi" version = "0.3.9" @@ -2684,6 +2611,28 @@ dependencies = [ "unic-langid", ] +[[package]] +name = "i18n-embed" +version = "0.13.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.2", + "rust-embed 6.8.1", + "thiserror", + "unic-langid", + "walkdir", +] + [[package]] name = "i18n-embed" version = "0.14.1" @@ -2700,12 +2649,33 @@ dependencies = [ "locale_config", "log", "parking_lot 0.12.2", - "rust-embed", + "rust-embed 8.4.0", "thiserror", "unic-langid", "walkdir", ] +[[package]] +name = "i18n-embed-fl" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed 0.13.9", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.64", + "unic-langid", +] + [[package]] name = "i18n-embed-fl" version = "0.8.0" @@ -2717,13 +2687,13 @@ dependencies = [ "fluent", "fluent-syntax", "i18n-config", - "i18n-embed", + "i18n-embed 0.14.1", "lazy_static", "proc-macro-error", "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.63", + "syn 2.0.64", "unic-langid", ] @@ -2737,7 +2707,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -2766,7 +2736,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "dnd", "iced_accessibility", @@ -2784,7 +2754,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "accesskit", "accesskit_unix", @@ -2793,7 +2763,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "bitflags 2.5.0", "dnd", @@ -2802,7 +2772,7 @@ dependencies = [ "mime 0.1.0", "num-traits", "palette", - "raw-window-handle 0.6.1", + "raw-window-handle", "serde", "smithay-client-toolkit", "smol_str", @@ -2815,7 +2785,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "futures", "iced_core", @@ -2828,7 +2798,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2842,7 +2812,7 @@ dependencies = [ "log", "lyon_path", "once_cell", - "raw-window-handle 0.6.1", + "raw-window-handle", "rustc-hash", "thiserror", "unicode-segmentation", @@ -2852,7 +2822,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2864,7 +2834,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "dnd", "iced_accessibility", @@ -2878,7 +2848,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "enum-repr", "float-cmp", @@ -2887,9 +2857,9 @@ dependencies = [ "iced_graphics", "iced_runtime", "iced_style", - "itertools", + "itertools 0.12.1", "lazy_static", - "raw-window-handle 0.6.1", + "raw-window-handle", "smithay-client-toolkit", "thiserror", "tracing", @@ -2904,7 +2874,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "iced_core", "once_cell", @@ -2914,7 +2884,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "bytemuck", "cosmic-text", @@ -2931,7 +2901,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2943,7 +2913,7 @@ dependencies = [ "log", "lyon", "once_cell", - "raw-window-handle 0.6.1", + "raw-window-handle", "resvg", "rustix 0.38.34", "smithay-client-toolkit", @@ -2957,7 +2927,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "dnd", "iced_renderer", @@ -3126,6 +3096,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -3228,17 +3207,17 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#54eb5487b4d57d3203c5e9af33fbcebcecf04a00" +source = "git+https://github.com/pop-os/libcosmic#11a73354cae950a471b19ce61e8bc502491d7b13" dependencies = [ "apply", - "ashpd 0.7.0", + "ashpd", "chrono", "cosmic-client-toolkit", "cosmic-config", @@ -3273,7 +3252,7 @@ dependencies = [ "tracing", "unicode-segmentation", "url", - "zbus", + "zbus 4.2.1", ] [[package]] @@ -3366,9 +3345,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" @@ -3407,12 +3386,12 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "logind-zbus" -version = "3.1.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2cfc54565c8d002ad7344ec08ce512c269b2de56dea59850708691e4b18fe3" +checksum = "8e77231dda256523272d8168cf57a9f214ccef06d385c126ce64df662ca5721e" dependencies = [ "serde", - "zbus", + "zbus 4.2.1", ] [[package]] @@ -3596,14 +3575,14 @@ dependencies = [ [[package]] name = "mpris2-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#ce9c789fe6c26d01487fe37e968a8f88047e95e0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#badfc6a0bbe7c93927fe32692795699a675ae4c4" dependencies = [ "futures-util", "serde", "thiserror", "time", - "zbus", - "zvariant", + "zbus 4.2.1", + "zvariant 4.1.0", ] [[package]] @@ -3655,6 +3634,19 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", + "memoffset 0.9.1", +] + [[package]] name = "notify" version = "6.1.1" @@ -3742,7 +3734,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -3893,11 +3885,11 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -3928,19 +3920,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.63", -] - -[[package]] -name = "pango-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "syn 2.0.64", ] [[package]] @@ -4039,7 +4019,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -4074,7 +4054,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -4150,6 +4130,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + [[package]] name = "powerfmt" version = "0.2.0" @@ -4178,6 +4164,15 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4309,12 +4304,6 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - [[package]] name = "raw-window-handle" version = "0.6.1" @@ -4464,22 +4453,21 @@ dependencies = [ [[package]] name = "rfd" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0d8ab342bcc5436e04d3a4c1e09e17d74958bfaddf8d5fad6f85607df0f994f" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" dependencies = [ - "ashpd 0.6.8", + "ashpd", "block", "dispatch", - "glib-sys", - "gobject-sys", - "gtk-sys", "js-sys", "log", "objc", "objc-foundation", "objc_id", - "raw-window-handle 0.5.2", + "pollster", + "raw-window-handle", + "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4513,14 +4501,38 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +[[package]] +name = "rust-embed" +version = "6.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +dependencies = [ + "rust-embed-impl 6.8.1", + "rust-embed-utils 7.8.1", + "walkdir", +] + [[package]] name = "rust-embed" version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" dependencies = [ - "rust-embed-impl", - "rust-embed-utils", + "rust-embed-impl 8.4.0", + "rust-embed-utils 8.4.0", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "6.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils 7.8.1", + "syn 2.0.64", "walkdir", ] @@ -4532,8 +4544,18 @@ checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" dependencies = [ "proc-macro2", "quote", - "rust-embed-utils", - "syn 2.0.63", + "rust-embed-utils 8.4.0", + "syn 2.0.64", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "7.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +dependencies = [ + "sha2", "walkdir", ] @@ -4592,7 +4614,7 @@ dependencies = [ "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -4661,6 +4683,16 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" +[[package]] +name = "sendfd" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798" +dependencies = [ + "libc", + "tokio", +] + [[package]] name = "serde" version = "1.0.202" @@ -4690,7 +4722,7 @@ checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -4713,7 +4745,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -4849,7 +4881,7 @@ version = "0.8.0" source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-4#ab422ddcc95a9a1717df094f9c8fe69e2fdb2a27" dependencies = [ "libc", - "raw-window-handle 0.6.1", + "raw-window-handle", "smithay-client-toolkit", "wayland-backend", ] @@ -4900,7 +4932,7 @@ dependencies = [ "log", "memmap2 0.9.4", "objc", - "raw-window-handle 0.6.1", + "raw-window-handle", "redox_syscall 0.4.1", "rustix 0.38.34", "tiny-xlib", @@ -4973,11 +5005,11 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -5010,9 +5042,9 @@ dependencies = [ [[package]] name = "switcheroo-control" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#ce9c789fe6c26d01487fe37e968a8f88047e95e0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#badfc6a0bbe7c93927fe32692795699a675ae4c4" dependencies = [ - "zbus", + "zbus 4.2.1", ] [[package]] @@ -5028,9 +5060,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.63" +version = "2.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" +checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f" dependencies = [ "proc-macro2", "quote", @@ -5045,7 +5077,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -5057,19 +5089,6 @@ dependencies = [ "libc", ] -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck 0.5.0", - "pkg-config", - "toml 0.8.13", - "version-compare", -] - [[package]] name = "taffy" version = "0.3.11" @@ -5081,12 +5100,6 @@ dependencies = [ "slotmap", ] -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - [[package]] name = "temp-dir" version = "0.1.13" @@ -5131,7 +5144,7 @@ checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -5284,7 +5297,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -5339,6 +5352,17 @@ dependencies = [ "winnow 0.5.40", ] +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + [[package]] name = "toml_edit" version = "0.22.13" @@ -5371,7 +5395,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -5645,12 +5669,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - [[package]] name = "version_check" version = "0.9.4" @@ -5700,7 +5718,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", "wasm-bindgen-shared", ] @@ -5734,7 +5752,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5911,7 +5929,7 @@ dependencies = [ "naga", "parking_lot 0.12.2", "profiling", - "raw-window-handle 0.6.1", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -5938,7 +5956,7 @@ dependencies = [ "once_cell", "parking_lot 0.12.2", "profiling", - "raw-window-handle 0.6.1", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", @@ -5979,7 +5997,7 @@ dependencies = [ "parking_lot 0.12.2", "profiling", "range-alloc", - "raw-window-handle 0.6.1", + "raw-window-handle", "renderdoc-sys", "rustc-hash", "smallvec", @@ -6048,7 +6066,7 @@ dependencies = [ "clipboard_x11", "dnd", "mime 0.1.0", - "raw-window-handle 0.6.1", + "raw-window-handle", "thiserror", ] @@ -6349,16 +6367,16 @@ checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" [[package]] name = "zbus" -version = "3.15.2" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "5acecd3f8422f198b1a2f954bcc812fe89f3fa4281646f3da1da7925db80085d" dependencies = [ - "async-broadcast", + "async-broadcast 0.5.1", "async-executor", - "async-fs", + "async-fs 1.6.0", "async-io 1.13.0", "async-lock 2.8.0", - "async-process", + "async-process 1.8.1", "async-recursion", "async-task", "async-trait", @@ -6379,23 +6397,61 @@ dependencies = [ "serde_repr", "sha1", "static_assertions", - "tokio", "tracing", "uds_windows", "winapi", "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", + "zbus_macros 3.15.1", + "zbus_names 2.6.1", + "zvariant 3.15.1", +] + +[[package]] +name = "zbus" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5915716dff34abef1351d2b10305b019c8ef33dcf6c72d31a6e227d5d9d7a21" +dependencies = [ + "async-broadcast 0.7.0", + "async-executor", + "async-fs 2.1.2", + "async-io 2.3.2", + "async-lock 3.3.0", + "async-process 2.2.2", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.0", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.28.0", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros 4.2.1", + "zbus_names 3.0.0", + "zvariant 4.1.0", ] [[package]] name = "zbus_macros" -version = "3.15.2" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +checksum = "2207eb71efebda17221a579ca78b45c4c5f116f074eb745c3a172e688ccf89f5" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", @@ -6403,6 +6459,19 @@ dependencies = [ "zvariant_utils", ] +[[package]] +name = "zbus_macros" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fceb36d0c1c4a6b98f3ce40f410e64e5a134707ed71892e1b178abc4c695d4" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + [[package]] name = "zbus_names" version = "2.6.1" @@ -6411,7 +6480,18 @@ checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", - "zvariant", + "zvariant 3.15.1", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant 4.1.0", ] [[package]] @@ -6437,7 +6517,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.64", ] [[package]] @@ -6451,26 +6531,52 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.2" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "c5b4fcf3660d30fc33ae5cd97e2017b23a96e85afd7a1dd014534cd0bf34ba67" dependencies = [ "byteorder", "enumflags2", "libc", "serde", "static_assertions", + "zvariant_derive 3.15.1", +] + +[[package]] +name = "zvariant" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877ef94e5e82b231d2a309c531f191a8152baba8241a7939ee04bd76b0171308" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", "url", - "zvariant_derive", + "zvariant_derive 4.1.0", ] [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "0277758a8a0afc0e573e80ed5bfd9d9c2b48bd3108ffe09384f9f738c83f4a55" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7ca98581cc6a8120789d8f1f0997e9053837d6aa5346cbb43454d7121be6e39" +dependencies = [ + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -6479,9 +6585,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index e520d3a5..07f7c898 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = fa rust-embed = "8.3" rust-embed-utils = "8.3.0" rustix = { version = "0.38", features = ["fs", "process"] } -zbus = { version = "3.15", default-features = false, features = ["tokio"] } +zbus = { version = "4.2.1", default-features = false, features = ["tokio"] } tracing = "0.1" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } tracing-log = "0.2.0" @@ -60,6 +60,9 @@ lto = "fat" [workspace.metadata.cargo-machete] ignored = ["libcosmic"] +# [patch."https://github.com/pop-os/libcosmic"] +# cosmic-config = { git = "https://github.com/pop-os/libcosmic//" } +# libcosmic = { git = "https://github.com/pop-os/libcosmic//" } [patch."https://github.com/Smithay/client-toolkit"] sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "3bed072" } diff --git a/cosmic-app-list/Cargo.toml b/cosmic-app-list/Cargo.toml index a572f1a4..8e4d65f3 100644 --- a/cosmic-app-list/Cargo.toml +++ b/cosmic-app-list/Cargo.toml @@ -13,7 +13,7 @@ futures.workspace = true i18n-embed.workspace = true i18n-embed-fl.workspace = true image = { version = "0.25.0", default-features = false } -itertools = "0.12.1" +itertools = "0.13.0" libcosmic.workspace = true memmap2 = "0.9.4" once_cell = "1.19" @@ -22,7 +22,13 @@ rust-embed.workspace = true rustix.workspace = true serde = { version = "1.0", features = ["derive"] } switcheroo-control = { git = "https://github.com/pop-os/dbus-settings-bindings" } -tokio = { version = "1.36.0", features = ["sync", "rt", "rt-multi-thread", "macros", "process"] } +tokio = { version = "1.36.0", features = [ + "sync", + "rt", + "rt-multi-thread", + "macros", + "process", +] } tracing-log.workspace = true tracing-subscriber.workspace = true tracing.workspace = true diff --git a/cosmic-applet-audio/Cargo.toml b/cosmic-applet-audio/Cargo.toml index 041e0db5..df6a4ccf 100644 --- a/cosmic-applet-audio/Cargo.toml +++ b/cosmic-applet-audio/Cargo.toml @@ -13,7 +13,7 @@ libpulse-binding = "2.28.1" mpris2-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings" } rust-embed.workspace = true serde = "1.0.197" -tokio = { version = "1.36.0", features=["full"] } +tokio = { version = "1.36.0", features = ["full"] } tracing-log.workspace = true tracing-subscriber.workspace = true tracing.workspace = true diff --git a/cosmic-applet-audio/src/mpris_subscription.rs b/cosmic-applet-audio/src/mpris_subscription.rs index 48d2c1ca..30e2325e 100644 --- a/cosmic-applet-audio/src/mpris_subscription.rs +++ b/cosmic-applet-audio/src/mpris_subscription.rs @@ -106,7 +106,7 @@ impl MprisPlayer { } fn name(&self) -> &BusName { - self.player.destination() + self.player.inner().destination() } } diff --git a/cosmic-applet-battery/src/backend/power_daemon.rs b/cosmic-applet-battery/src/backend/power_daemon.rs index ebe23799..337ac136 100644 --- a/cosmic-applet-battery/src/backend/power_daemon.rs +++ b/cosmic-applet-battery/src/backend/power_daemon.rs @@ -18,11 +18,12 @@ //! //! …consequently `zbus-xmlgen` did not generate code for the above interfaces. -use zbus::dbus_proxy; +use zbus::proxy; -#[dbus_proxy( +#[proxy( interface = "com.system76.PowerDaemon", - default_path = "/com/system76/PowerDaemon" + default_path = "/com/system76/PowerDaemon", + assume_defaults = true )] trait PowerDaemon { /// Balanced method @@ -70,10 +71,10 @@ trait PowerDaemon { fn set_graphics_power(&self, power: bool) -> zbus::Result<()>; /// HotPlugDetect signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn hot_plug_detect(&self, port: u64) -> zbus::Result<()>; /// PowerProfileSwitch signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn power_profile_switch(&self, profile: &str) -> zbus::Result<()>; } diff --git a/cosmic-applet-battery/src/backend/power_profiles.rs b/cosmic-applet-battery/src/backend/power_profiles.rs index d94e0f54..e3e1c158 100644 --- a/cosmic-applet-battery/src/backend/power_profiles.rs +++ b/cosmic-applet-battery/src/backend/power_profiles.rs @@ -10,9 +10,9 @@ //! section of the zbus documentation. //! -use zbus::dbus_proxy; +use zbus::proxy; -#[dbus_proxy( +#[proxy( interface = "org.freedesktop.UPower.PowerProfiles", default_path = "/org/freedesktop/UPower/PowerProfiles", assume_defaults = true @@ -25,40 +25,40 @@ trait PowerProfiles { fn release_profile(&self, cookie: u32) -> zbus::Result<()>; /// ProfileReleased signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn profile_released(&self, cookie: u32) -> zbus::Result<()>; /// Actions property - #[dbus_proxy(property)] + #[zbus(property)] fn actions(&self) -> zbus::Result>; /// ActiveProfile property - #[dbus_proxy(property)] + #[zbus(property)] fn active_profile(&self) -> zbus::Result; - #[dbus_proxy(property)] + #[zbus(property)] fn set_active_profile(&self, value: &str) -> zbus::Result<()>; /// ActiveProfileHolds property - #[dbus_proxy(property)] + #[zbus(property)] fn active_profile_holds( &self, ) -> zbus::Result>>; /// PerformanceDegraded property - #[dbus_proxy(property)] + #[zbus(property)] fn performance_degraded(&self) -> zbus::Result; /// PerformanceInhibited property - #[dbus_proxy(property)] + #[zbus(property)] fn performance_inhibited(&self) -> zbus::Result; /// Profiles property - #[dbus_proxy(property)] + #[zbus(property)] fn profiles( &self, ) -> zbus::Result>>; /// Version property - #[dbus_proxy(property)] + #[zbus(property)] fn version(&self) -> zbus::Result; } diff --git a/cosmic-applet-battery/src/backlight.rs b/cosmic-applet-battery/src/backlight.rs index 1c0ba113..3258c2a8 100644 --- a/cosmic-applet-battery/src/backlight.rs +++ b/cosmic-applet-battery/src/backlight.rs @@ -19,7 +19,7 @@ use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender}; const BACKLIGHT_SYSDIR: &str = "/sys/class/backlight"; -#[zbus::dbus_proxy( +#[zbus::proxy( default_service = "org.freedesktop.login1", interface = "org.freedesktop.login1.Session", default_path = "/org/freedesktop/login1/session/auto" diff --git a/cosmic-applet-battery/src/upower.rs b/cosmic-applet-battery/src/upower.rs index b28eec24..a5cb5a6f 100644 --- a/cosmic-applet-battery/src/upower.rs +++ b/cosmic-applet-battery/src/upower.rs @@ -3,11 +3,12 @@ //! This code was generated by `zbus-xmlgen` `2.0.1` from DBus introspection data. //! Source: `Interface '/org/freedesktop/UPower' from service 'org.freedesktop.UPower' on system bus`. -use zbus::dbus_proxy; +use zbus::proxy; -#[dbus_proxy( +#[proxy( default_service = "org.freedesktop.UPower", - interface = "org.freedesktop.UPower" + interface = "org.freedesktop.UPower", + default_path = "/org/freedesktop/UPower" )] trait UPower { /// EnumerateDevices method @@ -20,26 +21,26 @@ trait UPower { fn get_display_device(&self) -> zbus::Result; /// DeviceAdded signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn device_added(&self, device: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>; /// DeviceRemoved signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn device_removed(&self, device: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>; /// DaemonVersion property - #[dbus_proxy(property)] + #[zbus(property)] fn daemon_version(&self) -> zbus::Result; /// LidIsClosed property - #[dbus_proxy(property)] + #[zbus(property)] fn lid_is_closed(&self) -> zbus::Result; /// LidIsPresent property - #[dbus_proxy(property)] + #[zbus(property)] fn lid_is_present(&self) -> zbus::Result; /// OnBattery property - #[dbus_proxy(property)] + #[zbus(property)] fn on_battery(&self) -> zbus::Result; } diff --git a/cosmic-applet-battery/src/upower_device.rs b/cosmic-applet-battery/src/upower_device.rs index dad624be..b99934c5 100644 --- a/cosmic-applet-battery/src/upower_device.rs +++ b/cosmic-applet-battery/src/upower_device.rs @@ -10,10 +10,10 @@ use cosmic::iced::{ }; use std::{fmt::Debug, hash::Hash}; -use zbus::dbus_proxy; +use zbus::proxy; use crate::upower::UPowerProxy; -#[dbus_proxy( +#[proxy( default_service = "org.freedesktop.UPower", interface = "org.freedesktop.UPower.Device" )] @@ -33,123 +33,123 @@ trait Device { fn refresh(&self) -> zbus::Result<()>; /// BatteryLevel property - #[dbus_proxy(property)] + #[zbus(property)] fn battery_level(&self) -> zbus::Result; /// Capacity property - #[dbus_proxy(property)] + #[zbus(property)] fn capacity(&self) -> zbus::Result; /// ChargeCycles property - #[dbus_proxy(property)] + #[zbus(property)] fn charge_cycles(&self) -> zbus::Result; /// Energy property - #[dbus_proxy(property)] + #[zbus(property)] fn energy(&self) -> zbus::Result; /// EnergyEmpty property - #[dbus_proxy(property)] + #[zbus(property)] fn energy_empty(&self) -> zbus::Result; /// EnergyFull property - #[dbus_proxy(property)] + #[zbus(property)] fn energy_full(&self) -> zbus::Result; /// EnergyFullDesign property - #[dbus_proxy(property)] + #[zbus(property)] fn energy_full_design(&self) -> zbus::Result; /// EnergyRate property - #[dbus_proxy(property)] + #[zbus(property)] fn energy_rate(&self) -> zbus::Result; /// HasHistory property - #[dbus_proxy(property)] + #[zbus(property)] fn has_history(&self) -> zbus::Result; /// HasStatistics property - #[dbus_proxy(property)] + #[zbus(property)] fn has_statistics(&self) -> zbus::Result; /// IconName property - #[dbus_proxy(property)] + #[zbus(property)] fn icon_name(&self) -> zbus::Result; /// IsPresent property - #[dbus_proxy(property)] + #[zbus(property)] fn is_present(&self) -> zbus::Result; /// IsRechargeable property - #[dbus_proxy(property)] + #[zbus(property)] fn is_rechargeable(&self) -> zbus::Result; /// Luminosity property - #[dbus_proxy(property)] + #[zbus(property)] fn luminosity(&self) -> zbus::Result; /// Model property - #[dbus_proxy(property)] + #[zbus(property)] fn model(&self) -> zbus::Result; /// NativePath property - #[dbus_proxy(property)] + #[zbus(property)] fn native_path(&self) -> zbus::Result; /// Online property - #[dbus_proxy(property)] + #[zbus(property)] fn online(&self) -> zbus::Result; /// Percentage property - #[dbus_proxy(property)] + #[zbus(property)] fn percentage(&self) -> zbus::Result; /// PowerSupply property - #[dbus_proxy(property)] + #[zbus(property)] fn power_supply(&self) -> zbus::Result; /// Serial property - #[dbus_proxy(property)] + #[zbus(property)] fn serial(&self) -> zbus::Result; /// State property - #[dbus_proxy(property)] + #[zbus(property)] fn state(&self) -> zbus::Result; /// Technology property - #[dbus_proxy(property)] + #[zbus(property)] fn technology(&self) -> zbus::Result; /// Temperature property - #[dbus_proxy(property)] + #[zbus(property)] fn temperature(&self) -> zbus::Result; /// TimeToEmpty property - #[dbus_proxy(property)] + #[zbus(property)] fn time_to_empty(&self) -> zbus::Result; /// TimeToFull property - #[dbus_proxy(property)] + #[zbus(property)] fn time_to_full(&self) -> zbus::Result; /// Type property - #[dbus_proxy(property)] + #[zbus(property)] fn type_(&self) -> zbus::Result; /// UpdateTime property - #[dbus_proxy(property)] + #[zbus(property)] fn update_time(&self) -> zbus::Result; /// Vendor property - #[dbus_proxy(property)] + #[zbus(property)] fn vendor(&self) -> zbus::Result; /// Voltage property - #[dbus_proxy(property)] + #[zbus(property)] fn voltage(&self) -> zbus::Result; /// WarningLevel property - #[dbus_proxy(property)] + #[zbus(property)] fn warning_level(&self) -> zbus::Result; } @@ -194,7 +194,8 @@ async fn start_listening( if let Ok(devices) = upower.enumerate_devices().await { let mut has_battery = false; for device in devices { - let Ok(d) = DeviceProxy::builder(upower.connection()).path(device) else { + let Ok(d) = DeviceProxy::builder(upower.inner().connection()).path(device) + else { continue; }; let Ok(d) = d.build().await else { diff --git a/cosmic-applet-battery/src/upower_kbdbacklight.rs b/cosmic-applet-battery/src/upower_kbdbacklight.rs index 799f1629..81ece37b 100644 --- a/cosmic-applet-battery/src/upower_kbdbacklight.rs +++ b/cosmic-applet-battery/src/upower_kbdbacklight.rs @@ -6,9 +6,9 @@ use cosmic::iced::{self, futures::SinkExt, subscription}; use std::{fmt::Debug, hash::Hash}; use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender}; -use zbus::dbus_proxy; +use zbus::proxy; -#[dbus_proxy( +#[proxy( default_service = "org.freedesktop.UPower", interface = "org.freedesktop.UPower.KbdBacklight", default_path = "/org/freedesktop/UPower/KbdBacklight" @@ -24,11 +24,11 @@ trait KbdBacklight { fn set_brightness(&self, value: i32) -> zbus::Result<()>; /// BrightnessChanged signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn brightness_changed(&self, value: i32) -> zbus::Result<()>; /// BrightnessChangedWithSource signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn brightness_changed_with_source(&self, value: i32, source: &str) -> zbus::Result<()>; } diff --git a/cosmic-applet-network/Cargo.toml b/cosmic-applet-network/Cargo.toml index 1b51bccc..4ada3839 100644 --- a/cosmic-applet-network/Cargo.toml +++ b/cosmic-applet-network/Cargo.toml @@ -13,7 +13,7 @@ futures.workspace = true futures-util.workspace = true i18n-embed-fl.workspace = true i18n-embed.workspace = true -itertools = "0.12.1" +itertools = "0.13.0" libcosmic.workspace = true rust-embed.workspace = true tokio = { version = "1.36.0", features = ["full"] } diff --git a/cosmic-applet-network/src/network_manager/available_wifi.rs b/cosmic-applet-network/src/network_manager/available_wifi.rs index e8927f70..f3b135cd 100644 --- a/cosmic-applet-network/src/network_manager/available_wifi.rs +++ b/cosmic-applet-network/src/network_manager/available_wifi.rs @@ -41,7 +41,7 @@ pub async fn handle_wireless_device(device: WirelessDevice<'_>) -> zbus::Result< strength, state, working: false, - path: ap.path().to_owned(), + path: ap.inner().path().to_owned(), }, ); } diff --git a/cosmic-applet-network/src/network_manager/mod.rs b/cosmic-applet-network/src/network_manager/mod.rs index ea2e4171..842c7434 100644 --- a/cosmic-applet-network/src/network_manager/mod.rs +++ b/cosmic-applet-network/src/network_manager/mod.rs @@ -23,7 +23,7 @@ use futures::{ }; use tokio::process::Command; use zbus::{ - zvariant::{self, Value}, + zvariant::{self, OwnedValue, Value}, Connection, }; @@ -452,7 +452,9 @@ impl NetworkManagerState { let map = ( s.0.to_string(), s.1.iter() - .map(|(k, v)| (k.to_string(), v.clone().into())) + .filter_map(|(k, v)| { + OwnedValue::try_from(v).map(|v| (k.to_string(), v)).ok() + }) .collect::>(), ); map @@ -463,15 +465,13 @@ impl NetworkManagerState { nm.activate_connection(known_conn, &device).await? } else { let (_, active_conn) = nm - .add_and_activate_connection(conn_settings, device.path(), &ap.path) + .add_and_activate_connection(conn_settings, device.inner().path(), &ap.path) .await?; - let dummy = ActiveConnectionProxy::new(&conn).await?; + let dummy = ActiveConnectionProxy::new(&conn, active_conn).await?; let active = ActiveConnectionProxy::builder(&conn) - .path(active_conn) + .destination(dummy.inner().destination().to_owned()) .unwrap() - .destination(dummy.destination().to_owned()) - .unwrap() - .interface(dummy.interface().to_owned()) + .interface(dummy.inner().interface().to_owned()) .unwrap() .build() .await diff --git a/cosmic-applet-notifications/Cargo.toml b/cosmic-applet-notifications/Cargo.toml index c08fe2d9..07db81e5 100644 --- a/cosmic-applet-notifications/Cargo.toml +++ b/cosmic-applet-notifications/Cargo.toml @@ -17,13 +17,24 @@ tokio = { version = "1.36.0", features = [ "io-util", "io-std", ] } -cosmic-notifications-config = { git = "https://github.com/pop-os/cosmic-notifications" } cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" } -i18n-embed-fl.workspace = true -i18n-embed.workspace = true -rust-embed.workspace = true -tracing-log.workspace = true +cosmic-notifications-config = { git = "https://github.com/pop-os/cosmic-notifications" } +# cosmic-notifications-util = { path = "../../cosmic-notifications-daemon/cosmic-notifications-util" } +# cosmic-notifications-config = { path = "../../cosmic-notifications-daemon/cosmic-notifications-config" } +tracing = "0.1" +ron = "0.8" +sendfd = { version = "0.4", features = ["tokio"] } +bytemuck = "1" tracing-subscriber.workspace = true -tracing.workspace = true -url = "2.5.0" +tracing-log.workspace = true zbus.workspace = true +zbus.features = ["tokio", "p2p"] +# Application i18n +i18n-embed = { version = "0.13.4", features = [ + "fluent-system", + "desktop-requester", +] } +i18n-embed-fl = "0.6.4" +rust-embed = "6.3.0" +rust-embed-utils = "7.5.0" +url = "2.5.0" diff --git a/cosmic-applet-notifications/src/subscriptions/freedesktop_proxy.rs b/cosmic-applet-notifications/src/subscriptions/freedesktop_proxy.rs index 30c7e173..f06a8194 100644 --- a/cosmic-applet-notifications/src/subscriptions/freedesktop_proxy.rs +++ b/cosmic-applet-notifications/src/subscriptions/freedesktop_proxy.rs @@ -19,9 +19,9 @@ //! //! …consequently `zbus-xmlgen` did not generate code for the above interfaces. -use zbus::dbus_proxy; +use zbus::proxy; -#[dbus_proxy( +#[proxy( interface = "org.freedesktop.Notifications", default_service = "org.freedesktop.Notifications", default_path = "/org/freedesktop/Notifications" @@ -50,10 +50,10 @@ trait Notifications { ) -> zbus::Result; /// ActionInvoked signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn action_invoked(&self, id: u32, action_key: &str) -> zbus::Result<()>; /// NotificationClosed signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn notification_closed(&self, id: u32, reason: u32) -> zbus::Result<()>; } diff --git a/cosmic-applet-notifications/src/subscriptions/notifications.rs b/cosmic-applet-notifications/src/subscriptions/notifications.rs index d4eded73..e7795afb 100644 --- a/cosmic-applet-notifications/src/subscriptions/notifications.rs +++ b/cosmic-applet-notifications/src/subscriptions/notifications.rs @@ -13,9 +13,9 @@ use std::{ use tracing::{error, trace}; use zbus::{ - dbus_proxy, + connection::Builder, export::futures_util::{SinkExt, StreamExt}, - ConnectionBuilder, + proxy, }; #[derive(Debug)] @@ -80,13 +80,13 @@ pub fn notifications(proxy: NotificationsAppletProxy<'static>) -> Subscription anyhow::Result> { let stream = unsafe { std::os::unix::net::UnixStream::from_raw_fd(raw_fd) }; stream.set_nonblocking(true)?; let stream = tokio::net::UnixStream::from_std(stream)?; - let conn = ConnectionBuilder::socket(stream).p2p().build().await?; + let conn = Builder::socket(stream).p2p().build().await?; trace!("Applet connection created"); let proxy = NotificationsAppletProxy::new(&conn).await?; diff --git a/cosmic-applet-power/Cargo.toml b/cosmic-applet-power/Cargo.toml index 79788b64..2fffa0de 100644 --- a/cosmic-applet-power/Cargo.toml +++ b/cosmic-applet-power/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0" i18n-embed-fl.workspace = true i18n-embed.workspace = true libcosmic.workspace = true -logind-zbus = "3.1" +logind-zbus = "4.0.3" once_cell = "1.19.0" rust-embed.workspace = true rustix.workspace = true diff --git a/cosmic-applet-power/src/cosmic_session.rs b/cosmic-applet-power/src/cosmic_session.rs index 94c04518..b130d45d 100644 --- a/cosmic-applet-power/src/cosmic_session.rs +++ b/cosmic-applet-power/src/cosmic_session.rs @@ -1,9 +1,9 @@ // Copyright 2023 System76 // SPDX-License-Identifier: GPL-3.0-only -use zbus::dbus_proxy; +use zbus::proxy; -#[dbus_proxy( +#[proxy( interface = "com.system76.CosmicSession", default_service = "com.system76.CosmicSession", default_path = "/com/system76/CosmicSession" diff --git a/cosmic-applet-power/src/session_manager.rs b/cosmic-applet-power/src/session_manager.rs index 5041918a..43d9661e 100644 --- a/cosmic-applet-power/src/session_manager.rs +++ b/cosmic-applet-power/src/session_manager.rs @@ -21,9 +21,9 @@ //! //! …consequently `zbus-xmlgen` did not generate code for the above interfaces. -use zbus::dbus_proxy; +use zbus::proxy; -#[dbus_proxy(interface = "org.gnome.SessionManager", assume_defaults = true)] +#[proxy(interface = "org.gnome.SessionManager", assume_defaults = true)] trait SessionManager { /// CanRebootToFirmwareSetup method fn can_reboot_to_firmware_setup(&self) -> zbus::Result; @@ -99,42 +99,42 @@ trait SessionManager { fn unregister_client(&self, client_id: &zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>; /// ClientAdded signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn client_added(&self, id: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>; /// ClientRemoved signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn client_removed(&self, id: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>; /// InhibitorAdded signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn inhibitor_added(&self, id: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>; /// InhibitorRemoved signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn inhibitor_removed(&self, id: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>; /// SessionOver signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn session_over(&self) -> zbus::Result<()>; /// SessionRunning signal - #[dbus_proxy(signal)] + #[zbus(signal)] fn session_running(&self) -> zbus::Result<()>; /// InhibitedActions property - #[dbus_proxy(property)] + #[zbus(property)] fn inhibited_actions(&self) -> zbus::Result; /// Renderer property - #[dbus_proxy(property)] + #[zbus(property)] fn renderer(&self) -> zbus::Result; /// SessionIsActive property - #[dbus_proxy(property)] + #[zbus(property)] fn session_is_active(&self) -> zbus::Result; /// SessionName property - #[dbus_proxy(property)] + #[zbus(property)] fn session_name(&self) -> zbus::Result; } diff --git a/cosmic-applet-status-area/src/subscriptions/status_notifier_item.rs b/cosmic-applet-status-area/src/subscriptions/status_notifier_item.rs index 31a6cfd6..703b97b4 100644 --- a/cosmic-applet-status-area/src/subscriptions/status_notifier_item.rs +++ b/cosmic-applet-status-area/src/subscriptions/status_notifier_item.rs @@ -106,16 +106,16 @@ async fn get_layout(menu_proxy: DBusMenuProxy<'static>) -> Result zbus::Result; // https://www.freedesktop.org/wiki/Specifications/StatusNotifierItem/Icons - #[dbus_proxy(property)] + #[zbus(property)] fn icon_pixmap(&self) -> zbus::Result>; - #[dbus_proxy(property)] + #[zbus(property)] fn menu(&self) -> zbus::Result; } @@ -224,7 +224,7 @@ impl Layout { } } -#[zbus::dbus_proxy(interface = "com.canonical.dbusmenu")] +#[zbus::proxy(interface = "com.canonical.dbusmenu")] trait DBusMenu { fn get_layout( &self, @@ -236,6 +236,6 @@ trait DBusMenu { fn event(&self, id: i32, event_id: &str, data: &OwnedValue, timestamp: u32) -> zbus::Result<()>; - #[dbus_proxy(signal)] + #[zbus(signal)] fn layout_updated(&self, revision: u32, parent: i32) -> zbus::Result<()>; } diff --git a/cosmic-applet-status-area/src/subscriptions/status_notifier_watcher/client.rs b/cosmic-applet-status-area/src/subscriptions/status_notifier_watcher/client.rs index 5587b37d..ddcef71f 100644 --- a/cosmic-applet-status-area/src/subscriptions/status_notifier_watcher/client.rs +++ b/cosmic-applet-status-area/src/subscriptions/status_notifier_watcher/client.rs @@ -10,7 +10,7 @@ use crate::subscriptions::status_notifier_item::StatusNotifierItem; // TODO: Don't use trait object pub type EventStream = Pin + Send>>; -#[zbus::dbus_proxy( +#[zbus::proxy( interface = "org.kde.StatusNotifierWatcher", default_service = "org.kde.StatusNotifierWatcher", default_path = "/StatusNotifierWatcher" @@ -18,13 +18,13 @@ pub type EventStream = Pin + Send>>; trait StatusNotifierWatcher { fn register_status_notifier_host(&self, name: &str) -> zbus::Result<()>; - #[dbus_proxy(property)] + #[zbus(property)] fn registered_status_notifier_items(&self) -> zbus::Result>; - #[dbus_proxy(signal)] + #[zbus(signal)] fn status_notifier_item_registered(&self, name: &str) -> zbus::Result<()>; - #[dbus_proxy(signal)] + #[zbus(signal)] fn status_notifier_item_unregistered(&self, name: &str) -> zbus::Result<()>; } diff --git a/cosmic-applet-status-area/src/subscriptions/status_notifier_watcher/server.rs b/cosmic-applet-status-area/src/subscriptions/status_notifier_watcher/server.rs index 4550336f..8f95faf3 100644 --- a/cosmic-applet-status-area/src/subscriptions/status_notifier_watcher/server.rs +++ b/cosmic-applet-status-area/src/subscriptions/status_notifier_watcher/server.rs @@ -30,7 +30,7 @@ impl StatusNotifierWatcher { #[zbus(header)] hdr: MessageHeader<'_>, #[zbus(signal_context)] ctxt: SignalContext<'_>, ) { - let sender = hdr.sender().unwrap().unwrap(); + let sender = hdr.sender().unwrap(); let service = if service.starts_with('/') { format!("{}{}", sender, service) } else {