diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 1b02645..7ce7fcb 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -190,6 +190,23 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +[[package]] +name = "ashpd" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "618a409b91d5265798a99e3d1d0b226911605e581c4e7255e83c1e397b172bce" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "rand 0.9.2", + "serde", + "serde_repr", + "tokio", + "url", + "zbus 5.13.2", +] + [[package]] name = "astral-tokio-tar" version = "0.5.6" @@ -230,6 +247,19 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-compat" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ba85bc55464dcbf728b56d97e119d673f4cf9062be330a9a26f3acf504a590" +dependencies = [ + "futures-core", + "futures-io", + "once_cell", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-compression" version = "0.4.19" @@ -1649,9 +1679,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97" dependencies = [ "bitflags 2.10.0", "core-foundation 0.10.1", @@ -2054,12 +2084,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - [[package]] name = "dispatch2" version = "0.3.0" @@ -5743,6 +5767,7 @@ dependencies = [ "serde", "serde_json", "strip-ansi-escapes", + "tao", "tauri", "tauri-build", "tauri-plugin-dialog", @@ -9412,22 +9437,23 @@ dependencies = [ [[package]] name = "tao" version = "0.34.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7" +source = "git+https://github.com/haecker-felix/tao.git?branch=color-scheme#5fee8c74d5fd5ff7d0f532648ddc8cafc05482e2" dependencies = [ + "ashpd", + "async-compat", "bitflags 2.10.0", "block2", "core-foundation 0.10.1", "core-graphics", "crossbeam-channel", - "dispatch", + "dispatch2", "dlopen2", "dpi", + "futures-lite", "gdkwayland-sys", "gdkx11-sys", "gtk", "jni", - "lazy_static", "libc", "log", "ndk", @@ -9439,8 +9465,7 @@ dependencies = [ "once_cell", "parking_lot", "raw-window-handle", - "scopeguard", - "tao-macros", + "tao-macros 0.1.3 (git+https://github.com/haecker-felix/tao.git?branch=color-scheme)", "unicode-segmentation", "url", "windows 0.61.3", @@ -9460,6 +9485,16 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "tao-macros" +version = "0.1.3" +source = "git+https://github.com/haecker-felix/tao.git?branch=color-scheme#5fee8c74d5fd5ff7d0f532648ddc8cafc05482e2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + [[package]] name = "tap" version = "1.0.1" @@ -12845,7 +12880,7 @@ dependencies = [ "raw-window-handle", "sha2", "soup3", - "tao-macros", + "tao-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 2.0.18", "url", "webkit2gtk", @@ -13279,6 +13314,7 @@ dependencies = [ "endi", "enumflags2", "serde", + "url", "winnow 0.7.14", "zvariant_derive 5.9.2", "zvariant_utils 3.3.0", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index ba87e39..0d45830 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -43,6 +43,9 @@ which = "8.0.0" [target.'cfg(target_os = "windows")'.dependencies] windows-sys = { version = "0.61", features = ["Win32_System_Threading"] } +[target.'cfg(target_os = "linux")'.dependencies] +tao = { version = "0.34", features = ["tokio"] } + [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies] tauri-plugin-single-instance = "2" @@ -51,6 +54,8 @@ tauri-plugin-single-instance = "2" reqwest-middleware = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "7650ed76215a962a96d94a79be71c27bffde7ab2" } reqwest-retry = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "7650ed76215a962a96d94a79be71c27bffde7ab2" } version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "d8efd77673c9a90792da9da31b6c0da7ea8a324b" } +# Tauri/Tao fork with xdg-desktop-portal color scheme support on Linux (https://github.com/tauri-apps/tao/pull/1141) +tao = { git = "https://github.com/haecker-felix/tao.git", branch = "color-scheme" } # Enable a small amount of optimization in the dev profile. [profile.dev]