Skip to content

Commit

Permalink
Update spotifyd to 0.2.24
Browse files Browse the repository at this point in the history
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
  • Loading branch information
atomicules committed Feb 20, 2020
1 parent fe49567 commit 8a278d2
Show file tree
Hide file tree
Showing 9 changed files with 484 additions and 838 deletions.
214 changes: 96 additions & 118 deletions spotifyd/Makefile

Large diffs are not rendered by default.

751 changes: 369 additions & 382 deletions spotifyd/distinfo

Large diffs are not rendered by default.

257 changes: 0 additions & 257 deletions spotifyd/patches/patch-Cargo.lock

This file was deleted.

22 changes: 0 additions & 22 deletions spotifyd/patches/patch-Cargo.toml

This file was deleted.

14 changes: 0 additions & 14 deletions spotifyd/patches/patch-librespot_audio_Cargo.toml

This file was deleted.

14 changes: 0 additions & 14 deletions spotifyd/patches/patch-librespot_connect_Cargo.toml

This file was deleted.

14 changes: 0 additions & 14 deletions spotifyd/patches/patch-rust-mdns_Cargo.toml

This file was deleted.

19 changes: 19 additions & 0 deletions spotifyd/patches/patch-vendor-nix-unistd.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
$NetBSD$

Later versions of libc have (correctly) removed `fexecve` for netbsd-like platforms therefore need
to patch earlier versions of nix that expect this to also be removed.

Fixed upstream in later versions:

https://github.com/nix-rust/nix/blob/922d5ee118a770435b14b08ec4be6f8ae9f7c30a/CHANGELOG.md#fixed-7

--- ../vendor/nix-0.10.0/src/unistd.rs.orig 2018-01-21 20:52:34.000000000 +0000
+++ ../vendor/nix-0.10.0/src/unistd.rs
@@ -633,7 +633,6 @@ pub fn execvp(filename: &CString, args:
#[cfg(any(target_os = "android",
target_os = "freebsd",
target_os = "linux",
- target_os = "netbsd",
target_os = "openbsd"))]
#[inline]
pub fn fexecve(fd: RawFd, args: &[CString], env: &[CString]) -> Result<Void> {
17 changes: 0 additions & 17 deletions spotifyd/patches/patch-vendor_get_if_addrs_src_lib.rs

This file was deleted.

0 comments on commit 8a278d2

Please sign in to comment.