Skip to content

Commit 8a278d2

Browse files
committed
Update spotifyd to 0.2.24
They've done a lot of cleaning up upstream and are no longer pulling in stuff via commit hashes so we can remove all the _REV, DISTFILES, SITES and post-extract stuff for librespot, tremor, etc. - Back to having an odd SITES work-around for a CARGO_CRATE_DEPENDS: wasi-0.9.0 due to the version name. - Need [Rust 1.40][1] for this owing to [whoami-0.7.0][2] and use of `#[non_exhaustive]` per [this issue][3] - Back to having a patch for nix [per this commit][4] just because of the version being used (this is ultimately fixed upstream) - Most other patches can be (and have been) removed though [1]: https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1400-2019-12-19 [2]: https://github.com/libcala/whoami/blob/03b0b552f3732d1738b353415ef7dd7bb5555393/changelog.md#070---2019-12-21 [3]: rust-lang/rust#44109 [4]: https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commit;h=0a23b3b322a6313f27284baa499924921beeca73
1 parent fe49567 commit 8a278d2

9 files changed

+484
-838
lines changed

spotifyd/Makefile

+96-118
Large diffs are not rendered by default.

spotifyd/distinfo

+369-382
Large diffs are not rendered by default.

spotifyd/patches/patch-Cargo.lock

-257
This file was deleted.

spotifyd/patches/patch-Cargo.toml

-22
This file was deleted.

spotifyd/patches/patch-librespot_audio_Cargo.toml

-14
This file was deleted.

spotifyd/patches/patch-librespot_connect_Cargo.toml

-14
This file was deleted.

spotifyd/patches/patch-rust-mdns_Cargo.toml

-14
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
$NetBSD$
2+
3+
Later versions of libc have (correctly) removed `fexecve` for netbsd-like platforms therefore need
4+
to patch earlier versions of nix that expect this to also be removed.
5+
6+
Fixed upstream in later versions:
7+
8+
https://github.com/nix-rust/nix/blob/922d5ee118a770435b14b08ec4be6f8ae9f7c30a/CHANGELOG.md#fixed-7
9+
10+
--- ../vendor/nix-0.10.0/src/unistd.rs.orig 2018-01-21 20:52:34.000000000 +0000
11+
+++ ../vendor/nix-0.10.0/src/unistd.rs
12+
@@ -633,7 +633,6 @@ pub fn execvp(filename: &CString, args:
13+
#[cfg(any(target_os = "android",
14+
target_os = "freebsd",
15+
target_os = "linux",
16+
- target_os = "netbsd",
17+
target_os = "openbsd"))]
18+
#[inline]
19+
pub fn fexecve(fd: RawFd, args: &[CString], env: &[CString]) -> Result<Void> {

spotifyd/patches/patch-vendor_get_if_addrs_src_lib.rs

-17
This file was deleted.

0 commit comments

Comments
 (0)