Merge branch 'fixes-ii' into 'bilelmoussaoui/fixes'

Cargo.lock

@@ -48,24 +48,26 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[package]]
 name = "cairo-rs"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b869e97a87170f96762f9f178eae8c461147e722ba21dd8814105bf5716bf14a"
 dependencies = [
  "bitflags",
  "cairo-sys-rs",
- "glib 0.15.0",
+ "glib",
  "libc",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-sys-rs"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
 dependencies = [
- "glib-sys 0.15.0",
+ "glib-sys",
  "libc",
- "system-deps 6.0.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -76,15 +78,6 @@ checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
 
 [[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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571"
@@ -99,12 +92,6 @@ 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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -128,6 +115,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "fragile"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da1b8f89c5b5a5b7e59405cfcf0bb9588e5ed19f0b57a4cd542bbba3f164a6d"
+
+[[package]]
 name = "futures-channel"
 version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -180,56 +173,61 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "172dfe1d9dfb62936bf7ad3ede2913a1b21b1e3db56990e46e00789201de9070"
 dependencies = [
  "bitflags",
  "gdk-pixbuf-sys",
  "gio",
- "glib 0.15.0",
+ "glib",
  "libc",
 ]
 
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171"
 dependencies = [
  "gio-sys",
- "glib-sys 0.15.0",
- "gobject-sys 0.15.0",
+ "glib-sys",
+ "gobject-sys",
  "libc",
- "system-deps 6.0.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "gdk4"
-version = "0.4.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#0baa9ec635e54343c469fc75595499b8ff524f6a"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1023950739cd692fbf559507cad031bf2b0369d68466121f8a1316bc5ae29f0"
 dependencies = [
  "bitflags",
  "cairo-rs",
  "gdk-pixbuf",
  "gdk4-sys",
  "gio",
- "glib 0.15.0",
+ "glib",
  "libc",
  "pango",
 ]
 
 [[package]]
 name = "gdk4-sys"
-version = "0.4.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#0baa9ec635e54343c469fc75595499b8ff524f6a"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "401b6be19db1e0ad2978fde7b46989b82f7595affa09cb56fe6f1302bc4f19e3"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
  "gio-sys",
- "glib-sys 0.15.0",
- "gobject-sys 0.15.0",
+ "glib-sys",
+ "gobject-sys",
  "libc",
  "pango-sys",
- "system-deps 6.0.0",
+ "pkg-config",
+ "system-deps",
 ]
 
 [[package]]
@@ -254,15 +252,16 @@ dependencies = [
 
 [[package]]
 name = "gio"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e14e0166f772d6295cfda361d227a63194497641a42da81b9e531c9f5a4d77f"
 dependencies = [
  "bitflags",
  "futures-channel",
  "futures-core",
  "futures-io",
  "gio-sys",
- "glib 0.15.0",
+ "glib",
  "libc",
  "once_cell",
  "thiserror",
@@ -270,48 +269,31 @@ dependencies = [
 
 [[package]]
 name = "gio-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04b57719ccaacf2a0d9c79f151be629f3a3ef3991658ee2af0bb66287e4ea86c"
 dependencies = [
- "glib-sys 0.15.0",
- "gobject-sys 0.15.0",
+ "glib-sys",
+ "gobject-sys",
  "libc",
- "system-deps 6.0.0",
+ "system-deps",
  "winapi",
 ]
 
 [[package]]
 name = "glib"
-version = "0.14.8"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4"
-dependencies = [
- "bitflags",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "glib-macros 0.14.1",
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
- "libc",
- "once_cell",
- "smallvec",
-]
-
-[[package]]
-name = "glib"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+checksum = "30a3e6b2e5ef2ecfb10c1e083074a81160b8f6408fcc08195c872e9de37a361b"
 dependencies = [
  "bitflags",
  "futures-channel",
  "futures-core",
  "futures-executor",
  "futures-task",
- "glib-macros 0.15.0",
- "glib-sys 0.15.0",
- "gobject-sys 0.15.0",
+ "glib-macros",
+ "glib-sys",
+ "gobject-sys",
  "libc",
  "once_cell",
  "smallvec",
@@ -320,23 +302,9 @@ dependencies = [
 
 [[package]]
 name = "glib-macros"
-version = "0.14.1"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518"
-dependencies = [
- "anyhow",
- "heck 0.3.3",
- "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+checksum = "54c0c7194ee4c597b334e3ce84d22d929405e94497828e1c54da762cbe8e3d93"
 dependencies = [
  "anyhow",
  "heck 0.4.0",
@@ -349,21 +317,12 @@ dependencies = [
 
 [[package]]
 name = "glib-sys"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae"
+checksum = "c668102c6e15e0a7f6b99b59f602c2e806967bb86414f617b77e19b1de5b3fac"
 dependencies = [
  "libc",
- "system-deps 3.2.0",
-]
-
-[[package]]
-name = "glib-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
-dependencies = [
- "libc",
- "system-deps 6.0.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -381,55 +340,48 @@ dependencies = [
 
 [[package]]
 name = "gobject-sys"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5"
+checksum = "6edb1f0b3e4c08e2a0a490d1082ba9e902cdff8ff07091e85c6caec60d17e2ab"
 dependencies = [
- "glib-sys 0.14.0",
+ "glib-sys",
  "libc",
- "system-deps 3.2.0",
-]
-
-[[package]]
-name = "gobject-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
-dependencies = [
- "glib-sys 0.15.0",
- "libc",
- "system-deps 6.0.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "graphene-rs"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570"
 dependencies = [
- "glib 0.15.0",
+ "glib",
  "graphene-sys",
  "libc",
 ]
 
 [[package]]
 name = "graphene-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03f311acb023cf7af5537f35de028e03706136eead7f25a31e8fd26f5011e0b3"
 dependencies = [
- "glib-sys 0.15.0",
+ "glib-sys",
  "libc",
  "pkg-config",
- "system-deps 6.0.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "gsk4"
-version = "0.4.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#0baa9ec635e54343c469fc75595499b8ff524f6a"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd7c79a864b8c4606d39fad3fd872688ea20ba8e833a9f38e905a458a29a8c"
 dependencies = [
  "bitflags",
  "cairo-rs",
  "gdk4",
- "glib 0.15.0",
+ "glib",
  "graphene-rs",
  "gsk4-sys",
  "libc",
@@ -438,37 +390,40 @@ dependencies = [
 
 [[package]]
 name = "gsk4-sys"
-version = "0.4.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#0baa9ec635e54343c469fc75595499b8ff524f6a"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d25ee96f7d1bdb6fa9945425aea95ce60efedf60c994eceb671fd93ad11d541"
 dependencies = [
  "cairo-sys-rs",
  "gdk4-sys",
- "glib-sys 0.15.0",
- "gobject-sys 0.15.0",
+ "glib-sys",
+ "gobject-sys",
  "graphene-sys",
  "libc",
  "pango-sys",
- "system-deps 6.0.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "gstreamer"
-version = "0.17.4"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6a255f142048ba2c4a4dce39106db1965abe355d23f4b5335edea43a553faa4"
+checksum = "939fd4f8afd09be887d05bb7ced532f215f21401837bf59f9fd2f68608e1e285"
 dependencies = [
  "bitflags",
  "cfg-if",
+ "fragile",
  "futures-channel",
  "futures-core",
  "futures-util",
- "glib 0.14.8",
+ "glib",
  "gstreamer-sys",
  "libc",
  "muldiv",
  "num-integer",
  "num-rational",
  "once_cell",
+ "option-operations",
  "paste",
  "pretty-hex",
  "thiserror",
@@ -476,13 +431,13 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-base"
-version = "0.17.2"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c0c1d8c62eb5d08fb80173609f2eea71d385393363146e4e78107facbd67715"
+checksum = "224f35f36582407caf58ded74854526beeecc23d0cf64b8d1c3e00584ed6863f"
 dependencies = [
  "bitflags",
  "cfg-if",
- "glib 0.14.8",
+ "glib",
  "gstreamer",
  "gstreamer-base-sys",
  "libc",
@@ -490,25 +445,25 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-base-sys"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28169a7b58edb93ad8ac766f0fa12dcd36a2af4257a97ee10194c7103baf3e27"
+checksum = "a083493c3c340e71fa7c66eebda016e9fafc03eb1b4804cf9b2bad61994b078e"
 dependencies = [
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "glib-sys",
+ "gobject-sys",
  "gstreamer-sys",
  "libc",
- "system-deps 3.2.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "gstreamer-player"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c503dba6f79b5cd8a4be5329119892c196db013ce66fce16079a7df8ce819a3a"
+checksum = "5f14ee02352ba73cadebe640bfb33f12fe8d03cbcad816a102d55a0251fb99bb"
 dependencies = [
  "bitflags",
- "glib 0.14.8",
+ "glib",
  "gstreamer",
  "gstreamer-player-sys",
  "gstreamer-video",
@@ -518,40 +473,41 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-player-sys"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e50bed2a120574750ea1370163df21b50762d0b4967f569fdc58232f4c930d5"
+checksum = "1f9b674b39a4d0e18710f6e3d2b109f1793d8028ee4e39da3909b55b4529d399"
 dependencies = [
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "glib-sys",
+ "gobject-sys",
  "gstreamer-sys",
  "gstreamer-video-sys",
  "libc",
- "system-deps 3.2.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "gstreamer-sys"
-version = "0.17.3"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a81704feeb3e8599913bdd1e738455c2991a01ff4a1780cb62200993e454cc3e"
+checksum = "e3517a65d3c2e6f8905b456eba5d53bda158d664863aef960b44f651cb7d33e2"
 dependencies = [
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "glib-sys",
+ "gobject-sys",
  "libc",
- "system-deps 3.2.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "gstreamer-video"
-version = "0.17.2"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3447ee95c8e79daec0b163260cf6a3de9bc19ff47a01b533787f900074a3476"
+checksum = "6c5f4d1bdccb60be70c63001d331e4945d9b61bf77610e33584525df10633917"
 dependencies = [
  "bitflags",
  "cfg-if",
+ "fragile",
  "futures-channel",
- "glib 0.14.8",
+ "glib",
  "gstreamer",
  "gstreamer-base",
  "gstreamer-video-sys",
@@ -561,22 +517,23 @@ dependencies = [
 
 [[package]]
 name = "gstreamer-video-sys"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b81608f4182bdddd5bd33aaaa341d5544eda12b067a3dab75b1b7d2de01a3ba7"
+checksum = "255c487bf6dd145e23558eaf1c92ef0946ee1999d22bdadc1e492b463609c4b6"
 dependencies = [
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
+ "glib-sys",
+ "gobject-sys",
  "gstreamer-base-sys",
  "gstreamer-sys",
  "libc",
- "system-deps 3.2.0",
+ "system-deps",
 ]
 
 [[package]]
 name = "gtk4"
-version = "0.4.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#0baa9ec635e54343c469fc75595499b8ff524f6a"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6fda2b49a25eefc1116f15d06585d333c21fc3ce499ab0a86641fac2fbf40ac"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -585,7 +542,7 @@ dependencies = [
  "gdk-pixbuf",
  "gdk4",
  "gio",
- "glib 0.15.0",
+ "glib",
  "graphene-rs",
  "gsk4",
  "gtk4-macros",
@@ -597,8 +554,9 @@ dependencies = [
 
 [[package]]
 name = "gtk4-macros"
-version = "0.4.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#0baa9ec635e54343c469fc75595499b8ff524f6a"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b17860e493ada8a40577f0e92bce8249a97c831e39d7811ef21de6281d67f86"
 dependencies = [
  "anyhow",
  "proc-macro-crate",
@@ -610,20 +568,21 @@ dependencies = [
 
 [[package]]
 name = "gtk4-sys"
-version = "0.4.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#0baa9ec635e54343c469fc75595499b8ff524f6a"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffc1047ea7a0ff2947fbfb703eecfcca6b58912171037a4c55b1577015f079d5"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
  "gdk4-sys",
  "gio-sys",
- "glib-sys 0.15.0",
- "gobject-sys 0.15.0",
+ "glib-sys",
+ "gobject-sys",
  "graphene-sys",
  "gsk4-sys",
  "libc",
  "pango-sys",
- "system-deps 6.0.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -660,15 +619,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "itertools"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
-dependencies = [
- "either",
-]
-
-[[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -676,13 +626,14 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libadwaita"
-version = "0.1.0-alpha-6"
-source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#ead2627571d6644f849a99670ca35fdcaa300394"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d4b1d54d907dfa5d6663fdf4bdbe46c34747258b85c787adbf66187ccbaac81"
 dependencies = [
  "gdk-pixbuf",
  "gdk4",
  "gio",
- "glib 0.15.0",
+ "glib",
  "gtk4",
  "libadwaita-sys",
  "libc",
@@ -692,16 +643,17 @@ dependencies = [
 
 [[package]]
 name = "libadwaita-sys"
-version = "0.1.0-alpha-6"
-source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#ead2627571d6644f849a99670ca35fdcaa300394"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f18b6ac4cadd252a89f5cba0a5a4e99836131795d6fad37b859ac79e8cb7d2c8"
 dependencies = [
  "gdk4-sys",
  "gio-sys",
- "glib-sys 0.15.0",
- "gobject-sys 0.15.0",
+ "glib-sys",
+ "gobject-sys",
  "gtk4-sys",
  "libc",
- "system-deps 6.0.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -828,12 +780,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
 
 [[package]]
+name = "option-operations"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95d6113415f41b268f1195907427519769e40ee6f28cbb053795098a2c16f447"
+dependencies = [
+ "paste",
+]
+
+[[package]]
 name = "pango"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79211eff430c29cc38c69e0ab54bc78fa1568121ca9737707eee7f92a8417a94"
 dependencies = [
  "bitflags",
- "glib 0.15.0",
+ "glib",
  "libc",
  "once_cell",
  "pango-sys",
@@ -841,13 +803,14 @@ dependencies = [
 
 [[package]]
 name = "pango-sys"
-version = "0.15.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core#9c59482b4bc1d3d46ca7ddaf40f9e9e04964b4c6"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2"
 dependencies = [
- "glib-sys 0.15.0",
- "gobject-sys 0.15.0",
+ "glib-sys",
+ "gobject-sys",
  "libc",
- "system-deps 6.0.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -1020,24 +983,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
 
 [[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 0.3.3",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
 name = "syn"
 version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1050,33 +995,15 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"
-dependencies = [
- "anyhow",
- "cfg-expr 0.8.1",
- "heck 0.3.3",
- "itertools",
- "pkg-config",
- "strum",
- "strum_macros",
- "thiserror",
- "toml",
- "version-compare 0.0.11",
-]
-
-[[package]]
-name = "system-deps"
 version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b1487aaddaacbc5d60a2a507ba1617c5ca66c57dd0dd07d0c5efd5b693841d4"
 dependencies = [
- "cfg-expr 0.9.0",
+ "cfg-expr",
  "heck 0.3.3",
  "pkg-config",
  "toml",
- "version-compare 0.1.0",
+ "version-compare",
 ]
 
 [[package]]
@@ -1143,12 +1070,6 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "version-compare"
-version = "0.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
-
-[[package]]
-name = "version-compare"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"

Cargo.toml

@@ -2,25 +2,25 @@
 name = "gnome-tour"
 version = "40.0.0"
 authors = ["Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 video = ["gst_player", "gst"]
 
 [dependencies]
-gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs", features= ["v4_2"]}
+gtk = { package = "gtk4", version = "0.4", features= ["v4_2"]}
 log = "0.4"
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
-adw = {package = "libadwaita", git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs"}
+adw = {package = "libadwaita", version = "0.1"}
 pretty_env_logger = "0.4"
 
 [dependencies.gst_player]
-version = "0.17"
+version = "0.18"
 package = "gstreamer-player"
 optional = true
 
 [dependencies.gst]
-version = "0.17"
+version = "0.18"
 package = "gstreamer"
 optional = true
 

data/org.gnome.Tour.metainfo.xml.in.in

@@ -3,7 +3,7 @@
 <component type="desktop-application">
   <id>@app-id@</id>
   <metadata_license>CC0</metadata_license>
-  <project_license>GPL-3.0+</project_license>
+  <project_license>GPL-3.0-or-later</project_license>
   <name>Tour</name>
   <summary>GNOME Tour and Greeter</summary>
   <description>

data/resources/ui/paginator.ui

@@ -15,15 +15,13 @@
       </object>
     </child>
     <child>
-      <object class="GtkBox">
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <child>
       <object class="GtkOverlay" id="previous_overlay">
         <property name="valign">center</property>
-            <child>
+        <child type="overlay">
           <object class="GtkButton" id="previous_btn">
+            <property name="margin-start">12</property>
             <property name="icon-name">left-large-symbolic</property>
+            <property name="halign">start</property>
             <property name="valign">center</property>
             <property name="action-name">app.previous-page</property>
             <property name="tooltip-text" translatable="yes">Previous</property>
@@ -32,46 +30,37 @@
             </style>
           </object>
         </child>
-          </object>
-        </child>
-        <child>
-          <object class="AdwCarousel" id="carousel">
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkOverlay" id="start_overlay">
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkButton" id="start_btn">
+        <child type="overlay">
+          <object class="GtkButton" id="next_btn">
+            <property name="margin-end">12</property>
             <property name="icon-name">right-large-symbolic</property>
+            <property name="halign">end</property>
             <property name="valign">center</property>
-                <property name="action-name">app.start-tour</property>
-                <property name="tooltip-text" translatable="yes">Start</property>
+            <property name="action-name">app.next-page</property>
+            <property name="tooltip-text" translatable="yes">Next</property>
             <style>
-                  <class name="suggested-action" />
               <class name="circular" />
             </style>
           </object>
         </child>
         <child type="overlay">
-              <object class="GtkOverlay" id="next_overlay">
-                <property name="valign">center</property>
-                <property name="can-target">false</property>
-                <child>
-                  <object class="GtkButton" id="next_btn">
+          <object class="GtkButton" id="start_btn">
+            <property name="margin-end">12</property>
             <property name="icon-name">right-large-symbolic</property>
+            <property name="halign">end</property>
             <property name="valign">center</property>
-                    <property name="action-name">app.next-page</property>
-                    <property name="tooltip-text" translatable="yes">Next</property>
+            <property name="action-name">app.start-tour</property>
+            <property name="tooltip-text" translatable="yes">Start</property>
             <style>
+              <class name="suggested-action" />
               <class name="circular" />
             </style>
           </object>
         </child>
-              </object>
-            </child>
+        <child>
+          <object class="AdwCarousel" id="carousel">
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
           </object>
         </child>
       </object>

meson.build

 project('gnome-tour',
         'rust',
         version: '41.rc',
+        license: 'GPL-3.0-or-later',
 	meson_version : '>= 0.50')
 
 i18n = import('i18n')

src/widgets/paginator.rs

@@ -17,8 +17,6 @@ mod imp {
         pub(super) pages: RefCell<Vec<gtk::Widget>>,
         pub(super) current_page: Cell<u32>,
         #[template_child]
-        pub(super) next_overlay: TemplateChild<gtk::Overlay>,
-        #[template_child]
         pub(super) next_btn: TemplateChild<gtk::Button>,
         #[template_child]
         pub(super) start_btn: TemplateChild<gtk::Button>,
@@ -31,7 +29,6 @@ mod imp {
             Self {
                 carousel: TemplateChild::default(),
                 start_btn: TemplateChild::default(),
-                next_overlay: TemplateChild::default(),
                 next_btn: TemplateChild::default(),
                 previous_btn: TemplateChild::default(),
                 pages: RefCell::new(Vec::new()),
@@ -142,9 +139,9 @@ impl PaginatorWidget {
 
         let (opacity_previous, opacity_start, opacity_next) = if (0.0..1.0).contains(&position) {
             if position == 0.0 {
-                (position, 1.0, position)
+                (position, 1.0 - position, position)
             } else {
-                (position, 1.0, position)
+                (position, 1.0 - position, position)
             }
         } else if (0.0 <= position) && (position <= forelast_page) {
             (1.0, 0.0, 1.0)
@@ -156,12 +153,18 @@ impl PaginatorWidget {
             panic!("Position of the carousel is outside the allowed range");
         };
 
+        // While transitioning to the last page the next button is still visible
+        // pressing it would crash the app so we make it not targetable.
+        let can_target_start = opacity_next < f64::EPSILON;
+        let can_target_next = opacity_next > 0_f64 && position < forelast_page;
+
         imp.start_btn.set_opacity(opacity_start);
         imp.start_btn.set_visible(opacity_start > 0_f64);
+        imp.start_btn.set_can_target(can_target_start);
 
         imp.next_btn.set_opacity(opacity_next);
         imp.next_btn.set_visible(opacity_next > 0_f64);
-        imp.next_overlay.set_can_target(opacity_next > 0_f64);
+        imp.next_btn.set_can_target(can_target_next);
 
         imp.previous_btn.set_opacity(opacity_previous);
         imp.previous_btn.set_visible(opacity_previous > 0_f64);