diff --git a/Cargo.lock b/Cargo.lock index 1179a49..313bb04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -299,7 +299,7 @@ checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ "bitflags 2.6.0", "cairo-sys-rs", - "glib", + "glib 0.19.9", "libc", "thiserror", ] @@ -310,9 +310,9 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ - "glib-sys", + "glib-sys 0.19.8", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -390,6 +390,16 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cfg-expr" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d4ba6e40bd1184518716a6e1a781bf9160e286d219ccdb8ab2612e74cfe4789" +dependencies = [ + "smallvec", + "target-lexicon", +] + [[package]] name = "cfg-if" version = "1.0.0" @@ -1293,7 +1303,7 @@ checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" dependencies = [ "gdk-pixbuf-sys", "gio", - "glib", + "glib 0.19.9", "libc", ] @@ -1303,11 +1313,11 @@ version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.19.8", + "glib-sys 0.19.8", + "gobject-sys 0.19.8", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1320,7 +1330,7 @@ dependencies = [ "gdk-pixbuf", "gdk4-sys", "gio", - "glib", + "glib 0.19.9", "libc", "pango", ] @@ -1333,13 +1343,13 @@ checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.19.8", + "glib-sys 0.19.8", + "gobject-sys 0.19.8", "libc", "pango-sys", "pkg-config", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1410,8 +1420,8 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "gio-sys", - "glib", + "gio-sys 0.19.8", + "glib 0.19.9", "libc", "pin-project-lite", "smallvec", @@ -1424,13 +1434,26 @@ version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.19.8", + "gobject-sys 0.19.8", "libc", - "system-deps", + "system-deps 6.2.2", "windows-sys 0.52.0", ] +[[package]] +name = "gio-sys" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8446d9b475730ebef81802c1738d972db42fde1c5a36a627ebc4d665fc87db04" +dependencies = [ + "glib-sys 0.20.7", + "gobject-sys 0.20.7", + "libc", + "system-deps 7.0.3", + "windows-sys 0.59.0", +] + [[package]] name = "git2" version = "0.19.0" @@ -1458,10 +1481,32 @@ dependencies = [ "futures-executor", "futures-task", "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", + "gio-sys 0.19.8", + "glib-macros 0.19.9", + "glib-sys 0.19.8", + "gobject-sys 0.19.8", + "libc", + "memchr", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" +dependencies = [ + "bitflags 2.6.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys 0.20.8", + "glib-macros 0.20.7", + "glib-sys 0.20.7", + "gobject-sys 0.20.7", "libc", "memchr", "smallvec", @@ -1490,6 +1535,19 @@ dependencies = [ "syn", ] +[[package]] +name = "glib-macros" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715601f8f02e71baef9c1f94a657a9a77c192aea6097cf9ae7e5e177cd8cde68" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "glib-sys" version = "0.19.8" @@ -1497,7 +1555,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" dependencies = [ "libc", - "system-deps", + "system-deps 6.2.2", +] + +[[package]] +name = "glib-sys" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b360ff0f90d71de99095f79c526a5888c9c92fc9ee1b19da06c6f5e75f0c2a53" +dependencies = [ + "libc", + "system-deps 7.0.3", ] [[package]] @@ -1512,9 +1580,20 @@ version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" dependencies = [ - "glib-sys", + "glib-sys 0.19.8", "libc", - "system-deps", + "system-deps 6.2.2", +] + +[[package]] +name = "gobject-sys" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a56235e971a63bfd75abb13ef70064e1346388723422a68580d8a6fbac6423" +dependencies = [ + "glib-sys 0.20.7", + "libc", + "system-deps 7.0.3", ] [[package]] @@ -1554,7 +1633,7 @@ dependencies = [ "build-rs", "libc", "libgpg-error-sys", - "system-deps", + "system-deps 6.2.2", "winreg 0.10.1", ] @@ -1564,7 +1643,7 @@ version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" dependencies = [ - "glib", + "glib 0.19.9", "graphene-sys", "libc", ] @@ -1575,10 +1654,10 @@ version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" dependencies = [ - "glib-sys", + "glib-sys 0.19.8", "libc", "pkg-config", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1589,7 +1668,7 @@ checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" dependencies = [ "cairo-rs", "gdk4", - "glib", + "glib 0.19.9", "graphene-rs", "gsk4-sys", "libc", @@ -1604,12 +1683,12 @@ checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" dependencies = [ "cairo-sys-rs", "gdk4-sys", - "glib-sys", - "gobject-sys", + "glib-sys 0.19.8", + "gobject-sys 0.19.8", "graphene-sys", "libc", "pango-sys", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1624,7 +1703,7 @@ dependencies = [ "gdk-pixbuf", "gdk4", "gio", - "glib", + "glib 0.19.9", "graphene-rs", "gsk4", "gtk4-macros", @@ -1654,14 +1733,14 @@ dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.19.8", + "glib-sys 0.19.8", + "gobject-sys 0.19.8", "graphene-sys", "gsk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -2175,7 +2254,7 @@ dependencies = [ "gdk-pixbuf", "gdk4", "gio", - "glib", + "glib 0.19.9", "gtk4", "libadwaita-sys", "libc", @@ -2189,13 +2268,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" dependencies = [ "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.19.8", + "glib-sys 0.19.8", + "gobject-sys 0.19.8", "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -2225,7 +2304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc23cc53e9b81f56330826fe36b6cc651543a7661748d5259f446de2ef4fdac9" dependencies = [ "build-rs", - "system-deps", + "system-deps 6.2.2", "winreg 0.52.0", ] @@ -2799,7 +2878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" dependencies = [ "gio", - "glib", + "glib 0.19.9", "libc", "pango-sys", ] @@ -2810,10 +2889,10 @@ version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.19.8", + "gobject-sys 0.19.8", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -3219,7 +3298,7 @@ version = "0.7.0-alpha" dependencies = [ "chrono", "config", - "glib", + "glib 0.20.0", "glib-build-tools", "gtk4", "hex", @@ -3738,7 +3817,20 @@ version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "cfg-expr", + "cfg-expr 0.15.8", + "heck", + "pkg-config", + "toml 0.8.19", + "version-compare", +] + +[[package]] +name = "system-deps" +version = "7.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005" +dependencies = [ + "cfg-expr 0.17.2", "heck", "pkg-config", "toml 0.8.19", diff --git a/gtk/Cargo.toml b/gtk/Cargo.toml index ee834db..2615fed 100644 --- a/gtk/Cargo.toml +++ b/gtk/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" ripasso = { path = "../", version = "0.7.0-alpha" } gtk = { version = "0.8.1", package = "gtk4", features = ["v4_6"] } adw = { version = "0.6.0", package = "libadwaita" } -glib = "0.19.2" +glib = "0.20.0" once_cell = "1.19.0" hex = "0.4.3" config = "0.11.0"