diff --git a/community/ncspot/APKBUILD b/community/ncspot/APKBUILD index 78f27d170b9..75076e28464 100644 --- a/community/ncspot/APKBUILD +++ b/community/ncspot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka # Maintainer: Jakub Jirutka pkgname=ncspot -pkgver=0.13.1 +pkgver=0.13.2 pkgrel=0 pkgdesc="Cross-platform ncurses Spotify client inspired by ncmpc and the likes" url="https://github.com/hrkfdn/ncspot" @@ -17,14 +17,8 @@ makedepends=" pulseaudio-dev python3 " -# TODO: Remove after https://github.com/ramsayleung/rspotify/pull/402 is released. -# https://github.com/ramsayleung/rspotify/issues/403 -_rspotify_rev=26d39fc646eb7562628d8a745ce69f6375dca135 source="https://github.com/hrkfdn/ncspot/archive/v$pkgver/ncspot-$pkgver.tar.gz - https://github.com/ramsayleung/rspotify/archive/$_rspotify_rev/rspotify-0.11.6.tar.gz - use-notify-rust-with-zbus.patch - add-ncurses_backend-feature.patch - rspotify-ureq-native-tls.patch + bump-rspotify.patch " options="!check" # there's only one unit test (in v0.8.1) @@ -35,24 +29,10 @@ _cargo_opts=" --features share_clipboard,pulseaudio_backend,mpris,notify,cover,share_selection,ncurses_backend " - prepare() { - cargo fetch --target="$CTARGET" --locked - - mkdir -p vendor - mv "$srcdir"/rspotify-$_rspotify_rev vendor/rspotify - default_prepare - # Build with rspotify that we patched to avoid bundling rustls. - # See https://github.com/ramsayleung/rspotify/pull/402 - cat >> Cargo.toml <<-EOF - - [patch.crates-io] - rspotify = { path = "./vendor/rspotify" } - EOF - - cargo fetch --target="$CTARGET" # update after patching + cargo fetch --target="$CTARGET" --locked } build() { @@ -68,9 +48,6 @@ package() { } sha512sums=" -894880e5e735a344a729e7c381f844ffeb0aff4f66de0dd521e2e2ec622772c13f80fbc5c5b9e09c0fd7b5a5ba1fa589f260b84b86bb7ffe0a7d75724087ef8a ncspot-0.13.1.tar.gz -e6d52823776d50dda6ead35b310e7b4044b6ed94a2ec956a7e6422d9d7e6163d8c43bfc52223b8ba2d1784729a26f1fa8d6a0fa5144f7ea6ff35a58b43b1f84f rspotify-0.11.6.tar.gz -0cb5dd2b5b2afec47319a5b33ea5fba0ced6662a89539ccecef9de966e28b33c4c6f7e3ff886bf020f5e1d24ecee2f5895b8b4340db8acf71e9e7991d90f1e28 use-notify-rust-with-zbus.patch -fa5ae6798afb3762a2e827087f70931fba5b3ad52b5ae7a29f68225993c20a6d4b42a261ea4e210c627e01819c2bc91c4bcb330d6502fc36330162e89956728d add-ncurses_backend-feature.patch -33089d80a3298f481957bf9757da15c31801e48a353e3a4f5402524e111c1016b85c38721d473bf23be8e6660bf3b9485df5e30f2cb5334ebae613d80025c89e rspotify-ureq-native-tls.patch +1377d78cb3f61e78174c729cd4ac2379c76aaf6f022cefcecb3aafc5605d496c1f7493d0101ba73a911c131407a32500a767c14e7e52317d2b3f22fa7b6658f1 ncspot-0.13.2.tar.gz +8879af9c34399b4a03480b954eca6232a1a3f9b4228864463943e82d5b7f2a43c9f5facb0064c253e42dee468f72e11600fe3a7406d2c935991d97e648173b58 bump-rspotify.patch " diff --git a/community/ncspot/add-ncurses_backend-feature.patch b/community/ncspot/add-ncurses_backend-feature.patch deleted file mode 100644 index 7a651b46116..00000000000 --- a/community/ncspot/add-ncurses_backend-feature.patch +++ /dev/null @@ -1,38 +0,0 @@ -Patch-Source: https://github.com/hrkfdn/ncspot/pull/1127 --- -From b6b9305aa89c6f2c3307020fd0c3f882746fb535 Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka -Date: Sun, 23 Apr 2023 21:55:42 +0200 -Subject: [PATCH] Add ncurses_backend feature flag to enable - cursive/ncurses-backend - -Similar to existing crossterm_backend and pancurses_backend. ---- - Cargo.lock | 1 + - Cargo.toml | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/Cargo.lock b/Cargo.lock -index 6f15dea9..979ee3d6 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -722,6 +722,7 @@ dependencies = [ - "libc", - "log", - "maplit", -+ "ncurses", - "pancurses", - "signal-hook", - "term_size", -diff --git a/Cargo.toml b/Cargo.toml -index ef4aaf14..dd5963dc 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -80,6 +80,7 @@ alsa_backend = ["librespot-playback/alsa-backend"] - cover = ["ioctl-rs"] # Support displaying the album cover - default = ["share_clipboard", "pulseaudio_backend", "mpris", "notify", "termion_backend"] - mpris = ["zbus"] # Allow ncspot to be controlled via MPRIS API -+ncurses_backend = ["cursive/ncurses-backend"] - notify = ["notify-rust"] # Show what's playing via a notification - pancurses_backend = ["cursive/pancurses-backend", "pancurses/win32"] - portaudio_backend = ["librespot-playback/portaudio-backend"] diff --git a/community/ncspot/bump-rspotify.patch b/community/ncspot/bump-rspotify.patch new file mode 100644 index 00000000000..6ffbc8f1a85 --- /dev/null +++ b/community/ncspot/bump-rspotify.patch @@ -0,0 +1,291 @@ +Patch-Source: https://github.com/hrkfdn/ncspot/pull/1153 + +diff --git a/Cargo.lock b/Cargo.lock +index 0e4360a..1dd3153 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -298,6 +298,12 @@ version = "0.13.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + ++[[package]] ++name = "base64" ++version = "0.20.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" ++ + [[package]] + name = "base64" + version = "0.21.0" +@@ -433,7 +439,6 @@ dependencies = [ + "js-sys", + "num-integer", + "num-traits", +- "rustc-serialize", + "serde", + "time 0.1.45", + "wasm-bindgen", +@@ -2851,21 +2856,6 @@ dependencies = [ + "winreg 0.10.1", + ] + +-[[package]] +-name = "ring" +-version = "0.16.20" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +-dependencies = [ +- "cc", +- "libc", +- "once_cell", +- "spin", +- "untrusted", +- "web-sys", +- "winapi", +-] +- + [[package]] + name = "rodio" + version = "0.15.0" +@@ -2883,11 +2873,11 @@ checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" + + [[package]] + name = "rspotify" +-version = "0.11.6" ++version = "0.11.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a86007448fb9a88a0677fd332addf8e7c1057e67bc385d3477c8d44c1bb0e96f" ++checksum = "5c4e72e087489ade8dcbd2ff76ee5963d33e5e98583d244780a094c0626cb74b" + dependencies = [ +- "base64 0.13.1", ++ "base64 0.20.0", + "chrono", + "getrandom", + "log", +@@ -2904,9 +2894,9 @@ dependencies = [ + + [[package]] + name = "rspotify-http" +-version = "0.11.6" ++version = "0.11.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa7481b3155d1ee3a0a73f94148d3385487e519b795d418ec0df1588961c1105" ++checksum = "a801199bba6b992c360e474bed2a500b79ef0e2538f1ece77a60e949ed6e3da8" + dependencies = [ + "log", + "maybe-async", +@@ -2917,15 +2907,15 @@ dependencies = [ + + [[package]] + name = "rspotify-macros" +-version = "0.11.6" ++version = "0.11.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0c86521fc751c75235937f0014dfb17e67f8abc6461b28ad82c9c2acc33a0c47" ++checksum = "6f662a0bbf070fd283985de33ad4d707ae83480230e0e2162953490a97edf203" + + [[package]] + name = "rspotify-model" +-version = "0.11.6" ++version = "0.11.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3b03296b02fc44c9b792635cf8156d13b9d0edf629d74e80c4f551a97a1b83cd" ++checksum = "6fbdf1e8fe5fa1bbc0928904941d7c6bcfd235d01a136bb1c0fc01376cf10ec8" + dependencies = [ + "chrono", + "enum_dispatch", +@@ -2947,12 +2937,6 @@ version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +-[[package]] +-name = "rustc-serialize" +-version = "0.3.24" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" +- + [[package]] + name = "rustc_version" + version = "0.4.0" +@@ -2976,18 +2960,6 @@ dependencies = [ + "windows-sys 0.48.0", + ] + +-[[package]] +-name = "rustls" +-version = "0.20.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +-dependencies = [ +- "log", +- "ring", +- "sct", +- "webpki", +-] +- + [[package]] + name = "rustversion" + version = "1.0.12" +@@ -3030,16 +3002,6 @@ version = "1.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + +-[[package]] +-name = "sct" +-version = "0.7.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +-dependencies = [ +- "ring", +- "untrusted", +-] +- + [[package]] + name = "security-framework" + version = "2.8.2" +@@ -3242,12 +3204,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "spin" +-version = "0.5.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +- + [[package]] + name = "stable_deref_trait" + version = "1.2.0" +@@ -3691,12 +3647,6 @@ version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +-[[package]] +-name = "untrusted" +-version = "0.7.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +- + [[package]] + name = "ureq" + version = "2.6.2" +@@ -3707,13 +3657,11 @@ dependencies = [ + "cookie", + "cookie_store", + "log", ++ "native-tls", + "once_cell", +- "rustls", + "serde", + "serde_json", + "url", +- "webpki", +- "webpki-roots", + ] + + [[package]] +@@ -3938,25 +3886,6 @@ dependencies = [ + "wasm-bindgen", + ] + +-[[package]] +-name = "webpki" +-version = "0.22.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +-dependencies = [ +- "ring", +- "untrusted", +-] +- +-[[package]] +-name = "webpki-roots" +-version = "0.22.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +-dependencies = [ +- "webpki", +-] +- + [[package]] + name = "winapi" + version = "0.3.9" +diff --git a/Cargo.toml b/Cargo.toml +index 7713fe2..b6419eb 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -61,7 +61,7 @@ signal-hook = "0.3.0" + + [dependencies.rspotify] + default-features = false +-features = ["client-ureq", "ureq-rustls-tls"] ++features = ["client-ureq", "ureq-native-tls"] + version = "0.11.5" + + [dependencies.cursive] +diff --git a/src/model/episode.rs b/src/model/episode.rs +index 666377d..61980f6 100644 +--- a/src/model/episode.rs ++++ b/src/model/episode.rs +@@ -33,7 +33,7 @@ impl From<&SimplifiedEpisode> for Episode { + Self { + id: episode.id.id().to_string(), + uri: episode.id.uri(), +- duration: episode.duration.as_millis() as u32, ++ duration: episode.duration.num_milliseconds() as u32, + name: episode.name.clone(), + description: episode.description.clone(), + release_date: episode.release_date.clone(), +@@ -49,7 +49,7 @@ impl From<&FullEpisode> for Episode { + Self { + id: episode.id.id().to_string(), + uri: episode.id.uri(), +- duration: episode.duration.as_millis() as u32, ++ duration: episode.duration.num_milliseconds() as u32, + name: episode.name.clone(), + description: episode.description.clone(), + release_date: episode.release_date.clone(), +diff --git a/src/model/track.rs b/src/model/track.rs +index 112bb0a..8fecff0 100644 +--- a/src/model/track.rs ++++ b/src/model/track.rs +@@ -59,7 +59,7 @@ impl Track { + title: track.name.clone(), + track_number: track.track_number, + disc_number: track.disc_number, +- duration: track.duration.as_millis() as u32, ++ duration: track.duration.num_milliseconds() as u32, + artists, + artist_ids, + album: Some(album.name.clone()), +@@ -96,7 +96,7 @@ impl From<&SimplifiedTrack> for Track { + title: track.name.clone(), + track_number: track.track_number, + disc_number: track.disc_number, +- duration: track.duration.as_millis() as u32, ++ duration: track.duration.num_milliseconds() as u32, + artists, + artist_ids, + album: None, +@@ -135,7 +135,7 @@ impl From<&FullTrack> for Track { + title: track.name.clone(), + track_number: track.track_number, + disc_number: track.disc_number, +- duration: track.duration.as_millis() as u32, ++ duration: track.duration.num_milliseconds() as u32, + artists, + artist_ids, + album: Some(track.album.name.clone()), +diff --git a/src/spotify_api.rs b/src/spotify_api.rs +index a418a28..e6a5e86 100644 +--- a/src/spotify_api.rs ++++ b/src/spotify_api.rs +@@ -159,7 +159,7 @@ impl WebApi { + api.playlist_add_items( + PlaylistId::from_id(playlist_id).unwrap(), + trackids.iter().map(|id| id.as_ref()), +- position, ++ position.map(|num| chrono::Duration::milliseconds(num as i64)), + ) + }) + .is_some() diff --git a/community/ncspot/rspotify-ureq-native-tls.patch b/community/ncspot/rspotify-ureq-native-tls.patch deleted file mode 100644 index 799a5474aa5..00000000000 --- a/community/ncspot/rspotify-ureq-native-tls.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jakub Jirutka -Date: Sun, 23 Apr 2023 22:12:30 +0200 -Subject: [PATCH] Build with ureq native-tls - -https://github.com/ramsayleung/rspotify/pull/402 (rebased) - ---- a/vendor/rspotify/Cargo.toml -+++ b/vendor/rspotify/Cargo.toml -@@ -71,6 +71,7 @@ - reqwest-native-tls-vendored = ["rspotify-http/reqwest-native-tls-vendored"] - # Same for ureq. - ureq-rustls-tls = ["rspotify-http/ureq-rustls-tls"] -+ureq-native-tls = ["rspotify-http/ureq-native-tls"] - - # Internal features for checking async or sync compilation - __async = ["futures", "async-stream", "async-trait"] ---- a/vendor/rspotify/rspotify-http/Cargo.toml -+++ b/vendor/rspotify/rspotify-http/Cargo.toml -@@ -46,6 +46,7 @@ - reqwest-native-tls-vendored = ["reqwest/native-tls-vendored"] - # Same for ureq. - ureq-rustls-tls = ["ureq/tls"] -+ureq-native-tls = ["ureq/native-tls"] - - # Internal features for checking async or sync compilation - __async = ["async-trait"] ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -61,7 +61,7 @@ - - [dependencies.rspotify] - default-features = false --features = ["client-ureq", "ureq-rustls-tls"] -+features = ["client-ureq", "ureq-native-tls"] - version = "0.11.5" - - [dependencies.cursive] diff --git a/community/ncspot/use-notify-rust-with-zbus.patch b/community/ncspot/use-notify-rust-with-zbus.patch deleted file mode 100644 index 151461ea0aa..00000000000 --- a/community/ncspot/use-notify-rust-with-zbus.patch +++ /dev/null @@ -1,303 +0,0 @@ -Patch-Source: https://github.com/hrkfdn/ncspot/pull/1127 --- -From 6a2f858c17b119dfe8d8e48aef48fac8293bcf1f Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka -Date: Sun, 23 Apr 2023 21:38:16 +0200 -Subject: [PATCH] Use notify-rust with zbus instead of dbus - -zbus is already used for MPRIS since -b0db0da3efe06a7cc358bf03bd00ac6d563e8b9a. - -This saves ~0.5 MiB in release build with LTO. ---- - Cargo.lock | 173 ++++++++++++++++++++++++++++++++++++++++++++++------- - Cargo.toml | 4 +- - 2 files changed, 154 insertions(+), 23 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 42691ec4..6f15dea9 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -162,6 +162,72 @@ dependencies = [ - "futures-core", - ] - -+[[package]] -+name = "async-channel" -+version = "1.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" -+dependencies = [ -+ "concurrent-queue", -+ "event-listener", -+ "futures-core", -+] -+ -+[[package]] -+name = "async-executor" -+version = "1.5.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" -+dependencies = [ -+ "async-lock", -+ "async-task", -+ "concurrent-queue", -+ "fastrand", -+ "futures-lite", -+ "slab", -+] -+ -+[[package]] -+name = "async-fs" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -+dependencies = [ -+ "async-lock", -+ "autocfg", -+ "blocking", -+ "futures-lite", -+] -+ -+[[package]] -+name = "async-io" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -+dependencies = [ -+ "async-lock", -+ "autocfg", -+ "cfg-if", -+ "concurrent-queue", -+ "futures-lite", -+ "log", -+ "parking", -+ "polling", -+ "rustix", -+ "slab", -+ "socket2", -+ "waker-fn", -+] -+ -+[[package]] -+name = "async-lock" -+version = "2.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" -+dependencies = [ -+ "event-listener", -+] -+ - [[package]] - name = "async-recursion" - version = "1.0.4" -@@ -173,6 +239,12 @@ dependencies = [ - "syn 2.0.13", - ] - -+[[package]] -+name = "async-task" -+version = "4.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" -+ - [[package]] - name = "async-trait" - version = "0.1.68" -@@ -184,6 +256,12 @@ dependencies = [ - "syn 2.0.13", - ] - -+[[package]] -+name = "atomic-waker" -+version = "1.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" -+ - [[package]] - name = "autocfg" - version = "1.1.0" -@@ -267,6 +345,21 @@ dependencies = [ - "generic-array", - ] - -+[[package]] -+name = "blocking" -+version = "1.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" -+dependencies = [ -+ "async-channel", -+ "async-lock", -+ "async-task", -+ "atomic-waker", -+ "fastrand", -+ "futures-lite", -+ "log", -+] -+ - [[package]] - name = "bumpalo" - version = "3.12.0" -@@ -462,6 +555,15 @@ dependencies = [ - "windows-sys 0.45.0", - ] - -+[[package]] -+name = "concurrent-queue" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -+dependencies = [ -+ "crossbeam-utils", -+] -+ - [[package]] - name = "cookie" - version = "0.16.2" -@@ -775,17 +877,6 @@ dependencies = [ - "syn 1.0.109", - ] - --[[package]] --name = "dbus" --version = "0.9.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" --dependencies = [ -- "libc", -- "libdbus-sys", -- "winapi", --] -- - [[package]] - name = "derivative" - version = "2.2.0" -@@ -1096,6 +1187,21 @@ version = "0.3.28" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -+[[package]] -+name = "futures-lite" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -+dependencies = [ -+ "fastrand", -+ "futures-core", -+ "futures-io", -+ "memchr", -+ "parking", -+ "pin-project-lite", -+ "waker-fn", -+] -+ - [[package]] - name = "futures-macro" - version = "0.3.28" -@@ -1528,15 +1634,6 @@ version = "0.2.141" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" - --[[package]] --name = "libdbus-sys" --version = "0.2.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9f8d7ae751e1cb825c840ae5e682f59b098cdfd213c350ac268b61449a5f58a0" --dependencies = [ -- "pkg-config", --] -- - [[package]] - name = "libloading" - version = "0.7.4" -@@ -2035,10 +2132,11 @@ version = "4.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e" - dependencies = [ -- "dbus", - "log", - "mac-notification-sys", -+ "serde", - "tauri-winrt-notification", -+ "zbus", - ] - - [[package]] -@@ -2389,6 +2487,12 @@ dependencies = [ - "winreg 0.5.1", - ] - -+[[package]] -+name = "parking" -+version = "2.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" -+ - [[package]] - name = "parking_lot" - version = "0.11.2" -@@ -2520,6 +2624,22 @@ dependencies = [ - "dirs-next 1.0.2", - ] - -+[[package]] -+name = "polling" -+version = "2.8.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -+dependencies = [ -+ "autocfg", -+ "bitflags", -+ "cfg-if", -+ "concurrent-queue", -+ "libc", -+ "log", -+ "pin-project-lite", -+ "windows-sys 0.48.0", -+] -+ - [[package]] - name = "portaudio-rs" - version = "0.3.2" -@@ -3665,6 +3785,12 @@ version = "0.9.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -+[[package]] -+name = "waker-fn" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" -+ - [[package]] - name = "walkdir" - version = "2.3.3" -@@ -4174,7 +4300,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3dc29e76f558b2cb94190e8605ecfe77dd40f5df8c072951714b4b71a97f5848" - dependencies = [ - "async-broadcast", -+ "async-executor", -+ "async-fs", -+ "async-io", -+ "async-lock", - "async-recursion", -+ "async-task", - "async-trait", - "byteorder", - "derivative", -diff --git a/Cargo.toml b/Cargo.toml -index 87040927..ef4aaf14 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -71,8 +71,8 @@ version = "0.20.0" - [dependencies.notify-rust] - default-features = false - version = "4" --# Use dbus, which we already depend on, instead of zbus. --features = ["d"] -+# Use zbus, which we already depend on, instead of dbus. -+features = ["z"] - optional = true - - [features]