diff --git a/Cargo.lock b/Cargo.lock index 586aa96b..07e3ebc1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -280,8 +280,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b01fe135c0bd16afe262b6dea349bd5ea30e6de50708cec639aae7c5c14cc7e4" dependencies = [ "bitflags", - "cairo-sys-rs", - "glib", + "cairo-sys-rs 0.21.5", + "glib 0.21.5", + "libc", +] + +[[package]] +name = "cairo-rs" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc8d9aa793480744cd9a0524fef1a2e197d9eaa0f739cde19d16aba530dcb95" +dependencies = [ + "bitflags", + "cairo-sys-rs 0.22.0", + "glib 0.22.8", "libc", ] @@ -291,7 +303,18 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06c28280c6b12055b5e39e4554271ae4e6630b27c0da9148c4cf6485fc6d245c" dependencies = [ - "glib-sys", + "glib-sys 0.21.5", + "libc", + "system-deps", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8b4985713047f5faee02b8db6a6ef32bbb50269ff53c1aee716d1d195b76d54" +dependencies = [ + "glib-sys 0.22.8", "libc", "system-deps", ] @@ -534,7 +557,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -587,7 +610,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -858,8 +881,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "debb0d39e3cdd84626edfd54d6e4a6ba2da9a0ef2e796e691c4e9f8646fda00c" dependencies = [ "gdk-pixbuf-sys", - "gio", - "glib", + "gio 0.21.5", + "glib 0.21.5", "libc", ] @@ -869,9 +892,9 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd95ad50b9a3d2551e25dd4f6892aff0b772fe5372d84514e9d0583af60a0ce7" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.21.5", + "glib-sys 0.21.5", + "gobject-sys 0.21.5", "libc", "system-deps", ] @@ -882,13 +905,13 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "756564212bbe4a4ce05d88ffbd2582581ac6003832d0d32822d0825cca84bfbf" dependencies = [ - "cairo-rs", + "cairo-rs 0.21.5", "gdk-pixbuf", "gdk4-sys", - "gio", - "glib", + "gio 0.21.5", + "glib 0.21.5", "libc", - "pango", + "pango 0.21.5", ] [[package]] @@ -897,13 +920,13 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6d4e5b3ccf591826a4adcc83f5f57b4e59d1925cb4bf620b0d645f79498b034" dependencies = [ - "cairo-sys-rs", + "cairo-sys-rs 0.21.5", "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.21.5", + "glib-sys 0.21.5", + "gobject-sys 0.21.5", "libc", - "pango-sys", + "pango-sys 0.21.5", "pkg-config", "system-deps", ] @@ -974,8 +997,25 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "gio-sys", - "glib", + "gio-sys 0.21.5", + "glib 0.21.5", + "libc", + "pin-project-lite", + "smallvec", +] + +[[package]] +name = "gio" +version = "0.22.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b3e1f669909c326b9413bde5a742097b8c90a7d78f45326db13668984769ded" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys 0.22.8", + "glib 0.22.8", "libc", "pin-project-lite", "smallvec", @@ -987,11 +1027,24 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0071fe88dba8e40086c8ff9bbb62622999f49628344b1d1bf490a48a29d80f22" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.21.5", + "gobject-sys 0.21.5", "libc", "system-deps", - "windows-sys 0.52.0", + "windows-sys 0.61.2", +] + +[[package]] +name = "gio-sys" +version = "0.22.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353fdc7da7cd16da916104b1e0e4e7de380ec9c8aaa20d4d742d66310ab4b0d5" +dependencies = [ + "glib-sys 0.22.8", + "gobject-sys 0.22.6", + "libc", + "system-deps", + "windows-sys 0.61.2", ] [[package]] @@ -1018,10 +1071,30 @@ dependencies = [ "futures-executor", "futures-task", "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", + "gio-sys 0.21.5", + "glib-macros 0.21.5", + "glib-sys 0.21.5", + "gobject-sys 0.21.5", + "libc", + "memchr", + "smallvec", +] + +[[package]] +name = "glib" +version = "0.22.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddbcf514bd1881fc1b960e4e52b4e82873f4da3bceddbd58d42827b508888100" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "glib-macros 0.22.6", + "glib-sys 0.22.8", + "gobject-sys 0.22.6", "libc", "memchr", "smallvec", @@ -1040,6 +1113,18 @@ dependencies = [ "syn", ] +[[package]] +name = "glib-macros" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "506d23499707c7142898429757e8d9a3871d965239a2cb66dfa05052be6d6f19" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "glib-sys" version = "0.21.5" @@ -1050,6 +1135,16 @@ dependencies = [ "system-deps", ] +[[package]] +name = "glib-sys" +version = "0.22.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030967459f9f676851872c6304adea7825c6d462ec9b72554c733cf0c5952233" +dependencies = [ + "libc", + "system-deps", +] + [[package]] name = "global-hotkey" version = "0.8.0" @@ -1073,7 +1168,18 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dca35da0d19a18f4575f3cb99fe1c9e029a2941af5662f326f738a21edaf294" dependencies = [ - "glib-sys", + "glib-sys 0.21.5", + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22a861859b887a79cf461359c192c97a57d8fb0229dd291232e57aa11f6fa72c" +dependencies = [ + "glib-sys 0.22.8", "libc", "system-deps", ] @@ -1084,7 +1190,7 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2730030ac9db663fd8bfe1e7093742c1cafb92db9c315c9417c29032341fe2f9" dependencies = [ - "glib", + "glib 0.21.5", "graphene-sys", "libc", ] @@ -1095,7 +1201,7 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915e32091ea9ad241e4b044af62b7351c2d68aeb24f489a0d7f37a0fc484fd93" dependencies = [ - "glib-sys", + "glib-sys 0.21.5", "libc", "pkg-config", "system-deps", @@ -1107,13 +1213,13 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e755de9d8c5896c5beaa028b89e1969d067f1b9bf1511384ede971f5983aa153" dependencies = [ - "cairo-rs", + "cairo-rs 0.21.5", "gdk4", - "glib", + "glib 0.21.5", "graphene-rs", "gsk4-sys", "libc", - "pango", + "pango 0.21.5", ] [[package]] @@ -1122,13 +1228,13 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ce91472391146f482065f1041876d8f869057b195b95399414caa163d72f4f7" dependencies = [ - "cairo-sys-rs", + "cairo-sys-rs 0.21.5", "gdk4-sys", - "glib-sys", - "gobject-sys", + "glib-sys 0.21.5", + "gobject-sys 0.21.5", "graphene-sys", "libc", - "pango-sys", + "pango-sys 0.21.5", "system-deps", ] @@ -1138,19 +1244,19 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acb21d53cfc6f7bfaf43549731c43b67ca47d87348d81c8cfc4dcdd44828e1a4" dependencies = [ - "cairo-rs", + "cairo-rs 0.21.5", "field-offset", "futures-channel", "gdk-pixbuf", "gdk4", - "gio", - "glib", + "gio 0.21.5", + "glib 0.21.5", "graphene-rs", "gsk4", "gtk4-macros", "gtk4-sys", "libc", - "pango", + "pango 0.21.5", ] [[package]] @@ -1171,16 +1277,16 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "842577fe5a1ee15d166cd3afe804ce0cab6173bc789ca32e21308834f20088dd" dependencies = [ - "cairo-sys-rs", + "cairo-sys-rs 0.21.5", "gdk-pixbuf-sys", "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.21.5", + "glib-sys 0.21.5", + "gobject-sys 0.21.5", "graphene-sys", "gsk4-sys", "libc", - "pango-sys", + "pango-sys 0.21.5", "system-deps", ] @@ -1376,7 +1482,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9f6cb26e6e70d0f21807bd62f5304edd0094b0b476adb0410cb2bc765131736" dependencies = [ - "glib", + "glib 0.21.5", "javascriptcore6-sys", "libc", ] @@ -1387,8 +1493,8 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a67c47e63f3a29c6c78f9d9c5f372e3ca7628ccff77621e54412182e9f83433b" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.21.5", + "gobject-sys 0.21.5", "libc", "system-deps", ] @@ -1439,12 +1545,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb09e12bf8f73342b3315c839d0a7668cc0ccebd78490c49fec48bab15d5484b" dependencies = [ "gdk4", - "gio", - "glib", + "gio 0.21.5", + "glib 0.21.5", "gtk4", "libadwaita-sys", "libc", - "pango", + "pango 0.21.5", ] [[package]] @@ -1454,12 +1560,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d7f94227ba87eb596fecada2491f04e357d507324142f77bf76d9e6be4a3e31" dependencies = [ "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.21.5", + "glib-sys 0.21.5", + "gobject-sys 0.21.5", "gtk4-sys", "libc", - "pango-sys", + "pango-sys 0.21.5", "system-deps", ] @@ -1791,10 +1897,21 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52d1d85e2078077a065bb7fc072783d5bcd4e51b379f22d67107d0a16937eb69" dependencies = [ - "gio", - "glib", + "gio 0.21.5", + "glib 0.21.5", "libc", - "pango-sys", + "pango-sys 0.21.5", +] + +[[package]] +name = "pango" +version = "0.22.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d800d8d0de2ad5d0fb046f5344dbaba14a003cf3dd27cc21d85893d35ea316c" +dependencies = [ + "gio 0.22.8", + "glib 0.22.8", + "pango-sys 0.22.0", ] [[package]] @@ -1803,35 +1920,46 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4f06627d36ed5ff303d2df65211fc2e52ba5b17bf18dd80ff3d9628d6e06cfd" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.21.5", + "gobject-sys 0.21.5", "libc", "system-deps", ] [[package]] -name = "pangocairo" -version = "0.21.5" +name = "pango-sys" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b36c5c84304072939d860595d9bda2a797d3bd6f7215e20b8ccd0e72d84da8c8" +checksum = "bbd111a20ca90fedf03e09c59783c679c00900f1d8491cca5399f5e33609d5d6" dependencies = [ - "cairo-rs", - "glib", + "glib-sys 0.22.8", + "gobject-sys 0.22.6", "libc", - "pango", + "system-deps", +] + +[[package]] +name = "pangocairo" +version = "0.22.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "738a2ef690f51487814ff7172e0417c8e4fa2d7567571e5eb299d38b47b543ab" +dependencies = [ + "cairo-rs 0.22.0", + "glib 0.22.8", + "pango 0.22.8", "pangocairo-sys", ] [[package]] name = "pangocairo-sys" -version = "0.21.5" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eadbb01ad38be76e0d37e329d40ba0f3f9ef261d7b84b05201d7a0f14f819406" +checksum = "d95cb73468373b9e568abb1afbaf5b42fe6ab9128fc41b5f2adbf69451c3c77f" dependencies = [ - "cairo-sys-rs", - "glib-sys", + "cairo-sys-rs 0.22.0", + "glib-sys 0.22.8", "libc", - "pango-sys", + "pango-sys 0.22.0", "system-deps", ] @@ -2075,7 +2203,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2328,8 +2456,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d44d8fc55afd18491c0cce8a5c66e48f6d4b2db8a68c90a0e3c1b50665eaac74" dependencies = [ "futures-channel", - "gio", - "glib", + "gio 0.21.5", + "glib 0.21.5", "libc", "soup3-sys", ] @@ -2340,9 +2468,9 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e018383cf56cc1e2f5f9a5b7b6c46531767aa58be8788dc5b3a338380a920f7" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.21.5", + "glib-sys 0.21.5", + "gobject-sys 0.21.5", "libc", "system-deps", ] @@ -2413,10 +2541,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2785,8 +2913,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bad37100b83a482d3a6742bc61c92279dac04bcbbfe4594dff6c5336fc076f5c" dependencies = [ "gdk4", - "gio", - "glib", + "gio 0.21.5", + "glib 0.21.5", "gtk4", "javascriptcore6", "libc", @@ -2801,9 +2929,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ac8187279534b19b34396aaf5ddfee820590f6371680d140d422fa580028c94" dependencies = [ "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.21.5", + "glib-sys 0.21.5", + "gobject-sys 0.21.5", "gtk4-sys", "javascriptcore6-sys", "libc", diff --git a/crates/forktty-ui-gtk/Cargo.toml b/crates/forktty-ui-gtk/Cargo.toml index eb9012a2..b9059be2 100644 --- a/crates/forktty-ui-gtk/Cargo.toml +++ b/crates/forktty-ui-gtk/Cargo.toml @@ -31,7 +31,7 @@ global-hotkey = { version = "0.8", optional = true } gtk4 = { version = "0.10", optional = true } libc.workspace = true libloading = { version = "0.9", optional = true } -pangocairo = { version = "0.21", optional = true } +pangocairo = { version = "0.22", optional = true } serde = { workspace = true } serde_json.workspace = true sha2.workspace = true