diff options
| -rw-r--r-- | community/ncspot/APKBUILD | 5 | ||||
| -rw-r--r-- | community/ncspot/replace-zbus-with-dbus.patch | 376 |
2 files changed, 380 insertions, 1 deletions
diff --git a/community/ncspot/APKBUILD b/community/ncspot/APKBUILD index 65a82810351..44054320675 100644 --- a/community/ncspot/APKBUILD +++ b/community/ncspot/APKBUILD @@ -18,7 +18,9 @@ makedepends=" pulseaudio-dev python3 " -source="https://github.com/hrkfdn/ncspot/archive/v$pkgver/ncspot-$pkgver.tar.gz" +source="https://github.com/hrkfdn/ncspot/archive/v$pkgver/ncspot-$pkgver.tar.gz + replace-zbus-with-dbus.patch + " options="!check" # there's only one unit test (in v0.8.1) _cargo_opts='--frozen --features cover,share_selection' @@ -53,4 +55,5 @@ package() { sha512sums=" a539aad7418a85313160e471c0efc072bf08257c8156c3b8b2ead7cbe8c57346957914f9cdfbec16bbcc06490a8e30419a734d9f7a0dbe26c60ad5d237c4fd0d ncspot-0.9.5.tar.gz +c5661a0bd807e8777132d2bdf9e4df1c7ae58192f55058fe27c67d740ae048c5b88e529634a9b5470768cd93559d984b10f006a1529393feb403ea87398d9fe3 replace-zbus-with-dbus.patch " diff --git a/community/ncspot/replace-zbus-with-dbus.patch b/community/ncspot/replace-zbus-with-dbus.patch new file mode 100644 index 00000000000..17b5cfb961d --- /dev/null +++ b/community/ncspot/replace-zbus-with-dbus.patch @@ -0,0 +1,376 @@ +Patch-Source: https://github.com/hrkfdn/ncspot/pull/718 +From e81bce14e627bdabb01311b3da23039e0f6b0629 Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Fri, 21 Jan 2022 22:41:41 +0100 +Subject: [PATCH] Use notify-rust with dbus instead of zbus + +This project already uses "dbus" crate; bundling two dbus API +implementations in the ncspot binary doesn't make much sense, +it just increases the binary size. +--- + Cargo.lock | 214 +---------------------------------------------------- + Cargo.toml | 8 +- + 2 files changed, 8 insertions(+), 214 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 4966ecec..ebc95f5e 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -123,25 +123,6 @@ version = "0.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +-[[package]] +-name = "async-io" +-version = "1.6.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" +-dependencies = [ +- "concurrent-queue", +- "futures-lite", +- "libc", +- "log", +- "once_cell", +- "parking", +- "polling", +- "slab", +- "socket2", +- "waker-fn", +- "winapi", +-] +- + [[package]] + name = "async-trait" + version = "0.1.52" +@@ -266,12 +247,6 @@ version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +-[[package]] +-name = "cache-padded" +-version = "1.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +- + [[package]] + name = "cc" + version = "1.0.72" +@@ -421,15 +396,6 @@ dependencies = [ + "memchr 2.4.1", + ] + +-[[package]] +-name = "concurrent-queue" +-version = "1.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" +-dependencies = [ +- "cache-padded", +-] +- + [[package]] + name = "const_fn" + version = "0.4.9" +@@ -716,17 +682,6 @@ dependencies = [ + "dbus", + ] + +-[[package]] +-name = "derivative" +-version = "2.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn", +-] +- + [[package]] + name = "derive-new" + version = "0.5.9" +@@ -833,27 +788,6 @@ dependencies = [ + "syn", + ] + +-[[package]] +-name = "enumflags2" +-version = "0.6.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0" +-dependencies = [ +- "enumflags2_derive", +- "serde", +-] +- +-[[package]] +-name = "enumflags2_derive" +-version = "0.6.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn", +-] +- + [[package]] + name = "enumset" + version = "1.0.8" +@@ -1015,21 +949,6 @@ version = "0.3.19" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" + +-[[package]] +-name = "futures-lite" +-version = "1.12.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +-dependencies = [ +- "fastrand", +- "futures-core", +- "futures-io", +- "memchr 2.4.1", +- "parking", +- "pin-project-lite", +- "waker-fn", +-] +- + [[package]] + name = "futures-macro" + version = "0.3.19" +@@ -1767,16 +1686,6 @@ dependencies = [ + "tempfile", + ] + +-[[package]] +-name = "nb-connect" +-version = "1.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b1bb540dc6ef51cfe1916ec038ce7a620daf3a111e2502d745197cd53d6bca15" +-dependencies = [ +- "libc", +- "socket2", +-] +- + [[package]] + name = "ncspot" + version = "0.9.5" +@@ -1986,12 +1895,9 @@ version = "4.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ca6ebab865e67efdd7182a88d76cadbdd2a8d02d1c7a4e16bb7c234016a12cac" + dependencies = [ ++ "dbus", + "mac-notification-sys", +- "serde", + "winrt-notification", +- "zbus", +- "zvariant", +- "zvariant_derive", + ] + + [[package]] +@@ -2330,12 +2236,6 @@ dependencies = [ + "winreg 0.5.1", + ] + +-[[package]] +-name = "parking" +-version = "2.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +- + [[package]] + name = "parking_lot" + version = "0.10.2" +@@ -2465,19 +2365,6 @@ dependencies = [ + "dirs-next", + ] + +-[[package]] +-name = "polling" +-version = "2.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" +-dependencies = [ +- "cfg-if 1.0.0", +- "libc", +- "log", +- "wepoll-ffi", +- "winapi", +-] +- + [[package]] + name = "portaudio-rs" + version = "0.3.2" +@@ -2950,12 +2837,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "scoped-tls" +-version = "1.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +- + [[package]] + name = "scopeguard" + version = "1.1.0" +@@ -3057,17 +2938,6 @@ dependencies = [ + "serde", + ] + +-[[package]] +-name = "serde_repr" +-version = "0.1.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn", +-] +- + [[package]] + name = "serde_urlencoded" + version = "0.7.1" +@@ -3204,12 +3074,6 @@ dependencies = [ + "version_check", + ] + +-[[package]] +-name = "static_assertions" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +- + [[package]] + name = "stderrlog" + version = "0.4.3" +@@ -3812,12 +3676,6 @@ version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +-[[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.2" +@@ -4016,15 +3874,6 @@ dependencies = [ + "webpki", + ] + +-[[package]] +-name = "wepoll-ffi" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +-dependencies = [ +- "cc", +-] +- + [[package]] + name = "widestring" + version = "0.4.3" +@@ -4181,41 +4030,6 @@ version = "0.8.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" + +-[[package]] +-name = "zbus" +-version = "1.9.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2326acc379a3ac4e34b794089f5bdb17086bf29a5fdf619b7b4cc772dc2e9dad" +-dependencies = [ +- "async-io", +- "byteorder", +- "derivative", +- "enumflags2", +- "fastrand", +- "futures 0.3.19", +- "nb-connect", +- "nix 0.17.0", +- "once_cell", +- "polling", +- "scoped-tls", +- "serde", +- "serde_repr", +- "zbus_macros", +- "zvariant", +-] +- +-[[package]] +-name = "zbus_macros" +-version = "1.9.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a482c56029e48681b89b92b5db3c446db0915e8dd1052c0328a574eda38d5f93" +-dependencies = [ +- "proc-macro-crate 0.1.5", +- "proc-macro2", +- "quote", +- "syn", +-] +- + [[package]] + name = "zerocopy" + version = "0.3.0" +@@ -4236,29 +4050,3 @@ dependencies = [ + "syn", + "synstructure", + ] +- +-[[package]] +-name = "zvariant" +-version = "2.10.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525" +-dependencies = [ +- "byteorder", +- "enumflags2", +- "libc", +- "serde", +- "static_assertions", +- "zvariant_derive", +-] +- +-[[package]] +-name = "zvariant_derive" +-version = "2.10.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9" +-dependencies = [ +- "proc-macro-crate 1.1.0", +- "proc-macro2", +- "quote", +- "syn", +-] +diff --git a/Cargo.toml b/Cargo.toml +index 5adb826e..2292344c 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -26,7 +26,6 @@ librespot-core = "0.3.1" + librespot-playback = "0.3.1" + librespot-protocol = "0.3.1" + log = "0.4.13" +-notify-rust = { version = "4", optional = true } + serde = "1.0" + serde_json = "1.0" + tokio = { version = "1", features = ["rt-multi-thread", "sync", "time"] } +@@ -58,6 +57,13 @@ features = ["client-ureq", "ureq-rustls-tls"] + version = "0.17.0" + default-features = false + ++[dependencies.notify-rust] ++version = "4" ++default-features = false ++# Use dbus, which we already depend on, instead of zbus. ++features = ["d"] ++optional = true ++ + [features] + share_clipboard = ["clipboard"] + wayland_clipboard = ["wl-clipboard-rs"] # Support wayland clipboard - linux only |