diff --git a/Cargo.lock b/Cargo.lock index 85be461..9cb3fd9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -101,7 +101,7 @@ dependencies = [ [[package]] name = "accounts-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#70ed219735e312ac8cc3f592a01fa8023f36939b" +source = "git+https://github.com/pop-os/dbus-settings-bindings#87c3c35666b926a24a1e8045fd70be2db1145e34" dependencies = [ "zbus 5.12.0", ] @@ -339,7 +339,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -579,7 +579,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -614,7 +614,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -690,7 +690,7 @@ dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -788,7 +788,7 @@ dependencies = [ "regex", "rustc-hash 2.1.1", "shlex", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -914,7 +914,7 @@ dependencies = [ [[package]] name = "bluez-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#70ed219735e312ac8cc3f592a01fa8023f36939b" +source = "git+https://github.com/pop-os/dbus-settings-bindings#87c3c35666b926a24a1e8045fd70be2db1145e34" dependencies = [ "futures-channel", "futures-util", @@ -987,7 +987,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -1080,9 +1080,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.51" +version = "1.2.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203" +checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3" dependencies = [ "find-msvc-tools", "jobserver", @@ -1190,9 +1190,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.53" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" +checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" dependencies = [ "clap_builder", "clap_derive", @@ -1200,9 +1200,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.53" +version = "4.5.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" +checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" dependencies = [ "anstream", "anstyle", @@ -1219,7 +1219,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -1483,10 +1483,10 @@ dependencies = [ [[package]] name = "cosmic-client-toolkit" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4" dependencies = [ "bitflags 2.10.0", - "cosmic-protocols", + "cosmic-protocols 0.1.0", "libc", "smithay-client-toolkit 0.20.0", "wayland-client", @@ -1496,11 +1496,11 @@ dependencies = [ [[package]] name = "cosmic-comp-config" version = "1.0.0" -source = "git+https://github.com/pop-os/cosmic-comp#8a5d78dbb0eef579bc6afab5315363e872a15185" +source = "git+https://github.com/pop-os/cosmic-comp#15b6b678c1303b6ace3af47d21abb2df1d583824" dependencies = [ "cosmic-config", "input", - "ron", + "ron 0.11.0", "serde", "tracing", ] @@ -1508,7 +1508,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1517,8 +1517,8 @@ dependencies = [ "futures-util", "iced_futures", "known-folders", - "notify 8.2.0", - "ron", + "notify", + "ron 0.11.0", "serde", "tokio", "tracing", @@ -1529,16 +1529,16 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] name = "cosmic-dbus-a11y" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#70ed219735e312ac8cc3f592a01fa8023f36939b" +source = "git+https://github.com/pop-os/dbus-settings-bindings#87c3c35666b926a24a1e8045fd70be2db1145e34" dependencies = [ "zbus 5.12.0", ] @@ -1546,7 +1546,7 @@ dependencies = [ [[package]] name = "cosmic-dbus-networkmanager" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#70ed219735e312ac8cc3f592a01fa8023f36939b" +source = "git+https://github.com/pop-os/dbus-settings-bindings#87c3c35666b926a24a1e8045fd70be2db1145e34" dependencies = [ "bitflags 2.10.0", "derive_builder", @@ -1584,7 +1584,7 @@ name = "cosmic-mime-apps" version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-mime-apps#157c516dbb9f2595da59c55b8cc9492070989279" dependencies = [ - "freedesktop-desktop-entry", + "freedesktop-desktop-entry 0.7.19", "mime 0.3.17", "quick-xml", "xdg", @@ -1620,7 +1620,21 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols//?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=d0e95be#d0e95be25e423cfe523b11111a3666ed7aaf0dc4" +dependencies = [ + "bitflags 2.10.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "cosmic-protocols" +version = "0.2.0" +source = "git+https://github.com/pop-os/cosmic-protocols#160b086abe03cd34a8a375d7fbe47b24308d1f38" dependencies = [ "bitflags 2.10.0", "wayland-backend", @@ -1636,8 +1650,8 @@ name = "cosmic-randr" version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-randr#741089cf5e3aa7d5e48042101c1d4cc813b13637" dependencies = [ - "cosmic-protocols", - "indexmap 2.12.1", + "cosmic-protocols 0.2.0", + "indexmap 2.13.0", "thiserror 2.0.17", "tokio", "tracing", @@ -1674,7 +1688,7 @@ dependencies = [ "cosmic-idle-config", "cosmic-mime-apps", "cosmic-panel-config", - "cosmic-protocols", + "cosmic-protocols 0.2.0", "cosmic-randr", "cosmic-randr-shell", "cosmic-settings-a11y-manager-subscription", @@ -1692,7 +1706,7 @@ dependencies = [ "dirs", "eyre", "fontdb 0.23.0", - "freedesktop-desktop-entry", + "freedesktop-desktop-entry 0.8.1", "futures", "gettext-rs", "hostname-validator", @@ -1701,7 +1715,7 @@ dependencies = [ "i18n-embed-fl", "icu", "image", - "indexmap 2.12.1", + "indexmap 2.13.0", "itertools 0.14.0", "itoa", "libcosmic", @@ -1709,11 +1723,11 @@ dependencies = [ "locales-rs", "mime 0.3.17", "nm-secret-agent-manager", - "notify 6.1.1", + "notify", "num-traits", "pwhash", "regex", - "ron", + "ron 0.12.0", "rust-embed", "rustix 1.1.3", "secure-string", @@ -1735,13 +1749,15 @@ dependencies = [ "xkeysym", "zbus 5.12.0", "zbus_polkit", + "zvariant 5.8.0", + "zvariant_derive 5.8.0", ] [[package]] name = "cosmic-settings-a11y-manager-subscription" version = "1.0.2" dependencies = [ - "cosmic-protocols", + "cosmic-protocols 0.2.0", "iced_futures", "num-derive", "num-traits", @@ -1791,7 +1807,7 @@ version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-settings-daemon#ef024bfd06bf9fbd57246a25c91d1fdd28153d05" dependencies = [ "cosmic-config", - "ron", + "ron 0.11.0", "serde", "serde_with", "tracing", @@ -1801,7 +1817,7 @@ dependencies = [ [[package]] name = "cosmic-settings-daemon" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#70ed219735e312ac8cc3f592a01fa8023f36939b" +source = "git+https://github.com/pop-os/dbus-settings-bindings#87c3c35666b926a24a1e8045fd70be2db1145e34" dependencies = [ "zbus 5.12.0", ] @@ -1930,14 +1946,14 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "almost", "cosmic-config", "csscolorparser", "dirs", "palette", - "ron", + "ron 0.11.0", "serde", "serde_json", "thiserror 2.0.17", @@ -1961,15 +1977,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -2091,7 +2098,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2105,7 +2112,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2116,7 +2123,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core 0.20.11", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2127,7 +2134,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2175,7 +2182,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2185,7 +2192,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2197,7 +2204,7 @@ dependencies = [ "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2208,7 +2215,7 @@ checksum = "ccfae181bab5ab6c5478b2ccb69e4c68a02f8c3ec72f6616bfec9dbc599d2ee0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2249,7 +2256,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2278,7 +2285,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2403,7 +2410,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2423,7 +2430,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2439,7 +2446,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2582,7 +2589,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2594,18 +2601,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "filetime" -version = "0.2.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed" -dependencies = [ - "cfg-if", - "libc", - "libredox", - "windows-sys 0.60.2", -] - [[package]] name = "find-crate" version = "0.6.3" @@ -2617,9 +2612,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff" +checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41" [[package]] name = "fixed_decimal" @@ -2775,7 +2770,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -2808,6 +2803,21 @@ dependencies = [ "xdg", ] +[[package]] +name = "freedesktop-desktop-entry" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28273c5c6b97a5f07724f6652f064c0c7f637f9aa5e7c09c83bc3bc4ad4ea245" +dependencies = [ + "bstr", + "gettext-rs", + "log", + "memchr", + "thiserror 2.0.17", + "unicase", + "xdg", +] + [[package]] name = "fs-err" version = "3.2.2" @@ -2912,7 +2922,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -3279,7 +3289,7 @@ checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2" [[package]] name = "hostname1-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#70ed219735e312ac8cc3f592a01fa8023f36939b" +source = "git+https://github.com/pop-os/dbus-settings-bindings#87c3c35666b926a24a1e8045fd70be2db1145e34" dependencies = [ "zbus 5.12.0", ] @@ -3334,7 +3344,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.112", + "syn 2.0.114", "unic-langid", ] @@ -3348,7 +3358,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -3378,7 +3388,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "dnd", "iced_accessibility", @@ -3396,7 +3406,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "accesskit", "accesskit_winit", @@ -3405,7 +3415,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "bitflags 2.10.0", "bytes", @@ -3430,7 +3440,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "futures", "iced_core", @@ -3456,7 +3466,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "bitflags 2.10.0", "bytemuck", @@ -3478,7 +3488,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3490,7 +3500,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3506,7 +3516,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "bytemuck", "cosmic-text", @@ -3522,7 +3532,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "as-raw-xcb-connection", "bitflags 2.10.0", @@ -3553,7 +3563,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3574,7 +3584,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -4097,9 +4107,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", "hashbrown 0.16.1", @@ -4116,17 +4126,6 @@ dependencies = [ "cfb", ] -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - [[package]] name = "inotify" version = "0.11.0" @@ -4193,7 +4192,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -4539,7 +4538,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d463f34ca3c400fde3a054da0e0b8c6ffa21e4590922f3e18281bb5eeef4cbdc" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4597,14 +4596,14 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" [[package]] name = "libc" -version = "0.2.178" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#a9f64c33ce9159485be5dad1ce07ccf7c12399d5" +source = "git+https://github.com/pop-os/libcosmic#b9c24d24212a865977db4871efc13ff890055648" dependencies = [ "apply", "ashpd 0.12.0", @@ -4613,10 +4612,12 @@ dependencies = [ "cosmic-client-toolkit", "cosmic-config", "cosmic-freedesktop-icons", + "cosmic-settings-config", "cosmic-settings-daemon", "cosmic-theme", "css-color", "derive_setters", + "freedesktop-desktop-entry 0.8.1", "futures", "i18n-embed", "i18n-embed-fl", @@ -4631,14 +4632,18 @@ dependencies = [ "iced_widget", "iced_winit", "image", + "libc", "log", + "mime 0.3.17", "palette", "phf 0.13.1", "raw-window-handle", "rfd", - "ron", + "ron 0.11.0", "rust-embed", + "rustix 1.1.3", "serde", + "shlex", "slotmap", "taffy", "thiserror 2.0.17", @@ -4769,7 +4774,7 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "locale1" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#70ed219735e312ac8cc3f592a01fa8023f36939b" +source = "git+https://github.com/pop-os/dbus-settings-bindings#87c3c35666b926a24a1e8045fd70be2db1145e34" dependencies = [ "zbus 5.12.0", ] @@ -5016,18 +5021,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - [[package]] name = "mio" version = "1.1.1" @@ -5068,7 +5061,7 @@ dependencies = [ "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", - "indexmap 2.12.1", + "indexmap 2.13.0", "log", "rustc-hash 1.1.0", "spirv", @@ -5150,7 +5143,7 @@ dependencies = [ [[package]] name = "nm-secret-agent-manager" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#70ed219735e312ac8cc3f592a01fa8023f36939b" +source = "git+https://github.com/pop-os/dbus-settings-bindings#87c3c35666b926a24a1e8045fd70be2db1145e34" dependencies = [ "zbus 5.12.0", ] @@ -5180,25 +5173,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" -[[package]] -name = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.10.0", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify 0.9.6", - "kqueue", - "libc", - "log", - "mio 0.8.11", - "walkdir", - "windows-sys 0.48.0", -] - [[package]] name = "notify" version = "8.2.0" @@ -5207,11 +5181,11 @@ checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ "bitflags 2.10.0", "fsevent-sys", - "inotify 0.11.0", + "inotify", "kqueue", "libc", "log", - "mio 1.1.1", + "mio", "notify-types", "walkdir", "windows-sys 0.60.2", @@ -5238,7 +5212,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5288,7 +5262,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -5361,7 +5335,7 @@ dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -5690,10 +5664,11 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.49" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "247ad146e19b9437f8604c21f8652423595cf710ad108af40e77d3ae6e96b827" +checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd" dependencies = [ + "libc", "libredox", ] @@ -5728,7 +5703,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -5768,7 +5743,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -5894,7 +5869,7 @@ dependencies = [ "phf_shared 0.11.3", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -5907,7 +5882,7 @@ dependencies = [ "phf_shared 0.13.1", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -5951,7 +5926,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -6143,14 +6118,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] name = "proc-macro2" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0" +checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" dependencies = [ "unicode-ident", ] @@ -6163,7 +6138,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", "version_check", "yansi", ] @@ -6205,7 +6180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" dependencies = [ "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -6264,9 +6239,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.42" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" dependencies = [ "proc-macro2", ] @@ -6500,7 +6475,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -6600,6 +6575,20 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "ron" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32" +dependencies = [ + "bitflags 2.10.0", + "once_cell", + "serde", + "serde_derive", + "typeid", + "unicode-ident", +] + [[package]] name = "roxmltree" version = "0.20.0" @@ -6626,7 +6615,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.112", + "syn 2.0.114", "walkdir", ] @@ -6695,7 +6684,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -6852,16 +6841,16 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] name = "serde_json" -version = "1.0.148" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ - "indexmap 2.12.1", + "indexmap 2.13.0", "itoa", "memchr", "serde", @@ -6877,7 +6866,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -6899,7 +6888,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.12.1", + "indexmap 2.13.0", "schemars 0.9.0", "schemars 1.2.0", "serde_core", @@ -6917,7 +6906,7 @@ dependencies = [ "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -7308,9 +7297,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.112" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21f182278bf2d2bcb3c88b1b08a37df029d71ce3d3ae26168e3c653b213b99d4" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", @@ -7325,7 +7314,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -7339,9 +7328,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.36.1" +version = "0.37.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252800745060e7b9ffb7b2badbd8b31cfa4aa2e61af879d0a3bf2a317c20217d" +checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f" dependencies = [ "libc", "memchr", @@ -7360,7 +7349,7 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 0.9.10+spec-1.1.0", + "toml 0.9.11+spec-1.1.0", "version-compare", ] @@ -7398,7 +7387,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix 1.1.3", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -7436,7 +7425,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -7447,7 +7436,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -7507,7 +7496,7 @@ dependencies = [ [[package]] name = "timedate-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings#70ed219735e312ac8cc3f592a01fa8023f36939b" +source = "git+https://github.com/pop-os/dbus-settings-bindings#87c3c35666b926a24a1e8045fd70be2db1145e34" dependencies = [ "zbus 5.12.0", ] @@ -7579,13 +7568,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.48.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ "bytes", "libc", - "mio 1.1.1", + "mio", "pin-project-lite", "signal-hook-registry", "socket2 0.6.1", @@ -7602,14 +7591,14 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] name = "tokio-stream" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" dependencies = [ "futures-core", "pin-project-lite", @@ -7627,11 +7616,11 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.10+spec-1.1.0" +version = "0.9.11+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48" +checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" dependencies = [ - "indexmap 2.12.1", + "indexmap 2.13.0", "serde_core", "serde_spanned", "toml_datetime 0.7.5+spec-1.1.0", @@ -7661,7 +7650,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.12.1", + "indexmap 2.13.0", "toml_datetime 0.6.11", "winnow 0.5.40", ] @@ -7672,7 +7661,7 @@ version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ - "indexmap 2.12.1", + "indexmap 2.13.0", "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "winnow 0.7.14", @@ -7713,7 +7702,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -7789,6 +7778,12 @@ dependencies = [ "rustc-hash 2.1.1", ] +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + [[package]] name = "typenum" version = "1.19.0" @@ -7839,9 +7834,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.8.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" [[package]] name = "unicode-bidi" @@ -7918,7 +7913,7 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "upower_dbus" version = "0.3.2" -source = "git+https://github.com/pop-os/dbus-settings-bindings#70ed219735e312ac8cc3f592a01fa8023f36939b" +source = "git+https://github.com/pop-os/dbus-settings-bindings#87c3c35666b926a24a1e8045fd70be2db1145e34" dependencies = [ "serde", "serde_repr", @@ -7927,14 +7922,15 @@ dependencies = [ [[package]] name = "url" -version = "2.5.7" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", "percent-encoding", "serde", + "serde_derive", ] [[package]] @@ -8104,7 +8100,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", "wasm-bindgen-shared", ] @@ -8344,7 +8340,7 @@ dependencies = [ "bitflags 2.10.0", "cfg_aliases 0.1.1", "document-features", - "indexmap 2.12.1", + "indexmap 2.13.0", "log", "naga", "once_cell", @@ -8442,7 +8438,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] @@ -8574,7 +8570,7 @@ checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -8585,7 +8581,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -8596,7 +8592,7 @@ checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -8607,7 +8603,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -9260,7 +9256,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", "synstructure", ] @@ -9358,10 +9354,10 @@ dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", "zbus_names 4.2.0", "zvariant 5.8.0", - "zvariant_utils 3.2.1", + "zvariant_utils 3.3.0", ] [[package]] @@ -9408,22 +9404,22 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.8.31" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" +checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.31" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" +checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] @@ -9443,7 +9439,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", "synstructure", ] @@ -9484,14 +9480,14 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.114", ] [[package]] name = "zmij" -version = "1.0.5" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3280a1b827474fcd5dbef4b35a674deb52ba5c312363aef9135317df179d81b" +checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8" [[package]] name = "zune-core" @@ -9558,7 +9554,7 @@ dependencies = [ "url", "winnow 0.7.14", "zvariant_derive 5.8.0", - "zvariant_utils 3.2.1", + "zvariant_utils 3.3.0", ] [[package]] @@ -9583,8 +9579,8 @@ dependencies = [ "proc-macro-crate 3.4.0", "proc-macro2", "quote", - "syn 2.0.112", - "zvariant_utils 3.2.1", + "syn 2.0.114", + "zvariant_utils 3.3.0", ] [[package]] @@ -9600,13 +9596,13 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599" +checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9" dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.112", + "syn 2.0.114", "winnow 0.7.14", ] diff --git a/Cargo.toml b/Cargo.toml index ef65a03..3ec1c40 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,10 +8,10 @@ rust-version = "1.85" [workspace.dependencies] cosmic-randr = { git = "https://github.com/pop-os/cosmic-randr" } -tokio = { version = "1.48.0", features = ["macros"] } +tokio = { version = "1.49.0", features = ["macros"] } [workspace.dependencies.libcosmic] -features = ["dbus-config", "multi-window", "winit", "tokio", "qr_code"] +features = ["dbus-config", "desktop", "multi-window", "winit", "tokio", "qr_code"] git = "https://github.com/pop-os/libcosmic" [workspace.dependencies.cosmic-config] @@ -34,9 +34,8 @@ git = "https://github.com/pop-os/cosmic-panel" git = "https://github.com/pop-os/cosmic-randr" [workspace.dependencies.sctk] -git = "https://github.com/smithay/client-toolkit/" +version = "0.20" package = "smithay-client-toolkit" -# rev = "c583de8" [profile.dev] opt-level = 3 @@ -52,13 +51,12 @@ inherits = "release" lto = "off" debug = true -# Fix text rendering being cut off on the right # [patch.'https://github.com/pop-os/cosmic-text'] # cosmic-text = { git = "https://github.com/pop-os/cosmic-text//", rev = "b017d7c" } -[patch.'https://github.com/pop-os/cosmic-protocols'] -cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" } -cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" } +# [patch.'https://github.com/pop-os/cosmic-protocols'] +# cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" } +# cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", rev = "d0e95be" } # [patch.'https://github.com/pop-os/cosmic-settings-daemon'] # cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon//", branch = "input_nobuild" } @@ -74,6 +72,3 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" } # upower_dbus = { path = "../dbus-settings-bindings/upower" } # nm-secret-agent-manager = { git = "https://github.com/pop-os/dbus-settings-bindings//", branch = "nm-secret-agent" } - -[patch."https://github.com/smithay/client-toolkit.git"] -sctk = { package = "smithay-client-toolkit", version = "0.20.0" } diff --git a/cosmic-settings/Cargo.toml b/cosmic-settings/Cargo.toml index c95d8a0..51583ad 100644 --- a/cosmic-settings/Cargo.toml +++ b/cosmic-settings/Cargo.toml @@ -12,7 +12,7 @@ ashpd = { version = "0.12", default-features = false, features = [ "tokio", ], optional = true } chrono = "0.4.42" -clap = { version = "4.5.51", features = ["derive"] } +clap = { version = "4.5.54", features = ["derive"] } color-eyre = "0.6.5" cosmic-bg-config.workspace = true cosmic-comp-config = { workspace = true, optional = true } @@ -40,7 +40,7 @@ cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settin derive_setters = "0.1.8" dirs = "6.0.0" eyre = "0.6.12" -freedesktop-desktop-entry = "0.7.19" +freedesktop-desktop-entry = "0.8.1" futures = "0.3.31" hostname-validator = "1.1.1" hostname1-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } @@ -52,48 +52,51 @@ image = { version = "0.25", default-features = false, features = [ "webp", "hdr", ] } -indexmap = "2.12.0" +indexmap = "2.13.0" itertools = "0.14.0" -itoa = "1.0.15" +itoa = "1.0.17" libcosmic.workspace = true locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } -sysinfo = { version = "0.36.1", optional = true } +sysinfo = { version = "0.37.2", optional = true } mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", optional = true } -# TODO: updating notify beyond this hangs the app -notify = "6.1.1" +notify = "8.2.0" regex = "1.12.2" -ron = "0.11" +ron = "0.12" rust-embed = "8.9.0" sctk = { workspace = true, optional = true } secure-string = "0.3.0" serde = { version = "1.0.228", features = ["derive"] } slab = "0.4.11" -slotmap = "1.0.7" +slotmap = "1.1.1" static_init = "1.0.4" sunrise = "2.1.0" timedate-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } tokio = { workspace = true, features = ["fs", "io-util", "sync"] } -tracing = "0.1.41" -tracing-subscriber = { version = "0.3.20", features = ["env-filter"] } +tracing = "0.1.44" +tracing-subscriber = { version = "0.3.22", features = ["env-filter"] } udev = { version = "0.9.3", optional = true } upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } -url = "2.5.7" +url = "2.5.8" xkb-data = "0.2.1" xkeysym = { version = "0.2.1", optional = true } -zbus = { version = "5.12.0", default-features = false, features = [ +zbus = { version = "=5.12.0", default-features = false, features = [ "tokio", ], optional = true } zbus_polkit = { version = "5.0.0", optional = true } fontdb = "0.23.0" mime = "0.3.17" -rustix = { version = "1.1.2", features = ["process"] } +rustix = { version = "1.1.3", features = ["process"] } gettext-rs = { version = "0.7.7", features = [ "gettext-system", ], optional = true } async-fn-stream = "0.3" num-traits = "0.2" pwhash = "1" +# Pinned to fix ashpd. Remove this when fixed. +zvariant = "=5.8.0" +# Pinned to fix ashpd. Remove this when fixed. +zvariant_derive = "=5.8.0" [dependencies.icu] version = "2.1.1" diff --git a/cosmic-settings/src/subscription/desktop_files.rs b/cosmic-settings/src/subscription/desktop_files.rs index 68d5f55..b9bd5a2 100644 --- a/cosmic-settings/src/subscription/desktop_files.rs +++ b/cosmic-settings/src/subscription/desktop_files.rs @@ -2,98 +2,58 @@ use cosmic::{ iced::{Subscription, stream}, iced_futures::futures::{self, SinkExt}, }; -use notify::{Config, Event, RecommendedWatcher, RecursiveMode, Watcher}; +use notify::{Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher}; use std::fmt::Debug; use std::hash::Hash; -use tokio::sync::mpsc::{UnboundedReceiver, unbounded_channel}; - -#[derive(Debug)] -pub enum State { - Ready, - Waiting { - watcher: RecommendedWatcher, - rx: UnboundedReceiver>, - }, - Finished, -} +use tokio::sync::mpsc; #[derive(Debug, Clone, Copy)] -pub enum DesktopFileEvent { +pub enum Event { Changed, } pub fn desktop_files( id: I, -) -> cosmic::iced::Subscription { +) -> cosmic::iced::Subscription { Subscription::run_with_id( id, - stream::channel(50, move |mut output| async move { - let mut state = State::Ready; + stream::channel(1, move |mut output| async move { + let handle = tokio::runtime::Handle::current(); + let (tx, mut rx) = mpsc::channel(4); + let mut last_update = std::time::Instant::now(); - loop { - state = start_watching(state, &mut output).await; - } - }), - ) -} + // Automatically select the best implementation for your platform. + // You can also access each implementation directly e.g. INotifyWatcher. + let watcher = RecommendedWatcher::new( + move |res: Result| { + if let Ok(event) = res { + match event.kind { + EventKind::Create(_) | EventKind::Modify(_) | EventKind::Remove(_) => { + let now = std::time::Instant::now(); + if now.duration_since(last_update).as_secs() > 3 { + _ = handle.block_on(tx.send(())); + last_update = now; + } + } -async fn start_watching( - state: State, - output: &mut futures::channel::mpsc::Sender, -) -> State { - match state { - State::Ready => { - let paths = freedesktop_desktop_entry::default_paths(); - // TODO log errors - if let Ok((mut watcher, rx)) = async_watcher() { - for path in paths { + _ => (), + } + } + }, + Config::default(), + ); + + if let Ok(mut watcher) = watcher { + for path in cosmic::desktop::fde::default_paths() { let _ = watcher.watch(path.as_ref(), RecursiveMode::Recursive); } - _ = output.send(DesktopFileEvent::Changed).await; - State::Waiting { watcher, rx } - } else { - State::Finished + while rx.recv().await.is_some() { + _ = output.send(Event::Changed).await; + } } - } - State::Waiting { watcher, rx } => { - if let Some(rx) = async_watch(rx).await { - _ = output.send(DesktopFileEvent::Changed).await; - State::Waiting { watcher, rx } - } else { - State::Finished - } - } - State::Finished => cosmic::iced::futures::future::pending().await, - } -} - -fn async_watcher() -> notify::Result<(RecommendedWatcher, UnboundedReceiver>)> -{ - let (tx, rx) = unbounded_channel(); - - // Automatically select the best implementation for your platform. - // You can also access each implementation directly e.g. INotifyWatcher. - let watcher = RecommendedWatcher::new( - move |res| { - _ = tx.send(res); - }, - Config::default(), - )?; - - Ok((watcher, rx)) -} - -async fn async_watch( - mut rx: UnboundedReceiver>, -) -> Option>> { - // TODO log errors - if let Some(res) = rx.recv().await { - match res { - Ok(_) => return Some(rx), - Err(_) => return None, - } - } - - None + + futures::future::pending().await + }), + ) } diff --git a/crates/cosmic-pipewire/Cargo.toml b/crates/cosmic-pipewire/Cargo.toml index 34a93b6..eb6d766 100644 --- a/crates/cosmic-pipewire/Cargo.toml +++ b/crates/cosmic-pipewire/Cargo.toml @@ -8,13 +8,13 @@ license = "MPL-2.0" publish = true [dependencies] -intmap = "3.1.2" +intmap = "3.1.3" libspa = "0.9.2" libspa-sys = "0.9.2" pipewire = "0.9" serde = { version = "1.0.228", features = ["derive"]} -serde_json = "1.0.145" -tracing = "0.1.41" +serde_json = "1.0.149" +tracing = "0.1.44" [features] # Cache route port types diff --git a/page/Cargo.toml b/page/Cargo.toml index 82b9f9e..638e5de 100644 --- a/page/Cargo.toml +++ b/page/Cargo.toml @@ -6,8 +6,8 @@ edition = "2024" [dependencies] derive_setters = "0.1.8" regex = "1.12.2" -slotmap = "1.0.7" +slotmap = "1.1.1" libcosmic = { workspace = true } downcast-rs = "2.0.2" -url = "2.5.7" +url = "2.5.8" slab = "0.4.11" diff --git a/pages/wallpapers/Cargo.toml b/pages/wallpapers/Cargo.toml index 7c5af72..f3969d7 100644 --- a/pages/wallpapers/Cargo.toml +++ b/pages/wallpapers/Cargo.toml @@ -16,9 +16,9 @@ fast_image_resize = { version = "5", features = [ ] } futures-lite = "2.6.1" futures-util = "0.3.31" -image = "0.25.8" +image = "0.25.9" infer = "0.19.0" jxl-oxide = { version = "0.12.5", features = ["image"] } tokio = { workspace = true, features = ["sync"] } -tracing = "0.1.41" +tracing = "0.1.44" walkdir = "=2.5.0" diff --git a/subscriptions/a11y-manager/Cargo.toml b/subscriptions/a11y-manager/Cargo.toml index 70785a7..78dcdf6 100644 --- a/subscriptions/a11y-manager/Cargo.toml +++ b/subscriptions/a11y-manager/Cargo.toml @@ -11,6 +11,6 @@ cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols" } iced_futures = { git = "https://github.com/pop-os/libcosmic" } num-derive = "0.4.2" num-traits = "0.2.19" -sctk = { git = "https://github.com/smithay/client-toolkit/", package = "smithay-client-toolkit" } -tokio = "1.48.0" -tracing = "0.1.41" +sctk.workspace = true +tokio = "1.49.0" +tracing = "0.1.44" diff --git a/subscriptions/accessibility/Cargo.toml b/subscriptions/accessibility/Cargo.toml index 295a3ee..62526e2 100644 --- a/subscriptions/accessibility/Cargo.toml +++ b/subscriptions/accessibility/Cargo.toml @@ -10,6 +10,6 @@ publish = true cosmic-dbus-a11y = { git = "https://github.com/pop-os/dbus-settings-bindings" } futures = "0.3.31" iced_futures = { git = "https://github.com/pop-os/libcosmic" } -tokio = { version = "1.48.0", features = ["sync", "time"] } -tracing = "0.1.41" -zbus = "5" +tokio = { version = "1.49.0", features = ["sync", "time"] } +tracing = "0.1.44" +zbus = "5.12" diff --git a/subscriptions/airplane-mode/Cargo.toml b/subscriptions/airplane-mode/Cargo.toml index 6c74b48..324de7e 100644 --- a/subscriptions/airplane-mode/Cargo.toml +++ b/subscriptions/airplane-mode/Cargo.toml @@ -9,6 +9,6 @@ publish = true [dependencies] futures = "0.3.31" iced_futures = { git = "https://github.com/pop-os/libcosmic" } -log = "0.4.28" -rustix = "1.1.2" -tokio = "1.48.0" +log = "0.4.29" +rustix = "1.1.3" +tokio = "1.49.0" diff --git a/subscriptions/bluetooth/Cargo.toml b/subscriptions/bluetooth/Cargo.toml index 2ef6560..b1af60f 100644 --- a/subscriptions/bluetooth/Cargo.toml +++ b/subscriptions/bluetooth/Cargo.toml @@ -10,6 +10,6 @@ publish = true bluez-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings" } futures = "0.3.31" iced_futures = { git = "https://github.com/pop-os/libcosmic" } -tokio = "1.48.0" -tracing = "0.1.41" +tokio = "1.49.0" +tracing = "0.1.44" zbus = "5.12.0" diff --git a/subscriptions/network-manager/Cargo.toml b/subscriptions/network-manager/Cargo.toml index fdf2d05..77475bf 100644 --- a/subscriptions/network-manager/Cargo.toml +++ b/subscriptions/network-manager/Cargo.toml @@ -15,7 +15,7 @@ iced_futures = { git = "https://github.com/pop-os/libcosmic" } itertools = "0.14.0" secure-string = "0.3.0" thiserror = "2.0.17" -tokio = "1.48.0" -tracing = "0.1.41" +tokio = "1.49.0" +tracing = "0.1.44" zbus = { version = "5.12.0", features = ["tokio"] } bitflags = "2.10.0" diff --git a/subscriptions/settings-daemon/Cargo.toml b/subscriptions/settings-daemon/Cargo.toml index 4f79241..807cfe1 100644 --- a/subscriptions/settings-daemon/Cargo.toml +++ b/subscriptions/settings-daemon/Cargo.toml @@ -8,7 +8,7 @@ publish = true [dependencies] futures = "0.3.31" iced_futures = { git = "https://github.com/pop-os/libcosmic" } -log = "0.4.28" -tokio = "1.48.0" -tokio-stream = "0.1.17" +log = "0.4.29" +tokio = "1.49.0" +tokio-stream = "0.1.18" zbus = "5.12.0" diff --git a/subscriptions/sound/Cargo.toml b/subscriptions/sound/Cargo.toml index 60cae71..85820f6 100644 --- a/subscriptions/sound/Cargo.toml +++ b/subscriptions/sound/Cargo.toml @@ -9,12 +9,12 @@ publish = true [dependencies] cosmic-pipewire = { path = "../../crates/cosmic-pipewire" } futures = "0.3.31" -intmap = "3.1.2" +intmap = "3.1.3" libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false } numtoa = "1.0.0-alpha1" -rustix = "1.0.8" -tokio = { version = "1.47.1", features = ["process", "rt", "time"] } -tracing = { version = "0.1.41", default-features = false } +rustix = "1.1.3" +tokio = { version = "1.49.0", features = ["process", "rt", "time"] } +tracing = { version = "0.1.44", default-features = false } [features] # Set profile on first load diff --git a/subscriptions/upower/Cargo.toml b/subscriptions/upower/Cargo.toml index 4e72b73..173327a 100644 --- a/subscriptions/upower/Cargo.toml +++ b/subscriptions/upower/Cargo.toml @@ -9,8 +9,8 @@ publish = true [dependencies] futures = "0.3.31" iced_futures = { git = "https://github.com/pop-os/libcosmic" } -log = "0.4.28" -tokio = "1.48.0" -tokio-stream = "0.1.17" +log = "0.4.29" +tokio = "1.49.0" +tokio-stream = "0.1.18" upower_dbus = { git = "https://github.com/pop-os/dbus-settings-bindings" } zbus = "5.12.0"