diff --git a/Cargo.lock b/Cargo.lock index 1d46f8a2..8c32c63e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -195,9 +195,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "apply" @@ -723,6 +723,17 @@ dependencies = [ "uuid", ] +[[package]] +name = "bstr" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + [[package]] name = "bumpalo" version = "3.19.0" @@ -1441,7 +1452,7 @@ dependencies = [ [[package]] name = "cosmic-client-toolkit" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols//?branch=main#6254f50abc6dbfccadc6939f80e20081ab5f9d51" +source = "git+https://github.com/pop-os/cosmic-protocols//?branch=main#d0e95be25e423cfe523b11111a3666ed7aaf0dc4" dependencies = [ "bitflags 2.9.4", "cosmic-protocols", @@ -1577,7 +1588,7 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols//?branch=main#6254f50abc6dbfccadc6939f80e20081ab5f9d51" +source = "git+https://github.com/pop-os/cosmic-protocols//?branch=main#d0e95be25e423cfe523b11111a3666ed7aaf0dc4" dependencies = [ "bitflags 2.9.4", "wayland-backend", @@ -1982,7 +1993,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.2", - "windows-sys 0.61.0", + "windows-sys 0.59.0", ] [[package]] @@ -2180,7 +2191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.0", + "windows-sys 0.52.0", ] [[package]] @@ -2480,10 +2491,11 @@ dependencies = [ [[package]] name = "freedesktop-desktop-entry" -version = "0.7.16" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae8fa6ad437c1e5becd0a2dd69fdd63a3ec29095496ba55fa4b911c242deea2" +checksum = "528df05c8ed0bfd569c7018914ba1995be2a133ba9ead17628ddb0ff94b86331" dependencies = [ + "bstr", "gettext-rs", "log", "memchr", @@ -4038,7 +4050,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.53.3", + "windows-targets 0.48.5", ] [[package]] @@ -5797,7 +5809,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.61.0", + "windows-sys 0.52.0", ] [[package]] @@ -5894,10 +5906,11 @@ checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -5914,10 +5927,19 @@ dependencies = [ ] [[package]] -name = "serde_derive" -version = "1.0.219" +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -6403,7 +6425,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix 1.1.2", - "windows-sys 0.61.0", + "windows-sys 0.52.0", ] [[package]] @@ -7402,7 +7424,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.0", + "windows-sys 0.48.0", ] [[package]] @@ -7608,15 +7630,6 @@ dependencies = [ "windows-targets 0.53.3", ] -[[package]] -name = "windows-sys" -version = "0.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" -dependencies = [ - "windows-link 0.2.0", -] - [[package]] name = "windows-targets" version = "0.42.2" diff --git a/Cargo.toml b/Cargo.toml index 0d27e87d..0fb226fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,12 +24,12 @@ members = [ resolver = "3" [workspace.dependencies] -anyhow = "1.0.99" -cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "6254f50" } +anyhow = "1.0.100" +cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "d0e95be" } cosmic-applets-config = { path = "cosmic-applets-config" } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [ "client", -], rev = "6254f50" } +], rev = "d0e95be" } cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions" } cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features = false } @@ -54,14 +54,14 @@ libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = fa ] } rust-embed = "8.7.2" rust-embed-utils = "8.7.2" -rustix = { version = "1.0", features = ["fs", "process"] } -zbus = { version = "5.10.0", default-features = false, features = ["tokio"] } +rustix = { version = "1.1", features = ["fs", "process"] } +zbus = { version = "5.11.0", default-features = false, features = ["tokio"] } tracing = "0.1" tracing-subscriber = { version = "0.3.20", features = ["env-filter"] } tracing-log = "0.2.0" tokio = { version = "1.47.1", features = ["full"] } cosmic-config = { git = "https://github.com/pop-os/libcosmic" } -serde = { version = "1.0.219", features = ["derive"] } +serde = { version = "1.0.228", features = ["derive"] } [profile.release] opt-level = 3 diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs index 9b55916f..e93e7a86 100755 --- a/cosmic-app-list/src/app.rs +++ b/cosmic-app-list/src/app.rs @@ -2287,7 +2287,7 @@ impl CosmicAppList { if self.active_workspaces.is_empty() { return Vec::new(); } - let current_output = self.core.applet.output_name.as_ref(); + let current_output = &self.core.applet.output_name; let mut focused_toplevels: Vec = Vec::new(); let active_workspaces = &self.active_workspaces; for toplevel_list in self.active_list.iter().chain(self.pinned_list.iter()) { @@ -2298,7 +2298,7 @@ impl CosmicAppList { .any(|workspace| t_info.workspace.contains(workspace)) && t_info.output.iter().any(|x| { self.output_list.get(x).is_some_and(|val| { - val.name.as_ref().is_some_and(|n| *n == current_output) + val.name.as_ref().is_some_and(|n| n == current_output) }) }) { diff --git a/cosmic-app-list/src/wayland_handler.rs b/cosmic-app-list/src/wayland_handler.rs index e5202cd9..248ec3b6 100644 --- a/cosmic-app-list/src/wayland_handler.rs +++ b/cosmic-app-list/src/wayland_handler.rs @@ -719,7 +719,7 @@ sctk::delegate_shm!(AppData); cctk::delegate_toplevel_info!(AppData); cctk::delegate_workspace!(AppData); cctk::delegate_toplevel_manager!(AppData); -cctk::delegate_screencopy!(AppData, session: [SessionData], frame: [FrameData]); +cctk::delegate_screencopy!(AppData); sctk::delegate_activation!(AppData, ExecRequestData); diff --git a/cosmic-applet-minimize/src/wayland_handler.rs b/cosmic-applet-minimize/src/wayland_handler.rs index af244a85..56fcb0a1 100644 --- a/cosmic-applet-minimize/src/wayland_handler.rs +++ b/cosmic-applet-minimize/src/wayland_handler.rs @@ -574,4 +574,4 @@ sctk::delegate_seat!(AppData); sctk::delegate_registry!(AppData); cctk::delegate_toplevel_info!(AppData); cctk::delegate_toplevel_manager!(AppData); -cctk::delegate_screencopy!(AppData, session: [SessionData], frame: [FrameData]); +cctk::delegate_screencopy!(AppData);