[librsvg] Cargo.toml: Explicitly use the master branch of cairo-rs and friends

[Federico Mena Quintero <federico src gnome org>]

commit 35089d4c5c415b0a133f5298cdd8c2d35dd039cb
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Jul 31 12:44:41 2017 -0500

    Cargo.toml: Explicitly use the master branch of cairo-rs and friends
    
    ... because it hasn't made a release yet that includes
    Matrix::try_invert() nor the Debug/PartialEq traits for Matrix

 rust/Cargo.lock |   57 ++++++++++++++++++++++--------------------------------
 rust/Cargo.toml |   24 +++++++++++++++-------
 2 files changed, 39 insertions(+), 42 deletions(-)
---
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 324589d..80bf8ba 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -3,12 +3,12 @@ name = "rsvg_internals"
 version = "0.0.1"
 dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-rs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-rs 0.1.3 (git+https://github.com/gtk-rs/cairo.git)",
+ "cairo-sys-rs 0.3.4 (git+https://github.com/gtk-rs/cairo.git)",
  "cssparser 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "downcast-rs 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib 0.1.3 (git+https://github.com/gtk-rs/glib.git)",
+ "glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)",
  "lalrpop 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lalrpop-util 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -61,21 +61,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 
 [[package]]
 name = "bitflags"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-
-[[package]]
-name = "bitflags"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 
 [[package]]
 name = "bitflags"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-
-[[package]]
-name = "bitflags"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 
@@ -87,11 +77,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 [[package]]
 name = "cairo-rs"
 version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
+source = "git+https://github.com/gtk-rs/cairo.git#94c84e601857c1c1c39986c41907bf8f21a72a10";
 dependencies = [
  "c_vec 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-sys-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-sys-rs 0.3.4 (git+https://github.com/gtk-rs/cairo.git)",
+ "glib 0.1.3 (git+https://github.com/gtk-rs/glib.git)",
+ "glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)",
  "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -99,7 +90,7 @@ dependencies = [
 [[package]]
 name = "cairo-sys-rs"
 version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index";
+source = "git+https://github.com/gtk-rs/cairo.git#94c84e601857c1c1c39986c41907bf8f21a72a10";
 dependencies = [
  "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -172,11 +163,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 [[package]]
 name = "glib"
 version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
+source = "git+https://github.com/gtk-rs/glib.git#ed2c37dc7c55d2e308b6ba4b885d4238fcc219fd";
 dependencies = [
- "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)",
+ "gobject-sys 0.3.4 (git+https://github.com/gtk-rs/sys)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -184,9 +175,9 @@ dependencies = [
 [[package]]
 name = "glib-sys"
 version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index";
+source = "git+https://github.com/gtk-rs/sys#af83826e0a31f68bcddee17d3791fb01453dc632";
 dependencies = [
- "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -194,10 +185,10 @@ dependencies = [
 [[package]]
 name = "gobject-sys"
 version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index";
+source = "git+https://github.com/gtk-rs/sys#af83826e0a31f68bcddee17d3791fb01453dc632";
 dependencies = [
- "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)",
  "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -540,13 +531,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 "checksum bit-set 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"84527c7b0452f22545cc010e72d366a435561d2b28b978035550b3778c4d428d"
 "checksum bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = 
"02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
 "checksum bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"8dead7461c1127cf637931a1e50934eb6eee8bff2f74433ac7909e9afcee04a3"
-"checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
-"checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
 "checksum c_vec 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"6237ac5a4b1e81c213c24c6437964c61e646df910a914b4ab1487b46df20bd13"
-"checksum cairo-rs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = 
"0180a8b65dc13e78479c6a47c4d5f094d64dc34465a9433c6daef9ae2fbfb3ee"
-"checksum cairo-sys-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = 
"a2414b86c20c40dfb56a98b1dbca05bde56411f488d268c4289a86df1b648c61"
+"checksum cairo-rs 0.1.3 (git+https://github.com/gtk-rs/cairo.git)" = "<none>"
+"checksum cairo-sys-rs 0.3.4 (git+https://github.com/gtk-rs/cairo.git)" = "<none>"
 "checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = 
"78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
 "checksum cssparser 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"c89e2d77451da8a55f1f2fcaf7eb86c32da9296890c6a474c7e4047f2429b2f4"
 "checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df"
@@ -555,9 +544,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 "checksum docopt 0.6.86 (registry+https://github.com/rust-lang/crates.io-index)" = 
"4a7ef30445607f6fc8720f0a0a2c7442284b629cf0d049286860fae23e71c4d9"
 "checksum downcast-rs 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"917042ca6e6c9fe735a63cd4d5d4c43c64ea8deb456fc5465d3f78df24e68d86"
 "checksum fixedbitset 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = 
"fcf4412e2d11115c5ed81c2fbdaba8028de0c92553497aa771fc5f4e0c5c8793"
-"checksum glib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = 
"81f514a8abd315ede0e94e39ce5987fdb99191c5f812e5066bc5bdb965104fc4"
-"checksum glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = 
"8826cbc94631507bdd91ee40f7e099bfaa3cc4f43c086b4d1c15cff5b4e8220b"
-"checksum gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = 
"87373f64e136e9ea192ff5d3ef676a51e9ac6ab06b629223a081e0523c5f04e2"
+"checksum glib 0.1.3 (git+https://github.com/gtk-rs/glib.git)" = "<none>"
+"checksum glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)" = "<none>"
+"checksum gobject-sys 0.3.4 (git+https://github.com/gtk-rs/sys)" = "<none>"
 "checksum itertools 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)" = 
"16b73f1c685cfd8ff8d75698ed87e6188cd09944b30c0863d45c2c3699d1da0c"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum lalrpop 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)" = 
"a50b5cdf6b58f1753c86ebcc4d0852ff30478133fb370a27dbf303cbd5621fdc"
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 6de057f..921fedd 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -7,27 +7,35 @@ build = "build.rs"
 [dependencies]
 libc = "0.2"
 bitflags = "^0.9.1"
-glib = "^0.1.3"
-glib-sys = "^0.3.4"
-cairo-rs = "^0.1.3"
-cairo-sys-rs = "^0.3.4"
+#glib = "^0.1.3"
+#glib-sys = "^0.3.4"
 downcast-rs = "^1.0.0"
 regex = "^0.2.1"
 lalrpop-util = "^0.12.5"
 cssparser = "^0.18.2"
 
-#[dependencies.cairo-sys-rs]
+[dependencies.cairo-sys-rs]
+git = "https://github.com/gtk-rs/cairo.git";
+branch = "master"
 #git = "https://github.com/federicomenaquintero/cairo.git";
 #branch = "matrix-try-invert"
 #git = "file:///home/federico/src/gtk-rs/cairo"
 #features = ["png"]
 
-#[dependencies.cairo-rs]
-#git = "https://github.com/federicomenaquintero/cairo.git";
-#branch = "matrix-try-invert"
+[dependencies.cairo-rs]
+git = "https://github.com/gtk-rs/cairo.git";
+branch = "master"
 #git = "file:///home/federico/src/gtk-rs/cairo"
 #features = ["png"]
 
+[dependencies.glib]
+git = "https://github.com/gtk-rs/glib.git";
+branch = "master"
+
+[dependencies.glib-sys]
+git = "https://github.com/gtk-rs/sys";
+branch = "master"
+
 [build-dependencies.lalrpop]
 version = "0.12.5"