From f0bb24d23fdcec511f08d7d3c216a4a39ee365b5 Mon Sep 17 00:00:00 2001 From: Paul Lietar Date: Thu, 2 Jul 2015 22:00:30 +0200 Subject: [PATCH] Fix build on latest nightly. --- Cargo.lock | 47 +++++++++++++++++++++++++++++++++------------ Cargo.toml | 2 +- protocol/Cargo.toml | 2 +- 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 945aaec9..ff325e08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,14 +8,14 @@ dependencies = [ "mod_path 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "portaudio 0.1.2 (git+https://github.com/mvdnes/portaudio-rs)", - "protobuf 1.0.0 (git+https://github.com/stepancheg/rust-protobuf.git)", + "protobuf 1.0.1 (git+https://github.com/plietar/rust-protobuf.git)", "protobuf_macros 0.1.0 (git+https://github.com/plietar/rust-protobuf-macros.git)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "readall 0.1.0 (git+https://github.com/plietar/rust-readall.git)", "rust-crypto 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "rust-gmp 0.2.0 (git+https://github.com/plietar/rust-gmp.git)", "shannon 0.1.0 (git+https://github.com/plietar/rust-shannon.git)", - "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", "vergen 0.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "vorbis 0.0.11 (git+https://github.com/plietar/vorbis-rs)", ] @@ -40,6 +40,15 @@ name = "gcc" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "kernel32-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "lazy_static" version = "0.1.11" @@ -55,7 +64,7 @@ name = "librespot-protocol" version = "0.1.0" dependencies = [ "mod_path 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "protobuf 1.0.0 (git+https://github.com/stepancheg/rust-protobuf.git)", + "protobuf 1.0.1 (git+https://github.com/plietar/rust-protobuf.git)", ] [[package]] @@ -90,7 +99,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "portaudio" version = "0.1.2" -source = "git+https://github.com/mvdnes/portaudio-rs#a6432fb11acebb5a2d9997fc0019eeb482ba435d" +source = "git+https://github.com/mvdnes/portaudio-rs#7c6d10f5edda0094cc33b682d88c3a6ea4919b9f" dependencies = [ "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -100,7 +109,7 @@ dependencies = [ [[package]] name = "portaudio_sys" version = "0.1.0" -source = "git+https://github.com/mvdnes/portaudio-rs#a6432fb11acebb5a2d9997fc0019eeb482ba435d" +source = "git+https://github.com/mvdnes/portaudio-rs#7c6d10f5edda0094cc33b682d88c3a6ea4919b9f" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -108,8 +117,8 @@ dependencies = [ [[package]] name = "protobuf" -version = "1.0.0" -source = "git+https://github.com/stepancheg/rust-protobuf.git#d6e80593f38ce47dfa0c4912a3558fa33ee06143" +version = "1.0.1" +source = "git+https://github.com/plietar/rust-protobuf.git#dae87e292a52a66da7f78ef4d8599d84303f0378" [[package]] name = "protobuf_macros" @@ -138,7 +147,7 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -174,11 +183,12 @@ dependencies = [ [[package]] name = "time" -version = "0.1.26" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -187,13 +197,13 @@ version = "0.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "vorbis" version = "0.0.11" -source = "git+https://github.com/plietar/vorbis-rs#cff6b4222cebd0fb31bcbc2e14a7ba575548c703" +source = "git+https://github.com/plietar/vorbis-rs#b28d0d14f623b0204b29cba435b3cf9be249290a" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -224,3 +234,16 @@ dependencies = [ "vorbis-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "winapi" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "winapi-build" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + diff --git a/Cargo.toml b/Cargo.toml index f7af1814..4dae94e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ rust-crypto = "*" time = "*" [dependencies.protobuf] -git = "https://github.com/stepancheg/rust-protobuf.git" +git = "https://github.com/plietar/rust-protobuf.git" [dependencies.protobuf_macros] git = "https://github.com/plietar/rust-protobuf-macros.git" [dependencies.rust-gmp] diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml index 1c443b94..f89bca97 100644 --- a/protocol/Cargo.toml +++ b/protocol/Cargo.toml @@ -8,5 +8,5 @@ build = "build.rs" mod_path = "*" [dependencies.protobuf] -git = "https://github.com/stepancheg/rust-protobuf.git" +git = "https://github.com/plietar/rust-protobuf.git"