diff --git a/Cargo.lock b/Cargo.lock index a3626bf..483014a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1210,16 +1210,16 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "atomicwrites", "cosmic-config-derive", "cosmic-settings-daemon", - "dirs 5.0.1", + "dirs 6.0.0", "futures-util", "iced_futures", "known-folders", - "notify", + "notify 8.0.0", "once_cell", "ron", "serde", @@ -1232,7 +1232,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "quote", "syn 1.0.109", @@ -1351,7 +1351,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.13.2" -source = "git+https://github.com/pop-os/cosmic-text.git#500a8fc6d172de5c9e08c6013070b6b7fcdf79dd" +source = "git+https://github.com/pop-os/cosmic-text.git#7b79d720cf5d19ef2c8eaf1955567edc5f0c305c" dependencies = [ "bitflags 2.9.0", "fontdb 0.16.2", @@ -1373,18 +1373,18 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "almost", "cosmic-config", "csscolorparser", - "dirs 5.0.1", + "dirs 6.0.0", "lazy_static", "palette", "ron", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] @@ -1478,9 +1478,9 @@ checksum = "42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a" [[package]] name = "csscolorparser" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +checksum = "46f9a16a848a7fb95dd47ce387ac1ee9a6df879ba784b815537fcd388a1a8288" dependencies = [ "phf", "serde", @@ -2786,7 +2786,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "dnd", "iced_accessibility", @@ -2804,7 +2804,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "accesskit", "accesskit_winit", @@ -2813,7 +2813,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "bitflags 2.9.0", "bytes", @@ -2837,7 +2837,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "futures", "iced_core", @@ -2863,7 +2863,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "bitflags 2.9.0", "bytemuck", @@ -2885,7 +2885,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2897,7 +2897,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -2912,7 +2912,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "bytemuck", "cosmic-text", @@ -2928,7 +2928,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "as-raw-xcb-connection", "bitflags 2.9.0", @@ -2959,7 +2959,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -2977,7 +2977,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3282,6 +3282,17 @@ dependencies = [ "libc", ] +[[package]] +name = "inotify" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" +dependencies = [ + "bitflags 2.9.0", + "inotify-sys", + "libc", +] + [[package]] name = "inotify-sys" version = "0.1.5" @@ -3557,7 +3568,7 @@ checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#91eae67dd59c70283590253d5a98688093017ebe" +source = "git+https://github.com/pop-os/libcosmic.git#e6326a28d71cb579077ac131630c4b3b7272ba0b" dependencies = [ "apply", "ashpd 0.9.2", @@ -3570,6 +3581,7 @@ dependencies = [ "css-color", "derive_setters", "freedesktop-desktop-entry", + "futures", "iced", "iced_core", "iced_futures", @@ -3585,12 +3597,12 @@ dependencies = [ "mime 0.3.17", "palette", "rfd", - "rustix 0.38.44", + "rustix 1.0.2", "serde", "shlex", "slotmap", "taffy", - "thiserror 1.0.69", + "thiserror 2.0.12", "tokio", "tracing", "unicode-segmentation", @@ -3960,6 +3972,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -4087,7 +4100,7 @@ dependencies = [ "crossbeam-channel", "filetime", "fsevent-sys", - "inotify", + "inotify 0.9.6", "kqueue", "libc", "log", @@ -4096,6 +4109,25 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "notify" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943" +dependencies = [ + "bitflags 2.9.0", + "filetime", + "fsevent-sys", + "inotify 0.11.0", + "kqueue", + "libc", + "log", + "mio 1.0.3", + "notify-types", + "walkdir", + "windows-sys 0.59.0", +] + [[package]] name = "notify-debouncer-full" version = "0.3.2" @@ -4105,7 +4137,7 @@ dependencies = [ "crossbeam-channel", "file-id", "log", - "notify", + "notify 6.1.1", "parking_lot 0.12.3", "walkdir", ] @@ -4124,6 +4156,12 @@ dependencies = [ "zbus 5.5.0", ] +[[package]] +name = "notify-types" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -5276,9 +5314,9 @@ dependencies = [ [[package]] name = "ron" -version = "0.9.0-alpha.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7644a2a539ff7fa991c8f4652373cd722d387e39229415103243914249730836" +checksum = "63f3aa105dea217ef30d89581b65a4d527a19afc95ef5750be3890e8d3c5b837" dependencies = [ "base64", "bitflags 2.9.0", diff --git a/Cargo.toml b/Cargo.toml index 65aecbe..061834e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -114,9 +114,6 @@ xdg-mime = { git = "https://github.com/ellieplayswow/xdg-mime-rs", branch = "fea # libcosmic = { path = "../libcosmic" } # cosmic-config = { path = "../libcosmic/cosmic-config" } # cosmic-theme = { path = "../libcosmic/cosmic-theme" } -# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "drop-menu-tree-changes" } -# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "drop-menu-tree-changes" } -# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "drop-menu-tree-changes" } # [patch.'https://github.com/pop-os/smithay-clipboard'] # smithay-clipboard = { path = "../smithay-clipboard" }