From 4be92ae8ca55dd38685a80cb8fcbefb683300e66 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 17 Oct 2025 16:14:25 -0600
Subject: [PATCH] Downgrade to zbus 4 in cosmic-files-applet to fix file
 manager interface

---
 Cargo.lock                     | 125 ++++++++++++++++++++++++++++++++-
 cosmic-files-applet/Cargo.toml |   2 +-
 2 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 39b4cfe..83663f9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -422,6 +422,17 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "async-fs"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5"
+dependencies = [
+ "async-lock 3.4.1",
+ "blocking",
+ "futures-lite 2.6.1",
+]
+
 [[package]]
 name = "async-io"
 version = "1.13.0"
@@ -1509,7 +1520,7 @@ version = "0.1.0"
 dependencies = [
  "cosmic-files",
  "log",
- "zbus 5.11.0",
+ "zbus 4.4.0",
 ]
 
 [[package]]
@@ -4928,6 +4939,19 @@ dependencies = [
  "memoffset 0.7.1",
 ]
 
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.9.4",
+ "cfg-if",
+ "cfg_aliases 0.2.1",
+ "libc",
+ "memoffset 0.9.1",
+]
+
 [[package]]
 name = "nix"
 version = "0.30.1"
@@ -9066,6 +9090,44 @@ dependencies = [
  "zvariant 3.15.2",
 ]
 
+[[package]]
+name = "zbus"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+dependencies = [
+ "async-broadcast 0.7.2",
+ "async-executor",
+ "async-fs",
+ "async-io 2.6.0",
+ "async-lock 3.4.1",
+ "async-process 2.5.0",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener 5.4.1",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.29.0",
+ "ordered-stream",
+ "rand 0.8.5",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros 4.4.0",
+ "zbus_names 3.0.0",
+ "zvariant 4.2.0",
+]
+
 [[package]]
 name = "zbus"
 version = "5.11.0"
@@ -9114,6 +9176,19 @@ dependencies = [
  "zvariant_utils 1.0.1",
 ]
 
+[[package]]
+name = "zbus_macros"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+dependencies = [
+ "proc-macro-crate 3.4.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+ "zvariant_utils 2.1.0",
+]
+
 [[package]]
 name = "zbus_macros"
 version = "5.11.0"
@@ -9140,6 +9215,17 @@ dependencies = [
  "zvariant 3.15.2",
 ]
 
+[[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.2.0",
+]
+
 [[package]]
 name = "zbus_names"
 version = "4.2.0"
@@ -9363,6 +9449,19 @@ dependencies = [
  "zvariant_derive 3.15.2",
 ]
 
+[[package]]
+name = "zvariant"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zvariant_derive 4.2.0",
+]
+
 [[package]]
 name = "zvariant"
 version = "5.7.0"
@@ -9391,6 +9490,19 @@ dependencies = [
  "zvariant_utils 1.0.1",
 ]
 
+[[package]]
+name = "zvariant_derive"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+dependencies = [
+ "proc-macro-crate 3.4.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+ "zvariant_utils 2.1.0",
+]
+
 [[package]]
 name = "zvariant_derive"
 version = "5.7.0"
@@ -9415,6 +9527,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "zvariant_utils"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "zvariant_utils"
 version = "3.2.1"
diff --git a/cosmic-files-applet/Cargo.toml b/cosmic-files-applet/Cargo.toml
index 08555f0..f26222f 100644
--- a/cosmic-files-applet/Cargo.toml
+++ b/cosmic-files-applet/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2024"
 
 [dependencies]
 log = "0.4"
-zbus = "5"
+zbus = "4" # Blocking connection in zbus 5 hangs
 
 [dependencies.cosmic-files]
 path = ".."