From 67a233f777a22ef76ad4ab78ed174c1e0c21347f Mon Sep 17 00:00:00 2001 From: Sophie Herold Date: Wed, 21 Jan 2026 13:27:48 +0100 Subject: [PATCH] cargo: Update to gtk-rs 0.22/0.11 --- Cargo.lock | 399 ++++++++++++++++++++---------------- Cargo.toml | 23 ++- src/about.rs | 13 +- src/widgets/image.rs | 2 +- src/widgets/image/zoom.rs | 2 +- src/widgets/image_window.rs | 2 +- 6 files changed, 242 insertions(+), 199 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 23fd259..721c46d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,22 +31,19 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "ashpd" -version = "0.12.0" +version = "0.13.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0986d5b4f0802160191ad75f8d33ada000558757db3defb70299ca95d9fcbd" +checksum = "ffcab78216685a013098833afaaf7fffa509e7f3b5b1931473b2288198a14d47" dependencies = [ - "async-fs", - "async-net", "enumflags2", "futures-channel", "futures-util", "gdk4-wayland", "gdk4-x11", - "glib", + "getrandom", + "glib 0.22.0-alpha.2", "gtk4", - "rand", "serde", - "serde_repr", "url", "zbus", ] @@ -143,17 +140,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "async-net" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" -dependencies = [ - "async-io", - "blocking", - "futures-lite", -] - [[package]] name = "async-process" version = "2.5.0" @@ -275,23 +261,23 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cairo-rs" -version = "0.21.5" +version = "0.22.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01fe135c0bd16afe262b6dea349bd5ea30e6de50708cec639aae7c5c14cc7e4" +checksum = "97eb9a7228fb94c488d04daf9f9033ebbe78aae99cfe9d5730467a0e2c511107" dependencies = [ "bitflags", "cairo-sys-rs", - "glib", + "glib 0.22.0-alpha.2", "libc", ] [[package]] name = "cairo-sys-rs" -version = "0.21.5" +version = "0.22.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c28280c6b12055b5e39e4554271ae4e6630b27c0da9148c4cf6485fc6d245c" +checksum = "4d4f2e594dd4c2f3dbd6fb14ede3950372159ea70e2095e55d261c527321a895" dependencies = [ - "glib-sys", + "glib-sys 0.22.0-alpha.2", "libc", "system-deps", ] @@ -542,7 +528,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.9", ] [[package]] @@ -667,55 +653,55 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.21.5" +version = "0.22.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debb0d39e3cdd84626edfd54d6e4a6ba2da9a0ef2e796e691c4e9f8646fda00c" +checksum = "c94fac8df6758220932d05d0c6f1cfca6002f5fcd153802ac2d6b72814ac5bac" dependencies = [ "gdk-pixbuf-sys", - "gio", - "glib", + "gio 0.22.0-alpha.2", + "glib 0.22.0-alpha.2", "libc", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.21.5" +version = "0.22.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd95ad50b9a3d2551e25dd4f6892aff0b772fe5372d84514e9d0583af60a0ce7" +checksum = "84797b3facd2abca14ae04e1277b1f7a12d5ee9a845db97b3bba53fd2946430c" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.22.0-alpha.2", + "glib-sys 0.22.0-alpha.2", + "gobject-sys 0.22.0-alpha.2", "libc", "system-deps", ] [[package]] name = "gdk4" -version = "0.10.3" +version = "0.11.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756564212bbe4a4ce05d88ffbd2582581ac6003832d0d32822d0825cca84bfbf" +checksum = "75a1c95efac376ab7b939ece5dfb7f73f41a939768d1dcec3b7222afea3ee027" dependencies = [ "cairo-rs", "gdk-pixbuf", "gdk4-sys", - "gio", - "glib", + "gio 0.22.0-alpha.2", + "glib 0.22.0-alpha.2", "libc", "pango", ] [[package]] name = "gdk4-sys" -version = "0.10.3" +version = "0.11.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6d4e5b3ccf591826a4adcc83f5f57b4e59d1925cb4bf620b0d645f79498b034" +checksum = "7f099a10e3be95502bc386a2f23da261c1881fb04c31ee6621ad37a7e8183475" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.22.0-alpha.2", + "glib-sys 0.22.0-alpha.2", + "gobject-sys 0.22.0-alpha.2", "libc", "pango-sys", "pkg-config", @@ -724,50 +710,50 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.10.3" +version = "0.11.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb81f3e1e7d9dac156e91a9dc81be33d8c99338975254ed93ca9f1de5cb3168" +checksum = "9375350b4fa5db8e03ed747b56e493413b5feca24b8c1d9058139149f11fd8d7" dependencies = [ "gdk4", "gdk4-wayland-sys", - "gio", - "glib", + "gio 0.22.0-alpha.2", + "glib 0.22.0-alpha.2", "libc", ] [[package]] name = "gdk4-wayland-sys" -version = "0.10.3" +version = "0.11.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d739aa4ae9a1abb15f01ab2d8b8dd14a7792104ffb60bbc09bb94d76b905cfeb" +checksum = "b59f6754690699de98ba387ab28f17545b572f14ef9b4c161ed1a2b0014bc078" dependencies = [ - "glib-sys", + "glib-sys 0.22.0-alpha.2", "libc", "system-deps", ] [[package]] name = "gdk4-x11" -version = "0.10.3" +version = "0.11.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd10920274b392ff87d5b51932bebe24e428f9a2c0e1540b9d9be92a497f265a" +checksum = "d746a9f9d924717aee6af5b9b656b69eeff47328e98f160b9ff0593c1370b122" dependencies = [ "gdk4", "gdk4-x11-sys", - "gio", - "glib", + "gio 0.22.0-alpha.2", + "glib 0.22.0-alpha.2", "libc", "x11", ] [[package]] name = "gdk4-x11-sys" -version = "0.10.3" +version = "0.11.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8885d7dbeb194e6be61f0c62403200ad0c2f1da6930f816214eaf7124e0287bd" +checksum = "20293acd910a18d6e33daa432e8242fcbd84ff76cef0ad45fdfde3e10f69f432" dependencies = [ "gdk4-sys", - "glib-sys", + "glib-sys 0.22.0-alpha.2", "libc", "system-deps", ] @@ -814,8 +800,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.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "def03c123cccb05abbc0452d75a832391d1e0691c25df68007d3aeac0f750a60" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys 0.22.0-alpha.2", + "glib 0.22.0-alpha.2", "libc", "pin-project-lite", "smallvec", @@ -827,8 +830,21 @@ 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", +] + +[[package]] +name = "gio-sys" +version = "0.22.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b075d3738d07854522c1f15084c78ef2f9b7f6e2299f39b274a097832e11b316" +dependencies = [ + "glib-sys 0.22.0-alpha.2", + "gobject-sys 0.22.0-alpha.2", "libc", "system-deps", "windows-sys", @@ -846,10 +862,31 @@ 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.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d97df62440eff82e6c4dd9874b5ac268eecff9395ea34eeec12364ab948bee8" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys 0.22.0-alpha.2", + "glib-macros 0.22.0-alpha.2", + "glib-sys 0.22.0-alpha.2", + "gobject-sys 0.22.0-alpha.2", "libc", "memchr", "smallvec", @@ -868,6 +905,18 @@ dependencies = [ "syn", ] +[[package]] +name = "glib-macros" +version = "0.22.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c78d2243839dae953743862b32d89c1421b74640de0fbeb0f80c23a22eb71" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "glib-sys" version = "0.21.5" @@ -879,10 +928,20 @@ dependencies = [ ] [[package]] -name = "glycin" -version = "3.1.0-alpha" +name = "glib-sys" +version = "0.22.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb0cd42213f65c833ae9e080c0fb1c92ab07eafe7e36a36dd23aaef667643a6" +checksum = "4579f9083d705e2018e769be800688f159577f7afee6db1d13e2f570cc8c8efe" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glycin" +version = "3.1.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64b4a581938ec870eaa775e6dcf0787b2e9ecce3b03beb25b5fe8b51bc64d5ca" dependencies = [ "async-fs", "async-global-executor", @@ -895,8 +954,8 @@ dependencies = [ "futures-timer", "futures-util", "gdk4", - "gio", - "glib", + "gio 0.22.0-alpha.2", + "glib 0.22.0-alpha.2", "glycin-common", "glycin-utils", "gufo-common", @@ -917,9 +976,9 @@ dependencies = [ [[package]] name = "glycin-common" -version = "1.0.3" +version = "1.0.4-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b31c7fa5ccb9d91317c956e767daef59be9fee3ae9df30468470368678482" +checksum = "855ce831effea20f2c90c50cc2877101111ae6c31f300bf36784b15aed72a268" dependencies = [ "bitflags", "gufo-common", @@ -936,9 +995,9 @@ dependencies = [ [[package]] name = "glycin-utils" -version = "4.0.4" +version = "4.1.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfec0cd29d5ecfb1dd723868e22e2c49441020f35d5f14307018ff0a1679e2f" +checksum = "a69e0bcd22409f024b9d6fc05b57d3ba3ec90518bccb67e8274bf36b0d0cc041" dependencies = [ "async-lock", "bitflags", @@ -967,29 +1026,40 @@ 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.0-alpha.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4b1e4e515a0325dfaabc6368150bdb0b930c095c5ee7cd06044b0e7c07918dc" +dependencies = [ + "glib-sys 0.22.0-alpha.2", "libc", "system-deps", ] [[package]] name = "graphene-rs" -version = "0.21.5" +version = "0.22.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2730030ac9db663fd8bfe1e7093742c1cafb92db9c315c9417c29032341fe2f9" +checksum = "cae9d860d5cb6e63d2ef22e5d4bdd59b548c65fe1078cf100f5cdd8b59dfc465" dependencies = [ - "glib", + "glib 0.22.0-alpha.2", "graphene-sys", "libc", ] [[package]] name = "graphene-sys" -version = "0.21.5" +version = "0.22.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915e32091ea9ad241e4b044af62b7351c2d68aeb24f489a0d7f37a0fc484fd93" +checksum = "e9f2ab4b87897a61e2e0723bde3b855f0af1a04b8c4b6290b4cb189662099d58" dependencies = [ - "glib-sys", + "glib-sys 0.22.0-alpha.2", "libc", "pkg-config", "system-deps", @@ -997,13 +1067,13 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.10.3" +version = "0.11.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e755de9d8c5896c5beaa028b89e1969d067f1b9bf1511384ede971f5983aa153" +checksum = "b3484bbe8bac9ea5a0099e3e0519b93515131bccda9c9a03dc8cba1a58b07b5f" dependencies = [ "cairo-rs", "gdk4", - "glib", + "glib 0.22.0-alpha.2", "graphene-rs", "gsk4-sys", "libc", @@ -1012,14 +1082,14 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.10.3" +version = "0.11.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ce91472391146f482065f1041876d8f869057b195b95399414caa163d72f4f7" +checksum = "6a053c5653b5924abd8d8b0bf6cbd686846083adc139ca4ba7f31157e9649653" dependencies = [ "cairo-sys-rs", "gdk4-sys", - "glib-sys", - "gobject-sys", + "glib-sys 0.22.0-alpha.2", + "gobject-sys 0.22.0-alpha.2", "graphene-sys", "libc", "pango-sys", @@ -1028,17 +1098,17 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.10.3" +version = "0.11.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acb21d53cfc6f7bfaf43549731c43b67ca47d87348d81c8cfc4dcdd44828e1a4" +checksum = "aacf04baec4a4aea6a4769125e7dfb34867e44f9057371dabcdb80d5a792659a" dependencies = [ "cairo-rs", "field-offset", "futures-channel", "gdk-pixbuf", "gdk4", - "gio", - "glib", + "gio 0.22.0-alpha.2", + "glib 0.22.0-alpha.2", "graphene-rs", "gsk4", "gtk4-macros", @@ -1049,9 +1119,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.10.3" +version = "0.11.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ccfb5a14a3d941244815d5f8101fa12d4577b59cc47245778d8d907b0003e42" +checksum = "932934f5ddf50390d8782e56e76d9068171696b087f8b50728c02ca1c210c417" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1062,16 +1132,16 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.10.3" +version = "0.11.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842577fe5a1ee15d166cd3afe804ce0cab6173bc789ca32e21308834f20088dd" +checksum = "9ab9b52e9e34d2833f58dbfdc5027314dc50f3af1ac2ed9f90145b349905a259" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.22.0-alpha.2", + "glib-sys 0.22.0-alpha.2", + "gobject-sys 0.22.0-alpha.2", "graphene-sys", "gsk4-sys", "libc", @@ -1081,9 +1151,9 @@ dependencies = [ [[package]] name = "gufo" -version = "0.3.0" +version = "0.4.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbd1a9cdb84d3166fa067fa352651f9212567af36701230e7dd7044919e1ce78" +checksum = "ade0696d48fa3000f01aa0e98b440afa0354c0e06245140f654fa02dc83596a5" dependencies = [ "chrono", "gufo-common", @@ -1099,9 +1169,9 @@ dependencies = [ [[package]] name = "gufo-common" -version = "1.0.1" +version = "1.1.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98bebe9ba4be92d3932246ecfbe261106e3013266604f8cbf0ca9ee9df7edf99" +checksum = "4847cdf6a7b3ad3e4a21e050241c473ea3693558fbcedc8895343305da4b2c6d" dependencies = [ "chrono", "paste", @@ -1112,9 +1182,9 @@ dependencies = [ [[package]] name = "gufo-exif" -version = "0.3.1" +version = "0.4.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e611ff8dfb0816bdadf498bb05f43868fff9ea5d71b7a0f2dc7c782b62a7bc1f" +checksum = "a113e6d0bc82a44f0e0b4418ddc06f380d6d83eadb76bac576718a184c3c5b92" dependencies = [ "chrono", "gufo-common", @@ -1124,9 +1194,9 @@ dependencies = [ [[package]] name = "gufo-jpeg" -version = "0.3.0" +version = "0.4.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ddb8a93bbd671390189f8dee0209731200bdfe403606c6abf6a2aaec5a935f5" +checksum = "0e1620f6ed5ebde5926e048ec443b0d1ccc1d954d15e82a8916cfcbea0870655" dependencies = [ "gufo-common", "indexmap", @@ -1136,23 +1206,23 @@ dependencies = [ [[package]] name = "gufo-png" -version = "0.3.0" +version = "0.4.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6efe26f06316c479656b897b7374fa97a44a89de91dcf427178901937d8afaba" +checksum = "dba967c68312a33730687e9eb1bdc0af8a47ac80c86356d701bffebb9e474e48" dependencies = [ "crc32fast", "encoding_rs", "gufo-common", "hex", - "miniz_oxide", + "miniz_oxide 0.9.0", "thiserror", ] [[package]] name = "gufo-tiff" -version = "0.3.0" +version = "0.4.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb22afeeb3c8733cc65bce0116489da9fc8649f3c7b4bcc61b5ee31416cf9af" +checksum = "8b2999088226ae3753b96ec4f39aa5fc19d630845e59b7de9b1fcfdf1bb2b120" dependencies = [ "gufo-common", "thiserror", @@ -1160,9 +1230,9 @@ dependencies = [ [[package]] name = "gufo-webp" -version = "0.3.0" +version = "0.4.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b5ff49ef9a4b4163cf846534e13b2e8b867d404e7c540facda6e3e7f210224" +checksum = "787b26a70aed0fcb714f1cd9b82e9f50cbfb44d5f1258963a69e2786a51e8de1" dependencies = [ "gufo-common", "thiserror", @@ -1170,9 +1240,9 @@ dependencies = [ [[package]] name = "gufo-xmp" -version = "0.3.0" +version = "0.4.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86844cef8838b44b8750f95d3de02d5a17999ca61afc00026b058b3d18dec4c4" +checksum = "b124aaf67973d53ecc4078adae281300c90d26a4519db46ce747f234e3fac64b" dependencies = [ "chrono", "gufo-common", @@ -1213,9 +1283,9 @@ version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cffbe67680461903bbc83915f28d957975998f7a2943db01752e08679fcd081" 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", ] @@ -1448,13 +1518,13 @@ dependencies = [ [[package]] name = "libadwaita" -version = "0.8.1" +version = "0.9.0-alpha.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb09e12bf8f73342b3315c839d0a7668cc0ccebd78490c49fec48bab15d5484b" +checksum = "7c6135f2866461657af98ce055b9e0b6be155be236a80325254887f3a12f164f" dependencies = [ "gdk4", - "gio", - "glib", + "gio 0.22.0-alpha.2", + "glib 0.22.0-alpha.2", "gtk4", "libadwaita-sys", "libc", @@ -1463,14 +1533,14 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.8.1" +version = "0.9.0-alpha.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7f94227ba87eb596fecada2491f04e357d507324142f77bf76d9e6be4a3e31" +checksum = "0569721fe24657ab919827563441541763e2d98adc577575007039bbbaf7b498" dependencies = [ "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.22.0-alpha.2", + "glib-sys 0.22.0-alpha.2", + "gobject-sys 0.22.0-alpha.2", "gtk4-sys", "libc", "pango-sys", @@ -1489,8 +1559,8 @@ version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "666424a45de09ec2ed8c2964704fe4f56555299a6ed930db9df5a5d847fec99e" dependencies = [ - "gio", - "glib", + "gio 0.21.5", + "glib 0.21.5", "gweather-sys", "libc", ] @@ -1576,7 +1646,7 @@ dependencies = [ "chrono", "gettext-rs", "gettext-sys", - "gio", + "gio 0.22.0-alpha.2", "glycin", "gtk4", "gufo", @@ -1655,6 +1725,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5faa9f23e86bd5768d76def086192ff5f869fb088da12a976ea21e9796b975f6" +dependencies = [ + "adler2", +] + [[package]] name = "nix" version = "0.30.1" @@ -1733,24 +1812,24 @@ dependencies = [ [[package]] name = "pango" -version = "0.21.5" +version = "0.22.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d1d85e2078077a065bb7fc072783d5bcd4e51b379f22d67107d0a16937eb69" +checksum = "e44d781f0508dc95a07960e9603dc34f12ed0fec679ecdc576000c976dedbf1f" dependencies = [ - "gio", - "glib", + "gio 0.22.0-alpha.2", + "glib 0.22.0-alpha.2", "libc", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.21.5" +version = "0.22.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f06627d36ed5ff303d2df65211fc2e52ba5b17bf18dd80ff3d9628d6e06cfd" +checksum = "bac9e53f0dd0bfdf25b3c3f4afa5f547771b197f5169424586cc37293118755f" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.22.0-alpha.2", + "gobject-sys 0.22.0-alpha.2", "libc", "system-deps", ] @@ -1840,15 +1919,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - [[package]] name = "proc-macro-crate" version = "3.4.0" @@ -1892,35 +1962,6 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -[[package]] -name = "rand" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" -dependencies = [ - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" -dependencies = [ - "getrandom", -] - [[package]] name = "rayon" version = "1.11.0" @@ -2181,9 +2222,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.111" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 89ff68f..102f8ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "loupe" version = "50.0.0-alpha" edition = "2024" -rust-version = "1.89" +rust-version = "1.92" license = "GPL-3.0-or-later" [profile.release] @@ -13,29 +13,30 @@ codegen-units = 1 x11 = ["ashpd/gtk4_x11"] [dependencies] -adw = { package = "libadwaita", version = "0.8.0", features = ["v1_8"] } +adw = { package = "libadwaita", version = "0.9.0-alpha", features = ["v1_8"] } anyhow = { version = "1.0.66" } arc-swap = "1.6.0" -ashpd = { version = "0.12.0", default-features = false, features = [ +ashpd = { version = "0.13.0-alpha", default-features = false, features = [ "gtk4_wayland", - "async-std", + "async-io", + "wallpaper", ] } async-channel = "2.1.0" async-lock = "3.4.0" -cairo-rs = { version = "0.21.0", features = ["pdf"] } +cairo-rs = { version = "0.22.0-alpha.1", features = ["pdf"] } chrono = { version = "0.4.38", default-features = false, features = ["std"] } gettext-rs = { version = "0.7.0", features = ["gettext-system"] } gettext-sys = { version = "0.26.0", features = ["gettext-system"] } -gio = { version = "0.21.0", features = ["v2_74"] } -glycin = { version = "3.1.0-alpha", features = ["gdk4", "unstable-config"] } -gtk = { package = "gtk4", version = "0.10.0", features = [ +gio = { version = "0.22.0-alpha.1", features = ["v2_74"] } +glycin = { version = "3.1.0-alpha.3", features = ["gdk4", "unstable-config"] } +gtk = { package = "gtk4", version = "0.11.0-alpha.1", features = [ "v4_14", "xml_validation", ] } -gufo = { version = "0.3.0", features = ["chrono", "all-image-formats"] } +gufo = { version = "0.4.0-alpha", features = ["chrono", "all-image-formats"] } # Force newer version with bugfix -gufo-exif = "0.3.1" -gufo-common = { version = "1.0.0", features = ["serde"] } +gufo-exif = "0.4.0-alpha" +gufo-common = { version = "1.1.0-alpha", features = ["serde"] } gvdb-macros = "0.1.6" indexmap = "2.0.0" libc = "0.2.158" diff --git a/src/about.rs b/src/about.rs index 69aa466..d8646d5 100644 --- a/src/about.rs +++ b/src/about.rs @@ -4,6 +4,7 @@ // Copyright (c) 2024 Andre Klapper // Copyright (c) 2024 Dexter Reed // Copyright (c) 2025 sid +// Copyright (c) 2026 Not Committed Yet // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -49,16 +50,16 @@ pub async fn dialog() -> adw::AboutDialog { .build() } -async fn etc() -> std::path::PathBuf { - if ashpd::is_sandboxed().await { +fn etc() -> std::path::PathBuf { + if ashpd::is_sandboxed() { std::path::PathBuf::from("/run/host/etc") } else { std::path::PathBuf::from("/etc") } } -async fn os_release() -> String { - let os_release = etc().await.join("os-release"); +fn os_release() -> String { + let os_release = etc().join("os-release"); std::fs::read_to_string(os_release).unwrap_or_default() } @@ -68,10 +69,10 @@ async fn debug_info() -> String { format!("- App ID: {}", config::APP_ID), format!( "- Sandboxed: {} {}", - ashpd::is_sandboxed().await, + ashpd::is_sandboxed(), std::env::var("container").unwrap_or_default() ), - format!("\n##### OS Information\n```\n{}\n```", os_release().await), + format!("\n##### OS Information\n```\n{}\n```", os_release()), ] .join("\n") } diff --git a/src/widgets/image.rs b/src/widgets/image.rs index 75df8dc..a2adac5 100644 --- a/src/widgets/image.rs +++ b/src/widgets/image.rs @@ -1,5 +1,5 @@ // Copyright (c) 2021 Christopher Davis -// Copyright (c) 2022-2025 Sophie Herold +// Copyright (c) 2022-2026 Sophie Herold // Copyright (c) 2023 Lubosz Sarnecki // Copyright (c) 2024 kramo // Copyright (c) 2024 Maximiliano Sandoval diff --git a/src/widgets/image/zoom.rs b/src/widgets/image/zoom.rs index 7f3587d..5094535 100644 --- a/src/widgets/image/zoom.rs +++ b/src/widgets/image/zoom.rs @@ -1,4 +1,4 @@ -// Copyright (c) 2023-2025 Sophie Herold +// Copyright (c) 2023-2026 Sophie Herold // Copyright (c) 2025 pieterd // // This program is free software: you can redistribute it and/or modify diff --git a/src/widgets/image_window.rs b/src/widgets/image_window.rs index b62986c..6d4052d 100644 --- a/src/widgets/image_window.rs +++ b/src/widgets/image_window.rs @@ -1,5 +1,5 @@ // Copyright (c) 2020-2024 Christopher Davis -// Copyright (c) 2022-2025 Sophie Herold +// Copyright (c) 2022-2026 Sophie Herold // Copyright (c) 2022 Maximiliano Sandoval R // Copyright (c) 2023 Matteo Nardi // Copyright (c) 2023 FineFindus