GNOME.org
 

[gnome-tour/wip/cdavis/use-libadwaita-beta-release: 1/2] Revert "general: Use git gtk-rs dependencies"


commit 43f058c2e4e31dd2b9138e99a913d12267a18b56
Author: Christopher Davis <christopherdavis gnome org>
Date:   Thu Dec 9 15:17:09 2021 -0800

    Revert "general: Use git gtk-rs dependencies"
    
    This reverts commit 21df0c023cc50ae0418cd378de2245b1b07eab32.

 Cargo.lock                         | 273 ++++++++++++++++++++++++-------------
 Cargo.toml                         |   8 +-
 build-aux/org.gnome.TourDevel.json |  11 --
 src/widgets/pages/image.rs         |   8 +-
 src/widgets/pages/welcome.rs       |   4 +-
 src/widgets/paginator.rs           |   6 +-
 6 files changed, 189 insertions(+), 121 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index 9246f12..6b901f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,9 +36,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
 name = "block"
@@ -48,8 +48,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[package]]
 name = "cairo-rs"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "f859ade407c19810ae920b4fafab92189ed312adad490d08fb16b5f49f1e2207"
 dependencies = [
  "bitflags",
  "cairo-sys-rs",
@@ -60,12 +61,13 @@ dependencies = [
 
 [[package]]
 name = "cairo-sys-rs"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "d7c9c3928781e8a017ece15eace05230f04b647457d170d2d9641c94a444ff80"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
@@ -74,6 +76,15 @@ version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
 
+[[package]]
+name = "cfg-expr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "cfg-expr"
 version = "0.9.0"
@@ -89,6 +100,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
 [[package]]
 name = "env_logger"
 version = "0.7.1"
@@ -112,12 +129,6 @@ dependencies = [
  "rustc_version",
 ]
 
-[[package]]
-name = "fragile"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2"
-
 [[package]]
 name = "futures-channel"
 version = "0.3.12"
@@ -174,10 +185,10 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f"
 dependencies = [
- "bitflags",
  "gdk-pixbuf-sys",
  "gio",
  "glib",
@@ -186,20 +197,22 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590"
 dependencies = [
  "gio-sys",
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
 name = "gdk4"
 version = "0.3.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8";
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "4c0f7f98ad25b81ac9462f74a091b0e4c0983ed1e74d19a38230c772b4dcef81"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -214,16 +227,18 @@ dependencies = [
 [[package]]
 name = "gdk4-sys"
 version = "0.3.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8";
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "262a79666b42e1884577f11a050439a964b95dec55343ac6ace7930e1415fa18"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
  "gio-sys",
  "glib-sys",
  "gobject-sys",
+ "graphene-sys",
  "libc",
  "pango-sys",
- "system-deps",
+ "system-deps 4.0.0",
 ]
 
 [[package]]
@@ -259,8 +274,9 @@ dependencies = [
 
 [[package]]
 name = "gio"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "81a4c12fcba7a6402ae843a0085ec16d3658a87901763b6a7f0a7c5d60e555a5"
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -275,20 +291,22 @@ dependencies = [
 
 [[package]]
 name = "gio-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 3.2.0",
  "winapi",
 ]
 
 [[package]]
 name = "glib"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "d4a930b7208e6e0ab839eea5f65ac2b82109f729621430d47fe905e2e09d33f4"
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -305,8 +323,9 @@ dependencies = [
 
 [[package]]
 name = "glib-macros"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518"
 dependencies = [
  "anyhow",
  "heck",
@@ -319,11 +338,12 @@ dependencies = [
 
 [[package]]
 name = "glib-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae"
 dependencies = [
  "libc",
- "system-deps",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
@@ -341,18 +361,20 @@ dependencies = [
 
 [[package]]
 name = "gobject-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
 name = "graphene-rs"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "f1460a39f06e491e6112f27e71e51435c833ba370723224dd1743dfd1f201f19"
 dependencies = [
  "glib",
  "graphene-sys",
@@ -361,19 +383,21 @@ dependencies = [
 
 [[package]]
 name = "graphene-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "e7d23fb7a9547e5f072a7e0cd49cd648fedeb786d122b106217511980cbb8962"
 dependencies = [
  "glib-sys",
  "libc",
  "pkg-config",
- "system-deps",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
 name = "gsk4"
 version = "0.3.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8";
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "20b71f2e2cc699c2e0fbfa22899eeaffd84f9c1dc01e9263deac8664eec22dc0"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -388,7 +412,8 @@ dependencies = [
 [[package]]
 name = "gsk4-sys"
 version = "0.3.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8";
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "30468aff80e4faadf22f9ba164ea17511a69a9995d7a13827a13424ef47b2472"
 dependencies = [
  "cairo-sys-rs",
  "gdk4-sys",
@@ -397,17 +422,17 @@ dependencies = [
  "graphene-sys",
  "libc",
  "pango-sys",
- "system-deps",
+ "system-deps 4.0.0",
 ]
 
 [[package]]
 name = "gstreamer"
-version = "0.18.0"
-source = 
"git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4";
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "810e68483c27518ec8491d71ee163f9fc03dcc4ebacee98caa348e8a064898ef"
 dependencies = [
  "bitflags",
  "cfg-if",
- "fragile",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -418,7 +443,6 @@ dependencies = [
  "num-integer",
  "num-rational",
  "once_cell",
- "option-operations",
  "paste",
  "pretty-hex",
  "thiserror",
@@ -426,8 +450,9 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-base"
-version = "0.18.0"
-source = 
"git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4";
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "2c0c1d8c62eb5d08fb80173609f2eea71d385393363146e4e78107facbd67715"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -439,20 +464,22 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-base-sys"
-version = "0.18.0"
-source = 
"git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4";
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "28169a7b58edb93ad8ac766f0fa12dcd36a2af4257a97ee10194c7103baf3e27"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "gstreamer-sys",
  "libc",
- "system-deps",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
 name = "gstreamer-player"
-version = "0.18.0"
-source = 
"git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4";
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "c503dba6f79b5cd8a4be5329119892c196db013ce66fce16079a7df8ce819a3a"
 dependencies = [
  "bitflags",
  "glib",
@@ -465,36 +492,38 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-player-sys"
-version = "0.18.0"
-source = 
"git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4";
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "3e50bed2a120574750ea1370163df21b50762d0b4967f569fdc58232f4c930d5"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "gstreamer-sys",
  "gstreamer-video-sys",
  "libc",
- "system-deps",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
 name = "gstreamer-sys"
-version = "0.18.0"
-source = 
"git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4";
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "a81704feeb3e8599913bdd1e738455c2991a01ff4a1780cb62200993e454cc3e"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
 name = "gstreamer-video"
-version = "0.18.0"
-source = 
"git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4";
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "e3447ee95c8e79daec0b163260cf6a3de9bc19ff47a01b533787f900074a3476"
 dependencies = [
  "bitflags",
  "cfg-if",
- "fragile",
  "futures-channel",
  "glib",
  "gstreamer",
@@ -506,21 +535,23 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-video-sys"
-version = "0.18.0"
-source = 
"git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4";
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "b81608f4182bdddd5bd33aaaa341d5544eda12b067a3dab75b1b7d2de01a3ba7"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "gstreamer-base-sys",
  "gstreamer-sys",
  "libc",
- "system-deps",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
 name = "gtk4"
 version = "0.3.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8";
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "906f9308d15789d96a736881582181d710ae0937197119df459f3d2b46ef6776"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -542,9 +573,12 @@ dependencies = [
 [[package]]
 name = "gtk4-macros"
 version = "0.3.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8";
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "4d0d008cdf23214c697482415dd20f666bdf3cc9f5e803b017223c17c5b59a6e"
 dependencies = [
  "anyhow",
+ "heck",
+ "itertools",
  "proc-macro-crate",
  "proc-macro-error",
  "proc-macro2",
@@ -555,7 +589,8 @@ dependencies = [
 [[package]]
 name = "gtk4-sys"
 version = "0.3.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8";
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "d06be0a6322aa77dd372f726e97efbcbb192d9a824a414a8874f238effd7747c"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -567,7 +602,7 @@ dependencies = [
  "gsk4-sys",
  "libc",
  "pango-sys",
- "system-deps",
+ "system-deps 4.0.0",
 ]
 
 [[package]]
@@ -597,6 +632,15 @@ dependencies = [
  "quick-error",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -606,7 +650,8 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 [[package]]
 name = "libadwaita"
 version = "0.1.0-alpha-6"
-source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git#add3cc01b8b3bd2e564fef6dfc43c696a61d3a44";
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "d8d01ba5036df1c3e09be88b4b8e0906af977bb7ec28d5faec81a1de94bc775c"
 dependencies = [
  "gdk-pixbuf",
  "gdk4",
@@ -622,15 +667,18 @@ dependencies = [
 [[package]]
 name = "libadwaita-sys"
 version = "0.1.0-alpha-6"
-source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git#add3cc01b8b3bd2e564fef6dfc43c696a61d3a44";
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "3127d83c55f64c466925b9d1e27a964187f193e94c7c8820ad6b29d6e5f487d8"
 dependencies = [
+ "gdk-pixbuf-sys",
  "gdk4-sys",
  "gio-sys",
  "glib-sys",
  "gobject-sys",
  "gtk4-sys",
  "libc",
- "system-deps",
+ "pango-sys",
+ "system-deps 4.0.0",
 ]
 
 [[package]]
@@ -752,23 +800,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.8.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
-
-[[package]]
-name = "option-operations"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "95d6113415f41b268f1195907427519769e40ee6f28cbb053795098a2c16f447"
-dependencies = [
- "paste",
-]
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
 
 [[package]]
 name = "pango"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "e1fc88307d9797976ea62722ff2ec5de3fae279c6e20100ed3f49ca1a4bf3f96"
 dependencies = [
  "bitflags",
  "glib",
@@ -779,13 +819,14 @@ dependencies = [
 
 [[package]]
 name = "pango-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912";
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps",
+ "system-deps 3.2.0",
 ]
 
 [[package]]
@@ -1022,11 +1063,29 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
+[[package]]
+name = "strum"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2"
+
+[[package]]
+name = "strum_macros"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "syn"
-version = "1.0.67"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1035,11 +1094,29 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "6.0.0"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"
+dependencies = [
+ "anyhow",
+ "cfg-expr 0.8.1",
+ "heck",
+ "itertools",
+ "pkg-config",
+ "strum",
+ "strum_macros",
+ "thiserror",
+ "toml",
+ "version-compare",
+]
+
+[[package]]
+name = "system-deps"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7b1487aaddaacbc5d60a2a507ba1617c5ca66c57dd0dd07d0c5efd5b693841d4"
+checksum = "6c1889ab44c2a423ba9ba4d64cd04989b25c0280ca7ade813f05368418722a04"
 dependencies = [
- "cfg-expr",
+ "cfg-expr 0.9.0",
  "heck",
  "pkg-config",
  "toml",
@@ -1127,9 +1204,9 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
 
 [[package]]
 name = "version-compare"
-version = "0.1.0"
+version = "0.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
+checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
 
 [[package]]
 name = "version_check"
diff --git a/Cargo.toml b/Cargo.toml
index b54ff01..e054143 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,19 +8,19 @@ edition = "2018"
 video = ["gst_player", "gst"]
 
 [dependencies]
-gtk = { git = "https://github.com/gtk-rs/gtk4-rs.git";, package = "gtk4", version = "0.3", features= ["v4_2"]}
+gtk = { package = "gtk4", version = "0.3", features= ["v4_2"]}
 log = "0.4"
 gettext-rs = { version = "0.6", features = ["gettext-system"] }
-libadwaita = { git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs.git"; }
+libadwaita = "0.1.0-alpha-6"
 pretty_env_logger = "0.4"
 
 [dependencies.gst_player]
-git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git";
+version = "0.17"
 package = "gstreamer-player"
 optional = true
 
 [dependencies.gst]
-git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git";
+version = "0.17"
 package = "gstreamer"
 optional = true
 
diff --git a/build-aux/org.gnome.TourDevel.json b/build-aux/org.gnome.TourDevel.json
index e8010b8..fe2ce42 100644
--- a/build-aux/org.gnome.TourDevel.json
+++ b/build-aux/org.gnome.TourDevel.json
@@ -28,17 +28,6 @@
         }
     },
     "modules" : [
-        {
-            "name" : "libadwaita",
-            "buildsystem" : "meson",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/libadwaita.git";,
-                    "branch" : "main"
-                }
-            ]
-        },
         {
             "name" : "gnome-tour",
             "buildsystem" : "meson",
diff --git a/src/widgets/pages/image.rs b/src/widgets/pages/image.rs
index c4b7b3b..81ec185 100644
--- a/src/widgets/pages/image.rs
+++ b/src/widgets/pages/image.rs
@@ -21,7 +21,7 @@ impl ImagePageWidget {
         self.widget.set_halign(gtk::Align::Fill);
         self.widget.set_valign(gtk::Align::Fill);
 
-        let container = gtk::Box::builder()
+        let container = gtk::BoxBuilder::new()
             .orientation(gtk::Orientation::Vertical)
             .spacing(12)
             .halign(gtk::Align::Center)
@@ -35,14 +35,14 @@ impl ImagePageWidget {
         let clamp = libadwaita::Clamp::new();
         clamp.set_child(Some(&container));
 
-        let picture = gtk::Picture::builder()
+        let picture = gtk::PictureBuilder::new()
             .can_shrink(false)
             .keep_aspect_ratio(true)
             .build();
         picture.set_resource(Some(resource_uri));
         container.append(&picture);
 
-        let head_label = gtk::Label::builder()
+        let head_label = gtk::LabelBuilder::new()
             .label(&head)
             .justify(gtk::Justification::Center)
             .valign(gtk::Align::Center)
@@ -51,7 +51,7 @@ impl ImagePageWidget {
         head_label.add_css_class("page-title");
         container.append(&head_label);
 
-        let body_label = gtk::Label::builder()
+        let body_label = gtk::LabelBuilder::new()
             .label(&body)
             .lines(2)
             .wrap(true)
diff --git a/src/widgets/pages/welcome.rs b/src/widgets/pages/welcome.rs
index 504f874..1483ce7 100644
--- a/src/widgets/pages/welcome.rs
+++ b/src/widgets/pages/welcome.rs
@@ -65,7 +65,7 @@ impl WelcomePageWidget {
     }
 
     fn init(&self) {
-        let container = gtk::Box::builder()
+        let container = gtk::BoxBuilder::new()
             .orientation(gtk::Orientation::Vertical)
             .spacing(0)
             .hexpand(true)
@@ -83,7 +83,7 @@ impl WelcomePageWidget {
 
         #[cfg(not(feature = "video"))]
         let header = {
-            let logo = gtk::Picture::builder()
+            let logo = gtk::PictureBuilder::new()
                 .can_shrink(false)
                 .keep_aspect_ratio(true)
                 .build();
diff --git a/src/widgets/paginator.rs b/src/widgets/paginator.rs
index 09ce6ad..5db2bd5 100644
--- a/src/widgets/paginator.rs
+++ b/src/widgets/paginator.rs
@@ -27,7 +27,9 @@ impl PaginatorWidget {
             widget,
             carousel: libadwaita::Carousel::new(),
             carousel_dots: libadwaita::CarouselIndicatorDots::new(),
-            headerbar: gtk::HeaderBar::builder().show_title_buttons(false).build(),
+            headerbar: gtk::HeaderBarBuilder::new()
+                .show_title_buttons(false)
+                .build(),
             start_btn: gtk::Button::with_label(&gettext("_Start")),
             next_overlay: gtk::Overlay::new(),
             next_btn: gtk::Button::with_label(&gettext("_Next")),
@@ -169,7 +171,7 @@ impl PaginatorWidget {
         if page_nr < self.carousel.n_pages() {
             let pages = &self.pages.borrow();
             let page = pages.get(page_nr as usize).unwrap();
-            self.carousel.scroll_to(page, true);
+            self.carousel.scroll_to(page);
         }
     }
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]