From 6005bcc4c6c64a31af7c5f2cad5e52595b3d4be1 Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Sun, 30 Sep 2018 08:09:27 -0500 Subject: [PATCH] ... --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 2 +- imlib2/Cargo.toml | 2 +- imlib2/imlib2-sys/Cargo.toml | 2 ++ imlib2/src/lib.rs | 2 +- src/main.rs | 2 +- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 673ca41..bcc3a11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -334,7 +334,7 @@ version = "0.1.0" dependencies = [ "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "imlib2-sys 0.1.0", - "xlib 0.1.0", + "leanshot_xlib 0.1.0", ] [[package]] @@ -373,11 +373,20 @@ dependencies = [ "gl 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "glutin 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", "imlib2 0.1.0", + "leanshot_xlib 0.1.0", "nanovg 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", - "xlib 0.1.0", +] + +[[package]] +name = "leanshot_xlib" +version = "0.1.0" +dependencies = [ + "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 2.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -998,15 +1007,6 @@ dependencies = [ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "xlib" -version = "0.1.0" -dependencies = [ - "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.18.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "xml-rs" version = "0.7.0" diff --git a/Cargo.toml b/Cargo.toml index e43ddf7..d715998 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,4 +18,4 @@ nanovg = { version = "1.0.2", features = ["gl3"] } png = "0.12" structopt = "0.2" time = "0.1" -xlib = { version = "0.1", path = "./xlib" } +leanshot_xlib = { version = "0.1", path = "./xlib" } diff --git a/imlib2/Cargo.toml b/imlib2/Cargo.toml index eba82c7..b7412e6 100644 --- a/imlib2/Cargo.toml +++ b/imlib2/Cargo.toml @@ -6,4 +6,4 @@ authors = ["Michael Zhang "] [dependencies] failure = "0.1" imlib2-sys = { path = "imlib2-sys" } -xlib = { path = "../xlib" } +leanshot_xlib = { path = "../xlib" } diff --git a/imlib2/imlib2-sys/Cargo.toml b/imlib2/imlib2-sys/Cargo.toml index 4c61d68..dbe7c10 100644 --- a/imlib2/imlib2-sys/Cargo.toml +++ b/imlib2/imlib2-sys/Cargo.toml @@ -1,6 +1,8 @@ [package] name = "imlib2-sys" version = "0.1.0" +description = "ffi for imlib2" +license-file = "../../LICENSE" authors = ["Michael Zhang "] build = "build.rs" diff --git a/imlib2/src/lib.rs b/imlib2/src/lib.rs index 784aa88..fe1a031 100644 --- a/imlib2/src/lib.rs +++ b/imlib2/src/lib.rs @@ -3,7 +3,7 @@ #[macro_use] extern crate failure; extern crate imlib2_sys; -extern crate xlib; +extern crate leanshot_xlib as xlib; mod errors; mod image; diff --git a/src/main.rs b/src/main.rs index 53e1c8c..a2c15ba 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,7 +12,7 @@ extern crate png; #[macro_use] extern crate structopt; extern crate time; -extern crate xlib; +extern crate leanshot_xlib as xlib; mod capture; mod errors;