[librsvg/bilelmoussaoui/new-gtk-rs-stack: 2/2] temporary: switch to git dependencies

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit e3cbaed0f9a69146cb45e05fb7941090b4ad29a9
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Sat Nov 13 09:03:58 2021 +0100

    temporary: switch to git dependencies

 Cargo.lock | 114 +++++++++++++++++++++++++++++++++----------------------------
 Cargo.toml |  20 +++++------
 2 files changed, 71 insertions(+), 63 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index f60c7d3c..5643e12e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -143,9 +143,8 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cairo-rs"
-version = "0.14.9"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "bitflags",
  "cairo-sys-rs",
@@ -156,13 +155,12 @@ dependencies = [
 
 [[package]]
 name = "cairo-sys-rs"
-version = "0.14.9"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps",
+ "system-deps 5.0.0",
 ]
 
 [[package]]
@@ -183,6 +181,15 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "cfg-expr"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -627,9 +634,8 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "gdk-pixbuf-sys",
  "gio",
@@ -639,15 +645,14 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "gio-sys",
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 5.0.0",
 ]
 
 [[package]]
@@ -674,9 +679,8 @@ dependencies = [
 
 [[package]]
 name = "gio"
-version = "0.14.8"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -691,22 +695,20 @@ dependencies = [
 
 [[package]]
 name = "gio-sys"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 5.0.0",
  "winapi",
 ]
 
 [[package]]
 name = "glib"
-version = "0.14.8"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -723,9 +725,8 @@ dependencies = [
 
 [[package]]
 name = "glib-macros"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "anyhow",
  "heck",
@@ -738,12 +739,11 @@ dependencies = [
 
 [[package]]
 name = "glib-sys"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "libc",
- "system-deps",
+ "system-deps 5.0.0",
 ]
 
 [[package]]
@@ -754,13 +754,12 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "gobject-sys"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps",
+ "system-deps 5.0.0",
 ]
 
 [[package]]
@@ -896,7 +895,7 @@ dependencies = [
  "rgb",
  "selectors",
  "string_cache",
- "system-deps",
+ "system-deps 3.2.0",
  "tempfile",
  "test-generator",
  "tinyvec",
@@ -1181,9 +1180,8 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "pango"
-version = "0.14.8"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "bitflags",
  "glib",
@@ -1194,21 +1192,19 @@ dependencies = [
 
 [[package]]
 name = "pango-sys"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 5.0.0",
 ]
 
 [[package]]
 name = "pangocairo"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f03ac1e8d456f8f436168aeac41201f0bf49d1dc6c8d01bfb04de2cca25df631"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -1220,15 +1216,14 @@ dependencies = [
 
 [[package]]
 name = "pangocairo-sys"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f3b9b679ad5c8503e3e533ce06e1619d033274b246e977a6fa1655a6c6ef2b51"
+version = "0.15.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#8cd4720c7ea361bac780c398fe61c16977ffaa4d";
 dependencies = [
  "cairo-sys-rs",
  "glib-sys",
  "libc",
  "pango-sys",
- "system-deps",
+ "system-deps 5.0.0",
 ]
 
 [[package]]
@@ -1874,9 +1869,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e466864e431129c7e0d3476b92f20458e5879919a0596c6472738d9fa2d342f8"
+checksum = "e277c495ac6cd1a01a58d0a0c574568b4d1ddf14f59965c6a58b8d96400b54f3"
 dependencies = [
  "itoa",
  "ryu",
@@ -2072,7 +2067,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"
 dependencies = [
  "anyhow",
- "cfg-expr",
+ "cfg-expr 0.8.1",
  "heck",
  "itertools 0.10.1",
  "pkg-config",
@@ -2083,6 +2078,19 @@ dependencies = [
  "version-compare",
 ]
 
+[[package]]
+name = "system-deps"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e"
+dependencies = [
+ "cfg-expr 0.9.0",
+ "heck",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.2.0"
diff --git a/Cargo.toml b/Cargo.toml
index 3d1aad7d..8367f56b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,7 @@ crate-type = [ "staticlib", "rlib" ]
 [dependencies]
 # Keep these in sync with respect to the cairo-rs version:
 #   src/lib.rs - toplevel example in the docs
-cairo-rs = { version="0.14.0", features=["v1_16", "png", "pdf", "ps", "svg"] }
+cairo-rs = { git="https://github.com/gtk-rs/gtk-rs-core";, features=["v1_16", "png", "pdf", "ps", "svg"] }
 cast = "0.2.3"
 chrono = "0.4.0" # rsvg-convert
 clap = "~2.33.0" # rsvg-convert
@@ -49,9 +49,9 @@ cssparser = "0.27.1"
 data-url = "0.1"
 encoding = "0.2.33"
 float-cmp = "0.8.0"
-gdk-pixbuf = "0.14.0"
-gio = { version="0.14.0", features = ["v2_50"] } # per configure.ac
-glib = { version="0.14.0", features = ["v2_50"] }
+gdk-pixbuf = {git = "https://github.com/gtk-rs/gtk-rs-core"}
+gio = { git="https://github.com/gtk-rs/gtk-rs-core";, features = ["v2_50"] } # per configure.ac
+glib = { git="https://github.com/gtk-rs/gtk-rs-core";, features = ["v2_50"] }
 itertools = "0.9.0"
 language-tags = "0.3.1"
 libc = "0.2"
@@ -60,8 +60,8 @@ markup5ever = "0.10"
 nalgebra = "0.27.1"
 num-traits = "0.2"
 once_cell = "1.2.0"
-pango = { version="0.14.0", features = ["v1_46"] }
-pangocairo = "0.14.0"
+pango = { git="https://github.com/gtk-rs/gtk-rs-core";, features = ["v1_46"] }
+pangocairo = {git = "https://github.com/gtk-rs/gtk-rs-core"}
 rayon = "1"
 rctree = "0.3.3"
 regex = "1"
@@ -74,16 +74,16 @@ xml5ever = "0.16.1"
 
 [dev-dependencies]
 assert_cmd = "1.0.1"
-cairo-rs = { version="0.14.0", features = ["png"] }
+cairo-rs = { git="https://github.com/gtk-rs/gtk-rs-core";, features = ["png"] }
 cast = "0.2.3"
 chrono = "0.4.0"
 criterion = "0.3"
-glib = "0.14.0"
+glib = {git = "https://github.com/gtk-rs/gtk-rs-core"}
 libc = "0.2"
 lopdf = "0.26.0"
 matches = "0.1"
-pango = "0.14.0"
-pangocairo = "0.14.0"
+pango = {git = "https://github.com/gtk-rs/gtk-rs-core"}
+pangocairo = {git = "https://github.com/gtk-rs/gtk-rs-core"}
 png = "0.16.1"
 predicates = "2.0.0"
 proptest = "0.10.1"