Merge remote-tracking branch 'upstream/master' into local/yoda-main

# Conflicts:
#	Cargo.lock

Cargo.lock

@@ -506,7 +506,8 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cosmic-client-toolkit"
-version = "0.2.0"
+version = "0.1.0"
+source = "git+https://github.com/pop-os//cosmic-protocols#af1997b1827ad64aab46fa31c0b77fb20d7a537a"
 dependencies = [
  "bitflags",
  "cosmic-protocols",
@@ -518,7 +519,8 @@ dependencies = [
 
 [[package]]
 name = "cosmic-protocols"
-version = "0.2.0"
+version = "0.1.0"
+source = "git+https://github.com/pop-os//cosmic-protocols#af1997b1827ad64aab46fa31c0b77fb20d7a537a"
 dependencies = [
  "bitflags",
  "wayland-backend",
@@ -1498,6 +1500,19 @@ dependencies = [
  "unicase",
 ]
 
+[[package]]
+name = "nix"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -2350,6 +2365,12 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -2365,6 +2386,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 [[package]]
 name = "switcheroo-control"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/dbus-settings-bindings#0fa672f8dadb884001ef9a251b149ed432879629"
 dependencies = [
  "zbus",
 ]
@@ -2593,7 +2615,7 @@ dependencies = [
  "indexmap 2.11.4",
  "toml_datetime",
  "toml_parser",
- "winnow 0.7.13",
+ "winnow",
 ]
 
 [[package]]
@@ -2602,7 +2624,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627"
 dependencies = [
- "winnow 0.7.13",
+ "winnow",
 ]
 
 [[package]]
@@ -2788,7 +2810,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
  "js-sys",
- "serde",
  "wasm-bindgen",
 ]
 
@@ -3392,15 +3413,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winnow"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "wit-bindgen"
 version = "0.46.0"
@@ -3471,9 +3483,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.15.0"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3bcbf15c8708d7fc1be0c993622e0a5cbd5e8b52bfa40afa4c3e0cd8d724ac1"
+checksum = "2d07e46d035fb8e375b2ce63ba4e4ff90a7f73cf2ffb0138b29e1158d2eaadf7"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -3489,16 +3501,14 @@ dependencies = [
  "futures-core",
  "futures-lite",
  "hex",
- "libc",
+ "nix",
  "ordered-stream",
- "rustix",
  "serde",
  "serde_repr",
  "tracing",
  "uds_windows",
- "uuid",
+ "windows-sys 0.60.2",
- "windows-sys 0.61.0",
+ "winnow",
- "winnow 1.0.3",
  "zbus_macros",
  "zbus_names",
  "zvariant",
@@ -3506,9 +3516,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.15.0"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51fa5406ad9175a8c825a931f8cf347116b531b3634fcb0b627c290f1f2516ff"
+checksum = "57e797a9c847ed3ccc5b6254e8bcce056494b375b511b3d6edcec0aeb4defaca"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -3521,12 +3531,13 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.3.2"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d"
+checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
 dependencies = [
  "serde",
- "winnow 1.0.3",
+ "static_assertions",
+ "winnow",
  "zvariant",
 ]
 
@@ -3612,23 +3623,23 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.11.0"
+version = "5.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c1567a6ec68df868cbbfde844cfc6d81649fe5109a62b116b19fabd53e618ee"
+checksum = "999dd3be73c52b1fccd109a4a81e4fcd20fab1d3599c8121b38d04e1419498db"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
- "winnow 1.0.3",
+ "winnow",
  "zvariant_derive",
  "zvariant_utils",
 ]
 
 [[package]]
 name = "zvariant_derive"
-version = "5.11.0"
+version = "5.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d5b780599bbde114e39d9a0799577fad1ced5105d38515745f7b3099d8ceda"
+checksum = "6643fd0b26a46d226bd90d3f07c1b5321fe9bb7f04673cb37ac6d6883885b68e"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -3639,73 +3650,13 @@ dependencies = [
 
 [[package]]
 name = "zvariant_utils"
-version = "3.3.1"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d464f5733ffa07a3164d656f18533caace9d0638596721355d73256a410d691"
+checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde",
  "syn",
- "winnow 1.0.3",
+ "winnow",
 ]
-
-[[patch.unused]]
-name = "softbuffer"
-version = "0.4.1"
-
-[[patch.unused]]
-name = "dpi"
-version = "0.1.2"
-
-[[patch.unused]]
-name = "winit"
-version = "0.31.0-beta.2"
-
-[[patch.unused]]
-name = "winit-android"
-version = "0.31.0-beta.2"
-
-[[patch.unused]]
-name = "winit-appkit"
-version = "0.31.0-beta.2"
-
-[[patch.unused]]
-name = "winit-common"
-version = "0.31.0-beta.2"
-
-[[patch.unused]]
-name = "winit-core"
-version = "0.31.0-beta.2"
-
-[[patch.unused]]
-name = "winit-orbital"
-version = "0.31.0-beta.2"
-
-[[patch.unused]]
-name = "winit-uikit"
-version = "0.31.0-beta.2"
-
-[[patch.unused]]
-name = "winit-wayland"
-version = "0.31.0-beta.2"
-
-[[patch.unused]]
-name = "winit-web"
-version = "0.31.0-beta.2"
-
-[[patch.unused]]
-name = "winit-win32"
-version = "0.31.0-beta.2"
-
-[[patch.unused]]
-name = "winit-x11"
-version = "0.31.0-beta.2"
-
-[[patch.unused]]
-name = "cosmic-freedesktop-icons"
-version = "0.4.0"
-
-[[patch.unused]]
-name = "smithay-clipboard"
-version = "0.8.0"

plugins/src/desktop_entries/mod.rs

@@ -299,7 +299,7 @@ impl<W: AsyncWrite + Unpin> App<W> {
 
         if let Some(gpus) = self.gpus.as_ref() {
             let default_idx = if entry.prefers_non_default_gpu() {
-                gpus.iter().position(|gpu| !gpu.default).unwrap_or(0)
+                gpus.iter().position(|gpu| gpu.discrete).unwrap_or(0)
             } else {
                 gpus.iter().position(|gpu| gpu.default).unwrap_or(0)
             };