Skip to content

X
ximper-welcome
Commit 6505941d authored by Bilal Elmoussaoui's avatar Bilal Elmoussaoui
Browse files
Options

Merge branch 'wip/cdavis/use-git-rust-deps' into 'master'

general: Use git gtk-rs dependencies See merge request GNOME/gnome-tour!54
parents d603eee2 21df0c02
Show whitespace changes
Inline Side-by-side
Showing with 121 additions and 190 deletions
Cargo.lock
View file @ 6505941d
...@@ -36,9 +36,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ...@@ -36,9 +36,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.2.1" version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "block" name = "block"
...@@ -48,9 +48,8 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" ...@@ -48,9 +48,8 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]] [[package]]
name = "cairo-rs" name = "cairo-rs"
version = "0.14.3" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "f859ade407c19810ae920b4fafab92189ed312adad490d08fb16b5f49f1e2207"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cairo-sys-rs", "cairo-sys-rs",
...@@ -61,13 +60,12 @@ dependencies = [ ...@@ -61,13 +60,12 @@ dependencies = [
[[package]] [[package]]
name = "cairo-sys-rs" name = "cairo-sys-rs"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "d7c9c3928781e8a017ece15eace05230f04b647457d170d2d9641c94a444ff80"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"libc", "libc",
"system-deps 3.2.0", "system-deps",
] ]
[[package]] [[package]]
...@@ -78,15 +76,6 @@ checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" ...@@ -78,15 +76,6 @@ checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
[[package]] [[package]]
name = "cfg-expr" 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" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571" checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571"
...@@ -101,12 +90,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -101,12 +90,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "either"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "env_logger" name = "env_logger"
version = "0.7.1" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
...@@ -130,6 +113,12 @@ dependencies = [ ...@@ -130,6 +113,12 @@ dependencies = [
] ]
[[package]] [[package]]
name = "fragile"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2"
[[package]]
name = "futures-channel" name = "futures-channel"
version = "0.3.12" version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
...@@ -185,10 +174,10 @@ dependencies = [ ...@@ -185,10 +174,10 @@ dependencies = [
[[package]] [[package]]
name = "gdk-pixbuf" name = "gdk-pixbuf"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f"
dependencies = [ dependencies = [
"bitflags",
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
"gio", "gio",
"glib", "glib",
...@@ -197,22 +186,20 @@ dependencies = [ ...@@ -197,22 +186,20 @@ dependencies = [
[[package]] [[package]]
name = "gdk-pixbuf-sys" name = "gdk-pixbuf-sys"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590"
dependencies = [ dependencies = [
"gio-sys", "gio-sys",
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
"libc", "libc",
"system-deps 3.2.0", "system-deps",
] ]
[[package]] [[package]]
name = "gdk4" name = "gdk4"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8"
checksum = "4c0f7f98ad25b81ac9462f74a091b0e4c0983ed1e74d19a38230c772b4dcef81"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cairo-rs", "cairo-rs",
...@@ -227,18 +214,16 @@ dependencies = [ ...@@ -227,18 +214,16 @@ dependencies = [
[[package]] [[package]]
name = "gdk4-sys" name = "gdk4-sys"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8"
checksum = "262a79666b42e1884577f11a050439a964b95dec55343ac6ace7930e1415fa18"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
"gio-sys", "gio-sys",
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
"graphene-sys",
"libc", "libc",
"pango-sys", "pango-sys",
"system-deps 4.0.0", "system-deps",
] ]
[[package]] [[package]]
...@@ -274,9 +259,8 @@ dependencies = [ ...@@ -274,9 +259,8 @@ dependencies = [
[[package]] [[package]]
name = "gio" name = "gio"
version = "0.14.5" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "81a4c12fcba7a6402ae843a0085ec16d3658a87901763b6a7f0a7c5d60e555a5"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"futures-channel", "futures-channel",
...@@ -291,22 +275,20 @@ dependencies = [ ...@@ -291,22 +275,20 @@ dependencies = [
[[package]] [[package]]
name = "gio-sys" name = "gio-sys"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
"libc", "libc",
"system-deps 3.2.0", "system-deps",
"winapi", "winapi",
] ]
[[package]] [[package]]
name = "glib" name = "glib"
version = "0.14.5" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "d4a930b7208e6e0ab839eea5f65ac2b82109f729621430d47fe905e2e09d33f4"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"futures-channel", "futures-channel",
...@@ -323,9 +305,8 @@ dependencies = [ ...@@ -323,9 +305,8 @@ dependencies = [
[[package]] [[package]]
name = "glib-macros" name = "glib-macros"
version = "0.14.1" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"heck", "heck",
...@@ -338,12 +319,11 @@ dependencies = [ ...@@ -338,12 +319,11 @@ dependencies = [
[[package]] [[package]]
name = "glib-sys" name = "glib-sys"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae"
dependencies = [ dependencies = [
"libc", "libc",
"system-deps 3.2.0", "system-deps",
] ]
[[package]] [[package]]
...@@ -361,20 +341,18 @@ dependencies = [ ...@@ -361,20 +341,18 @@ dependencies = [
[[package]] [[package]]
name = "gobject-sys" name = "gobject-sys"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"libc", "libc",
"system-deps 3.2.0", "system-deps",
] ]
[[package]] [[package]]
name = "graphene-rs" name = "graphene-rs"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "f1460a39f06e491e6112f27e71e51435c833ba370723224dd1743dfd1f201f19"
dependencies = [ dependencies = [
"glib", "glib",
"graphene-sys", "graphene-sys",
...@@ -383,21 +361,19 @@ dependencies = [ ...@@ -383,21 +361,19 @@ dependencies = [
[[package]] [[package]]
name = "graphene-sys" name = "graphene-sys"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "e7d23fb7a9547e5f072a7e0cd49cd648fedeb786d122b106217511980cbb8962"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"libc", "libc",
"pkg-config", "pkg-config",
"system-deps 3.2.0", "system-deps",
] ]
[[package]] [[package]]
name = "gsk4" name = "gsk4"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8"
checksum = "20b71f2e2cc699c2e0fbfa22899eeaffd84f9c1dc01e9263deac8664eec22dc0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cairo-rs", "cairo-rs",
...@@ -412,8 +388,7 @@ dependencies = [ ...@@ -412,8 +388,7 @@ dependencies = [
[[package]] [[package]]
name = "gsk4-sys" name = "gsk4-sys"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8"
checksum = "30468aff80e4faadf22f9ba164ea17511a69a9995d7a13827a13424ef47b2472"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk4-sys", "gdk4-sys",
...@@ -422,17 +397,17 @@ dependencies = [ ...@@ -422,17 +397,17 @@ dependencies = [
"graphene-sys", "graphene-sys",
"libc", "libc",
"pango-sys", "pango-sys",
"system-deps 4.0.0", "system-deps",
] ]
[[package]] [[package]]
name = "gstreamer" name = "gstreamer"
version = "0.17.3" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4"
checksum = "810e68483c27518ec8491d71ee163f9fc03dcc4ebacee98caa348e8a064898ef"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cfg-if", "cfg-if",
"fragile",
"futures-channel", "futures-channel",
"futures-core", "futures-core",
"futures-util", "futures-util",
...@@ -443,6 +418,7 @@ dependencies = [ ...@@ -443,6 +418,7 @@ dependencies = [
"num-integer", "num-integer",
"num-rational", "num-rational",
"once_cell", "once_cell",
"option-operations",
"paste", "paste",
"pretty-hex", "pretty-hex",
"thiserror", "thiserror",
...@@ -450,9 +426,8 @@ dependencies = [ ...@@ -450,9 +426,8 @@ dependencies = [
[[package]] [[package]]
name = "gstreamer-base" name = "gstreamer-base"
version = "0.17.2" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4"
checksum = "2c0c1d8c62eb5d08fb80173609f2eea71d385393363146e4e78107facbd67715"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cfg-if", "cfg-if",
...@@ -464,22 +439,20 @@ dependencies = [ ...@@ -464,22 +439,20 @@ dependencies = [
[[package]] [[package]]
name = "gstreamer-base-sys" name = "gstreamer-base-sys"
version = "0.17.0" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4"
checksum = "28169a7b58edb93ad8ac766f0fa12dcd36a2af4257a97ee10194c7103baf3e27"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
"gstreamer-sys", "gstreamer-sys",
"libc", "libc",
"system-deps 3.2.0", "system-deps",
] ]
[[package]] [[package]]
name = "gstreamer-player" name = "gstreamer-player"
version = "0.17.0" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4"
checksum = "c503dba6f79b5cd8a4be5329119892c196db013ce66fce16079a7df8ce819a3a"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"glib", "glib",
...@@ -492,38 +465,36 @@ dependencies = [ ...@@ -492,38 +465,36 @@ dependencies = [
[[package]] [[package]]
name = "gstreamer-player-sys" name = "gstreamer-player-sys"
version = "0.17.0" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4"
checksum = "3e50bed2a120574750ea1370163df21b50762d0b4967f569fdc58232f4c930d5"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
"gstreamer-sys", "gstreamer-sys",
"gstreamer-video-sys", "gstreamer-video-sys",
"libc", "libc",
"system-deps 3.2.0", "system-deps",
] ]
[[package]] [[package]]
name = "gstreamer-sys" name = "gstreamer-sys"
version = "0.17.3" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4"
checksum = "a81704feeb3e8599913bdd1e738455c2991a01ff4a1780cb62200993e454cc3e"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
"libc", "libc",
"system-deps 3.2.0", "system-deps",
] ]
[[package]] [[package]]
name = "gstreamer-video" name = "gstreamer-video"
version = "0.17.2" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4"
checksum = "e3447ee95c8e79daec0b163260cf6a3de9bc19ff47a01b533787f900074a3476"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cfg-if", "cfg-if",
"fragile",
"futures-channel", "futures-channel",
"glib", "glib",
"gstreamer", "gstreamer",
...@@ -535,23 +506,21 @@ dependencies = [ ...@@ -535,23 +506,21 @@ dependencies = [
[[package]] [[package]]
name = "gstreamer-video-sys" name = "gstreamer-video-sys"
version = "0.17.0" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git#d1cc8d12984b6ce7ad1c24b7f2ca7009b301cda4"
checksum = "b81608f4182bdddd5bd33aaaa341d5544eda12b067a3dab75b1b7d2de01a3ba7"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
"gstreamer-base-sys", "gstreamer-base-sys",
"gstreamer-sys", "gstreamer-sys",
"libc", "libc",
"system-deps 3.2.0", "system-deps",
] ]
[[package]] [[package]]
name = "gtk4" name = "gtk4"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8"
checksum = "906f9308d15789d96a736881582181d710ae0937197119df459f3d2b46ef6776"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cairo-rs", "cairo-rs",
...@@ -573,12 +542,9 @@ dependencies = [ ...@@ -573,12 +542,9 @@ dependencies = [
[[package]] [[package]]
name = "gtk4-macros" name = "gtk4-macros"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8"
checksum = "4d0d008cdf23214c697482415dd20f666bdf3cc9f5e803b017223c17c5b59a6e"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"heck",
"itertools",
"proc-macro-crate", "proc-macro-crate",
"proc-macro-error", "proc-macro-error",
"proc-macro2", "proc-macro2",
...@@ -589,8 +555,7 @@ dependencies = [ ...@@ -589,8 +555,7 @@ dependencies = [
[[package]] [[package]]
name = "gtk4-sys" name = "gtk4-sys"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk4-rs.git#9479180bb6c2115cf3907607911332e8e29be5d8"
checksum = "d06be0a6322aa77dd372f726e97efbcbb192d9a824a414a8874f238effd7747c"
dependencies = [ dependencies = [
"cairo-sys-rs", "cairo-sys-rs",
"gdk-pixbuf-sys", "gdk-pixbuf-sys",
...@@ -602,7 +567,7 @@ dependencies = [ ...@@ -602,7 +567,7 @@ dependencies = [
"gsk4-sys", "gsk4-sys",
"libc", "libc",
"pango-sys", "pango-sys",
"system-deps 4.0.0", "system-deps",
] ]
[[package]] [[package]]
...@@ -633,15 +598,6 @@ dependencies = [ ...@@ -633,15 +598,6 @@ dependencies = [
] ]
[[package]] [[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" name = "lazy_static"
version = "1.4.0" version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
...@@ -650,8 +606,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ...@@ -650,8 +606,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "libadwaita" name = "libadwaita"
version = "0.1.0-alpha-6" version = "0.1.0-alpha-6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git#add3cc01b8b3bd2e564fef6dfc43c696a61d3a44"
checksum = "d8d01ba5036df1c3e09be88b4b8e0906af977bb7ec28d5faec81a1de94bc775c"
dependencies = [ dependencies = [
"gdk-pixbuf", "gdk-pixbuf",
"gdk4", "gdk4",
...@@ -667,18 +622,15 @@ dependencies = [ ...@@ -667,18 +622,15 @@ dependencies = [
[[package]] [[package]]
name = "libadwaita-sys" name = "libadwaita-sys"
version = "0.1.0-alpha-6" version = "0.1.0-alpha-6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git#add3cc01b8b3bd2e564fef6dfc43c696a61d3a44"
checksum = "3127d83c55f64c466925b9d1e27a964187f193e94c7c8820ad6b29d6e5f487d8"
dependencies = [ dependencies = [
"gdk-pixbuf-sys",
"gdk4-sys", "gdk4-sys",
"gio-sys", "gio-sys",
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
"gtk4-sys", "gtk4-sys",
"libc", "libc",
"pango-sys", "system-deps",
"system-deps 4.0.0",
] ]
[[package]] [[package]]
...@@ -800,15 +752,23 @@ dependencies = [ ...@@ -800,15 +752,23 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.5.2" version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
[[package]] [[package]]
name = "pango" name = "option-operations"
version = "0.14.3" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1fc88307d9797976ea62722ff2ec5de3fae279c6e20100ed3f49ca1a4bf3f96" checksum = "95d6113415f41b268f1195907427519769e40ee6f28cbb053795098a2c16f447"
dependencies = [
"paste",
]
[[package]]
name = "pango"
version = "0.15.0"
source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"glib", "glib",
...@@ -819,14 +779,13 @@ dependencies = [ ...@@ -819,14 +779,13 @@ dependencies = [
[[package]] [[package]]
name = "pango-sys" name = "pango-sys"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gtk-rs/gtk-rs-core#9e06f9420118968b3d95ae245050e8e2ecc69912"
checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe"
dependencies = [ dependencies = [
"glib-sys", "glib-sys",
"gobject-sys", "gobject-sys",
"libc", "libc",
"system-deps 3.2.0", "system-deps",
] ]
[[package]] [[package]]
...@@ -1064,28 +1023,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -1064,28 +1023,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
[[package]] [[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" name = "syn"
version = "1.0.60" version = "1.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
...@@ -1094,29 +1035,11 @@ dependencies = [ ...@@ -1094,29 +1035,11 @@ dependencies = [
[[package]] [[package]]
name = "system-deps" name = "system-deps"
version = "3.2.0" version = "6.0.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" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c1889ab44c2a423ba9ba4d64cd04989b25c0280ca7ade813f05368418722a04" checksum = "7b1487aaddaacbc5d60a2a507ba1617c5ca66c57dd0dd07d0c5efd5b693841d4"
dependencies = [ dependencies = [
"cfg-expr 0.9.0", "cfg-expr",
"heck", "heck",
"pkg-config", "pkg-config",
"toml", "toml",
...@@ -1204,9 +1127,9 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ...@@ -1204,9 +1127,9 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
[[package]] [[package]]
name = "version-compare" name = "version-compare"
version = "0.0.11" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
[[package]] [[package]]
name = "version_check" name = "version_check"
......
Cargo.toml
View file @ 6505941d
...@@ -8,19 +8,19 @@ edition = "2018" ...@@ -8,19 +8,19 @@ edition = "2018"
video = ["gst_player", "gst"] video = ["gst_player", "gst"]
[dependencies] [dependencies]
gtk = { package = "gtk4", version = "0.3", features= ["v4_2"]} gtk = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gtk4", version = "0.3", features= ["v4_2"]}
log = "0.4" log = "0.4"
gettext-rs = { version = "0.6", features = ["gettext-system"] } gettext-rs = { version = "0.6", features = ["gettext-system"] }
libadwaita = "0.1.0-alpha-6" libadwaita = { git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs.git" }
pretty_env_logger = "0.4" pretty_env_logger = "0.4"
[dependencies.gst_player] [dependencies.gst_player]
version = "0.17" git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git"
package = "gstreamer-player" package = "gstreamer-player"
optional = true optional = true
[dependencies.gst] [dependencies.gst]
version = "0.17" git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git"
package = "gstreamer" package = "gstreamer"
optional = true optional = true
build-aux/org.gnome.TourDevel.json
View file @ 6505941d
...@@ -29,6 +29,17 @@ ...@@ -29,6 +29,17 @@
}, },
"modules" : [ "modules" : [
{ {
"name" : "libadwaita",
"buildsystem" : "meson",
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libadwaita.git",
"branch" : "main"
}
]
},
{
"name" : "gnome-tour", "name" : "gnome-tour",
"buildsystem" : "meson", "buildsystem" : "meson",
"config-opts" : [ "config-opts" : [
......
src/widgets/pages/image.rs
View file @ 6505941d
...@@ -21,7 +21,7 @@ impl ImagePageWidget { ...@@ -21,7 +21,7 @@ impl ImagePageWidget {
self.widget.set_halign(gtk::Align::Fill); self.widget.set_halign(gtk::Align::Fill);
self.widget.set_valign(gtk::Align::Fill); self.widget.set_valign(gtk::Align::Fill);
let container = gtk::BoxBuilder::new() let container = gtk::Box::builder()
.orientation(gtk::Orientation::Vertical) .orientation(gtk::Orientation::Vertical)
.spacing(12) .spacing(12)
.halign(gtk::Align::Center) .halign(gtk::Align::Center)
...@@ -35,14 +35,14 @@ impl ImagePageWidget { ...@@ -35,14 +35,14 @@ impl ImagePageWidget {
let clamp = libadwaita::Clamp::new(); let clamp = libadwaita::Clamp::new();
clamp.set_child(Some(&container)); clamp.set_child(Some(&container));
let picture = gtk::PictureBuilder::new() let picture = gtk::Picture::builder()
.can_shrink(false) .can_shrink(false)
.keep_aspect_ratio(true) .keep_aspect_ratio(true)
.build(); .build();
picture.set_resource(Some(resource_uri)); picture.set_resource(Some(resource_uri));
container.append(&picture); container.append(&picture);
let head_label = gtk::LabelBuilder::new() let head_label = gtk::Label::builder()
.label(&head) .label(&head)
.justify(gtk::Justification::Center) .justify(gtk::Justification::Center)
.valign(gtk::Align::Center) .valign(gtk::Align::Center)
...@@ -51,7 +51,7 @@ impl ImagePageWidget { ...@@ -51,7 +51,7 @@ impl ImagePageWidget {
head_label.add_css_class("page-title"); head_label.add_css_class("page-title");
container.append(&head_label); container.append(&head_label);
let body_label = gtk::LabelBuilder::new() let body_label = gtk::Label::builder()
.label(&body) .label(&body)
.lines(2) .lines(2)
.wrap(true) .wrap(true)
......
src/widgets/pages/welcome.rs
View file @ 6505941d
...@@ -65,7 +65,7 @@ impl WelcomePageWidget { ...@@ -65,7 +65,7 @@ impl WelcomePageWidget {
} }
fn init(&self) { fn init(&self) {
let container = gtk::BoxBuilder::new() let container = gtk::Box::builder()
.orientation(gtk::Orientation::Vertical) .orientation(gtk::Orientation::Vertical)
.spacing(0) .spacing(0)
.hexpand(true) .hexpand(true)
...@@ -83,7 +83,7 @@ impl WelcomePageWidget { ...@@ -83,7 +83,7 @@ impl WelcomePageWidget {
#[cfg(not(feature = "video"))] #[cfg(not(feature = "video"))]
let header = { let header = {
let logo = gtk::PictureBuilder::new() let logo = gtk::Picture::builder()
.can_shrink(false) .can_shrink(false)
.keep_aspect_ratio(true) .keep_aspect_ratio(true)
.build(); .build();
......
src/widgets/paginator.rs
View file @ 6505941d
...@@ -27,9 +27,7 @@ impl PaginatorWidget { ...@@ -27,9 +27,7 @@ impl PaginatorWidget {
widget, widget,
carousel: libadwaita::Carousel::new(), carousel: libadwaita::Carousel::new(),
carousel_dots: libadwaita::CarouselIndicatorDots::new(), carousel_dots: libadwaita::CarouselIndicatorDots::new(),
headerbar: gtk::HeaderBarBuilder::new() headerbar: gtk::HeaderBar::builder().show_title_buttons(false).build(),
.show_title_buttons(false)
.build(),
start_btn: gtk::Button::with_label(&gettext("_Start")), start_btn: gtk::Button::with_label(&gettext("_Start")),
next_overlay: gtk::Overlay::new(), next_overlay: gtk::Overlay::new(),
next_btn: gtk::Button::with_label(&gettext("_Next")), next_btn: gtk::Button::with_label(&gettext("_Next")),
...@@ -115,7 +113,6 @@ impl PaginatorWidget { ...@@ -115,7 +113,6 @@ impl PaginatorWidget {
self.carousel_dots.set_carousel(Some(&self.carousel)); self.carousel_dots.set_carousel(Some(&self.carousel));
self.carousel.set_hexpand(true); self.carousel.set_hexpand(true);
self.carousel.set_vexpand(true); self.carousel.set_vexpand(true);
self.carousel.set_animation_duration(300);
self.carousel self.carousel
.connect_position_notify(clone!(@weak p => move |_| { .connect_position_notify(clone!(@weak p => move |_| {
...@@ -170,7 +167,7 @@ impl PaginatorWidget { ...@@ -170,7 +167,7 @@ impl PaginatorWidget {
if page_nr < self.carousel.n_pages() { if page_nr < self.carousel.n_pages() {
let pages = &self.pages.borrow(); let pages = &self.pages.borrow();
let page = pages.get(page_nr as usize).unwrap(); let page = pages.get(page_nr as usize).unwrap();
self.carousel.scroll_to(page); self.carousel.scroll_to(page, true);
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment