diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f073d72e..372304c3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,12 +47,7 @@ jobs: sudo apt-get update sudo apt-get install -y libgtk-3-dev libgtk-4-dev libxdo-dev libwebkit2gtk-4.1-dev - - uses: dtolnay/rust-toolchain@stable - - - uses: dtolnay/rust-toolchain@1.90 - if: matrix.platform != 'ubuntu-latest' - uses: dtolnay/rust-toolchain@1.92 - if: matrix.platform == 'ubuntu-latest' - run: cargo build ${{ matrix.cargo-args }} diff --git a/Cargo.lock b/Cargo.lock index b22692ac..fd054454 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,27 +80,39 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" +[[package]] +name = "async-channel" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "atk" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b" +checksum = "780a62f5d3373a8461bdc9258527bd03fe9299779446681199005712b24cc1d7" dependencies = [ "atk-sys", - "glib 0.18.5", + "glib", "libc", ] [[package]] name = "atk-sys" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086" +checksum = "56fd0f13d1dedae306538653b8e42034a2260d1ac3ee920e7a5c31475d7184a5" dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "glib-sys", + "gobject-sys", "libc", - "system-deps 6.2.2", + "system-deps 9.0.0", ] [[package]] @@ -212,20 +224,6 @@ version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" -[[package]] -name = "cairo-rs" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" -dependencies = [ - "bitflags 2.13.1", - "cairo-sys-rs 0.18.2", - "glib 0.18.5", - "libc", - "once_cell", - "thiserror 1.0.69", -] - [[package]] name = "cairo-rs" version = "0.22.0" @@ -233,20 +231,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cc8d9aa793480744cd9a0524fef1a2e197d9eaa0f739cde19d16aba530dcb95" dependencies = [ "bitflags 2.13.1", - "cairo-sys-rs 0.22.0", - "glib 0.22.8", - "libc", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" -dependencies = [ - "glib-sys 0.18.1", + "cairo-sys-rs", + "glib", "libc", - "system-deps 6.2.2", ] [[package]] @@ -255,7 +242,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8b4985713047f5faee02b8db6a6ef32bbb50269ff53c1aee716d1d195b76d54" dependencies = [ - "glib-sys 0.22.8", + "glib-sys", "libc", "system-deps 7.0.8", ] @@ -317,16 +304,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon 0.12.16", -] - [[package]] name = "cfg-expr" version = "0.20.8" @@ -334,7 +311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb693542bcafa528e198be0ebd9d3632ca5b7c93dbe7237460e199910835997c" dependencies = [ "smallvec", - "target-lexicon 0.13.5", + "target-lexicon", ] [[package]] @@ -726,6 +703,26 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "event-listener" +version = "5.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a23add41df1562121a9393cb065eab5146a1242410f23a644851e90cfd669d2" +dependencies = [ + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "fastrand" version = "2.5.0" @@ -873,30 +870,17 @@ dependencies = [ [[package]] name = "gdk" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691" +checksum = "50b79a7fa8b0e9fe6c77118e48cc00a23eb41052c190434d9cda7746418efca6" dependencies = [ - "cairo-rs 0.18.5", - "gdk-pixbuf 0.18.5", + "cairo-rs", + "gdk-pixbuf", "gdk-sys", - "gio 0.18.4", - "glib 0.18.5", + "gio", + "glib", "libc", - "pango 0.18.3", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" -dependencies = [ - "gdk-pixbuf-sys 0.18.0", - "gio 0.18.4", - "glib 0.18.5", - "libc", - "once_cell", + "pango", ] [[package]] @@ -905,23 +889,10 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25f420376dbee041b2db374ce4573892a36222bb3f6c0c43e24f0d67eae9b646" dependencies = [ - "gdk-pixbuf-sys 0.22.0", - "gio 0.22.8", - "glib 0.22.8", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" -dependencies = [ - "gio-sys 0.18.1", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "gdk-pixbuf-sys", + "gio", + "glib", "libc", - "system-deps 6.2.2", ] [[package]] @@ -930,28 +901,28 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48f31b37b1fc4b48b54f6b91b7ef04c18e00b4585d98359dd7b998774bbd91fb" dependencies = [ - "gio-sys 0.22.8", - "glib-sys 0.22.8", - "gobject-sys 0.22.6", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", "system-deps 7.0.8", ] [[package]] name = "gdk-sys" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7" +checksum = "463ac2e2f204918dcaeb3c34810bd7fe94448d2b8d4fa13a5ab45a4fc3e88e50" dependencies = [ - "cairo-sys-rs 0.18.2", - "gdk-pixbuf-sys 0.18.0", - "gio-sys 0.18.1", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", - "pango-sys 0.18.0", + "pango-sys", "pkg-config", - "system-deps 6.2.2", + "system-deps 9.0.0", ] [[package]] @@ -960,13 +931,13 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d81e2a6c6ecba2aab60633a98df1868b03fa0bfdce8105edc27c1bccf71f0e39" dependencies = [ - "cairo-rs 0.22.0", - "gdk-pixbuf 0.22.0", + "cairo-rs", + "gdk-pixbuf", "gdk4-sys", - "gio 0.22.8", - "glib 0.22.8", + "gio", + "glib", "libc", - "pango 0.22.8", + "pango", ] [[package]] @@ -975,13 +946,13 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d8f608d8d7d229975c4d0d026f5d3071598c4ddab3c5262b0a31840fec78d13" dependencies = [ - "cairo-sys-rs 0.22.0", - "gdk-pixbuf-sys 0.22.0", - "gio-sys 0.22.8", - "glib-sys 0.22.8", - "gobject-sys 0.22.6", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", - "pango-sys 0.22.0", + "pango-sys", "pkg-config", "system-deps 7.0.8", ] @@ -994,8 +965,8 @@ checksum = "32d95828dadc0357dee236cc6a5712808bd894d3217159982592ce24f2b8aaf7" dependencies = [ "gdk4", "gdk4-wayland-sys", - "gio 0.22.8", - "glib 0.22.8", + "gio", + "glib", "libc", "wayland-backend", "wayland-client", @@ -1008,7 +979,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "653cafb8715f2ac1c56edaf8060d9360ae3acbe3c6fb61b676a2917d42b668cf" dependencies = [ - "glib-sys 0.22.8", + "glib-sys", "libc", "system-deps 7.0.8", ] @@ -1021,8 +992,8 @@ checksum = "9d892b4cf5a07e90e1390e93cd792975746c68b59f790a2de9e96ce77211ea9a" dependencies = [ "gdk4", "gdk4-x11-sys", - "gio 0.22.8", - "glib 0.22.8", + "gio", + "glib", "libc", "x11-dl", ] @@ -1034,49 +1005,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d41f2e28f62378b081288914325d73bddbb6ccbbadb41aa6392afc71d27002" dependencies = [ "gdk4-sys", - "glib-sys 0.22.8", + "glib-sys", "libc", "system-deps 7.0.8", ] [[package]] name = "gdkwayland-sys" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69" +checksum = "82559ece0c0952519a3513ecd90638e5db59e00c851f1d3ea05ac7ff2a46942e" dependencies = [ "gdk-sys", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "glib-sys", + "gobject-sys", "libc", "pkg-config", - "system-deps 6.2.2", + "system-deps 9.0.0", ] [[package]] name = "gdkx11" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3caa00e14351bebbc8183b3c36690327eb77c49abc2268dd4bd36b856db3fbfe" +checksum = "bad7a698a74652ddba8dc348f9933f6f209fbcf3ab318f2c1fd72c6b2fa99505" dependencies = [ "gdk", "gdkx11-sys", - "gio 0.18.4", - "glib 0.18.5", + "gio", + "glib", "libc", "x11", ] [[package]] name = "gdkx11-sys" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d" +checksum = "a103facf2056ce28125a49501f98beb01d1e3c9477257a8e05cfc5d3d677709e" dependencies = [ + "cairo-sys-rs", "gdk-sys", - "glib-sys 0.18.1", + "glib-sys", "libc", - "system-deps 6.2.2", + "system-deps 9.0.0", "x11", ] @@ -1134,25 +1106,6 @@ dependencies = [ "r-efi 6.0.0", ] -[[package]] -name = "gio" -version = "0.18.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys 0.18.1", - "glib 0.18.5", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror 1.0.69", -] - [[package]] name = "gio" version = "0.22.8" @@ -1163,62 +1116,26 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "gio-sys 0.22.8", - "glib 0.22.8", + "gio-sys", + "glib", "libc", "pin-project-lite", "smallvec", ] -[[package]] -name = "gio-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" -dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "system-deps 6.2.2", - "winapi", -] - [[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", + "glib-sys", + "gobject-sys", "libc", "system-deps 7.0.8", "windows-sys 0.61.2", ] -[[package]] -name = "glib" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" -dependencies = [ - "bitflags 2.13.1", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys 0.18.1", - "glib-macros 0.18.5", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "memchr", - "once_cell", - "smallvec", - "thiserror 1.0.69", -] - [[package]] name = "glib" version = "0.22.8" @@ -1231,51 +1148,27 @@ dependencies = [ "futures-executor", "futures-task", "futures-util", - "gio-sys 0.22.8", - "glib-macros 0.22.6", - "glib-sys 0.22.8", - "gobject-sys 0.22.6", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", "libc", "memchr", "smallvec", ] -[[package]] -name = "glib-macros" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" -dependencies = [ - "heck 0.4.1", - "proc-macro-crate 2.0.2", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "glib-macros" version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "506d23499707c7142898429757e8d9a3871d965239a2cb66dfa05052be6d6f19" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 2.0.119", ] -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps 6.2.2", -] - [[package]] name = "glib-sys" version = "0.22.8" @@ -1286,24 +1179,13 @@ dependencies = [ "system-deps 7.0.8", ] -[[package]] -name = "gobject-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" -dependencies = [ - "glib-sys 0.18.1", - "libc", - "system-deps 6.2.2", -] - [[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", + "glib-sys", "libc", "system-deps 7.0.8", ] @@ -1314,7 +1196,7 @@ version = "0.22.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb856b9c558971c3f13ab692358926da710b046932a4e087aedcc35b040d7dff" dependencies = [ - "glib 0.22.8", + "glib", "graphene-sys", ] @@ -1324,7 +1206,7 @@ version = "0.22.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c7ffdfde88f3570d3705e0d8a2433e036d387a1f2930bbf47eafcb5f569fd04" dependencies = [ - "glib-sys 0.22.8", + "glib-sys", "libc", "system-deps 7.0.8", ] @@ -1335,13 +1217,13 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b867be1c5f14dcb8f552c0eff6e9a9b1da5f8b43943e8efc3a63c889d84952ff" dependencies = [ - "cairo-rs 0.22.0", + "cairo-rs", "gdk4", - "glib 0.22.8", + "glib", "graphene-rs", "gsk4-sys", "libc", - "pango 0.22.8", + "pango", ] [[package]] @@ -1350,66 +1232,65 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b7c7eb2e681ee896646cfb8872b431f24d09f53ba9283289d9b10caa6707088" dependencies = [ - "cairo-sys-rs 0.22.0", + "cairo-sys-rs", "gdk4-sys", - "glib-sys 0.22.8", - "gobject-sys 0.22.6", + "glib-sys", + "gobject-sys", "graphene-sys", "libc", - "pango-sys 0.22.0", + "pango-sys", "system-deps 7.0.8", ] [[package]] name = "gtk" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a" +checksum = "a86cafafc177054a1d555a0b302044d2b5f82e1c1e23d152a7ba252dc6bfced0" dependencies = [ "atk", - "cairo-rs 0.18.5", + "cairo-rs", "field-offset", "futures-channel", "gdk", - "gdk-pixbuf 0.18.5", - "gio 0.18.4", - "glib 0.18.5", + "gdk-pixbuf", + "gio", + "glib", "gtk-sys", "gtk3-macros", "libc", - "pango 0.18.3", + "pango", "pkg-config", ] [[package]] name = "gtk-sys" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414" +checksum = "a0e6f055c4a2ce6598b32373595b0c9985f1c7cc448afe4f09fee33fb738b488" dependencies = [ "atk-sys", - "cairo-sys-rs 0.18.2", - "gdk-pixbuf-sys 0.18.0", + "cairo-sys-rs", + "gdk-pixbuf-sys", "gdk-sys", - "gio-sys 0.18.1", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", - "pango-sys 0.18.0", - "system-deps 6.2.2", + "pango-sys", + "system-deps 9.0.0", ] [[package]] name = "gtk3-macros" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d" +checksum = "5fcce21fcb0c4c4fc48bab8d4eee5aacdb361f85d234756430e6e793bd3d95cf" dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] @@ -1418,19 +1299,19 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98a0a0466484f64b07b5b8184d43fa46be78eb0b8e04ae4e179af31d770b76d9" dependencies = [ - "cairo-rs 0.22.0", + "cairo-rs", "field-offset", "futures-channel", - "gdk-pixbuf 0.22.0", + "gdk-pixbuf", "gdk4", - "gio 0.22.8", - "glib 0.22.8", + "gio", + "glib", "graphene-rs", "gsk4", "gtk4-macros", "gtk4-sys", "libc", - "pango 0.22.8", + "pango", ] [[package]] @@ -1439,7 +1320,7 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ac7179400a36a04de039c24206bb841c5596992b907b43b23ee8d5bdc40d00e" dependencies = [ - "proc-macro-crate 3.5.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.119", @@ -1451,16 +1332,16 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82b8f954786af0b1984425c4446b77f5ff6594346181316be3f850caab1c6f01" dependencies = [ - "cairo-sys-rs 0.22.0", - "gdk-pixbuf-sys 0.22.0", + "cairo-sys-rs", + "gdk-pixbuf-sys", "gdk4-sys", - "gio-sys 0.22.8", - "glib-sys 0.22.8", - "gobject-sys 0.22.6", + "gio-sys", + "glib-sys", + "gobject-sys", "graphene-sys", "gsk4-sys", "libc", - "pango-sys 0.22.0", + "pango-sys", "system-deps 7.0.8", ] @@ -1470,12 +1351,6 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -1643,24 +1518,22 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "javascriptcore-rs" version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc" +source = "git+https://github.com/tauri-apps/javascriptcore-rs.git#1e15afba6ed9ad56d3b499e58c36a5e222d84c5e" dependencies = [ - "bitflags 1.3.2", - "glib 0.18.5", + "bitflags 2.13.1", + "glib", "javascriptcore-rs-sys", ] [[package]] name = "javascriptcore-rs-sys" version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124" +source = "git+https://github.com/tauri-apps/javascriptcore-rs.git#1e15afba6ed9ad56d3b499e58c36a5e222d84c5e" dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "glib-sys", + "gobject-sys", "libc", - "system-deps 6.2.2", + "system-deps 9.0.0", ] [[package]] @@ -2005,7 +1878,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "proc-macro-crate 3.5.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.119", @@ -2446,40 +2319,15 @@ dependencies = [ "ttf-parser", ] -[[package]] -name = "pango" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" -dependencies = [ - "gio 0.18.4", - "glib 0.18.5", - "libc", - "once_cell", - "pango-sys 0.18.0", -] - [[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]] -name = "pango-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" -dependencies = [ - "glib-sys 0.18.1", - "gobject-sys 0.18.0", - "libc", - "system-deps 6.2.2", + "gio", + "glib", + "pango-sys", ] [[package]] @@ -2488,12 +2336,18 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd111a20ca90fedf03e09c59783c679c00900f1d8491cca5399f5e33609d5d6" dependencies = [ - "glib-sys 0.22.8", - "gobject-sys 0.22.6", + "glib-sys", + "gobject-sys", "libc", "system-deps 7.0.8", ] +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + [[package]] name = "parking_lot" version = "0.12.5" @@ -2604,9 +2458,9 @@ checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pkg-config" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "plain" @@ -2662,57 +2516,13 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" -dependencies = [ - "toml_datetime 0.6.3", - "toml_edit 0.20.2", -] - [[package]] name = "proc-macro-crate" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.25.13+spec-1.1.0", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "toml_edit", ] [[package]] @@ -2950,15 +2760,6 @@ dependencies = [ "syn 3.0.3", ] -[[package]] -name = "serde_spanned" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" -dependencies = [ - "serde", -] - [[package]] name = "serde_spanned" version = "1.1.1" @@ -3080,28 +2881,28 @@ dependencies = [ [[package]] name = "soup3" -version = "0.5.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" +checksum = "92d38b59ff6d302538efd337e15d04d61c5b909ec223c60ae4061d74605a962a" dependencies = [ "futures-channel", - "gio 0.18.4", - "glib 0.18.5", + "gio", + "glib", "libc", "soup3-sys", ] [[package]] name = "soup3-sys" -version = "0.5.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" +checksum = "79d5d25225bb06f83b78ff8cc35973b56d45fcdd21af6ed6d2bbd67f5a6f9bea" dependencies = [ - "gio-sys 0.18.1", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", - "system-deps 6.2.2", + "system-deps 7.0.8", ] [[package]] @@ -3140,16 +2941,6 @@ dependencies = [ "quote", ] -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.119" @@ -3185,36 +2976,36 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.2" +version = "7.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7" dependencies = [ - "cfg-expr 0.15.8", - "heck 0.5.0", + "cfg-expr", + "heck", "pkg-config", - "toml 0.8.2", + "toml", "version-compare", ] [[package]] name = "system-deps" -version = "7.0.8" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7" +checksum = "8a0dae2cbca1f0ff93795713cfe0a4c02f760e3c0b8ae2ab4ec4045808ff429f" dependencies = [ - "cfg-expr 0.20.8", - "heck 0.5.0", + "cfg-expr", + "heck", "pkg-config", - "toml 1.1.3+spec-1.1.0", + "toml", "version-compare", ] [[package]] name = "tao" version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d12c8607b01516c5d4a37e471a9cfb40b4a25cebce8fecbc6a559e125e51b6b" +source = "git+https://github.com/tauri-apps/tao.git?branch=gtk-0.19#08660027c723e09a45b10badf60a73a661c94a95" dependencies = [ + "async-channel", "bitflags 2.13.1", "block2 0.6.2", "core-foundation 0.10.1", @@ -3241,7 +3032,7 @@ dependencies = [ "parking_lot", "percent-encoding", "raw-window-handle", - "tao-macros", + "tao-macros 0.1.4 (git+https://github.com/tauri-apps/tao.git?branch=gtk-0.19)", "unicode-segmentation", "url", "windows", @@ -3262,10 +3053,14 @@ dependencies = [ ] [[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +name = "tao-macros" +version = "0.1.4" +source = "git+https://github.com/tauri-apps/tao.git?branch=gtk-0.19#08660027c723e09a45b10badf60a73a661c94a95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] [[package]] name = "target-lexicon" @@ -3387,18 +3182,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "toml" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" -dependencies = [ - "serde", - "serde_spanned 0.6.9", - "toml_datetime 0.6.3", - "toml_edit 0.20.2", -] - [[package]] name = "toml" version = "1.1.3+spec-1.1.0" @@ -3407,20 +3190,11 @@ checksum = "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d4c3c" dependencies = [ "indexmap", "serde_core", - "serde_spanned 1.1.1", - "toml_datetime 1.1.1+spec-1.1.0", + "serde_spanned", + "toml_datetime", "toml_parser", "toml_writer", - "winnow 1.0.4", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", + "winnow", ] [[package]] @@ -3432,30 +3206,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime 0.6.3", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" -dependencies = [ - "indexmap", - "serde", - "serde_spanned 0.6.9", - "toml_datetime 0.6.3", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.25.13+spec-1.1.0" @@ -3463,9 +3213,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b" dependencies = [ "indexmap", - "toml_datetime 1.1.1+spec-1.1.0", + "toml_datetime", "toml_parser", - "winnow 1.0.4", + "winnow", ] [[package]] @@ -3474,7 +3224,7 @@ version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56" dependencies = [ - "winnow 1.0.4", + "winnow", ] [[package]] @@ -3778,18 +3528,17 @@ dependencies = [ [[package]] name = "webkit2gtk" version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1027150013530fb2eaf806408df88461ae4815a45c541c8975e61d6f2fc4793" +source = "git+https://github.com/tauri-apps/webkit2gtk-rs.git?branch=bump-gir#145fea6d054258ef0b7b5373edb4b80253f557f7" dependencies = [ - "bitflags 1.3.2", - "cairo-rs 0.18.5", + "bitflags 2.13.1", + "cairo-rs", "gdk", "gdk-sys", - "gio 0.18.4", - "gio-sys 0.18.1", - "glib 0.18.5", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", "gtk", "gtk-sys", "javascriptcore-rs", @@ -3802,21 +3551,20 @@ dependencies = [ [[package]] name = "webkit2gtk-sys" version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916a5f65c2ef0dfe12fff695960a2ec3d4565359fdbb2e9943c974e06c734ea5" +source = "git+https://github.com/tauri-apps/webkit2gtk-rs.git?branch=bump-gir#145fea6d054258ef0b7b5373edb4b80253f557f7" dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs 0.18.2", + "bitflags 2.13.1", + "cairo-sys-rs", "gdk-sys", - "gio-sys 0.18.1", - "glib-sys 0.18.1", - "gobject-sys 0.18.0", + "gio-sys", + "glib-sys", + "gobject-sys", "gtk-sys", "javascriptcore-rs-sys", "libc", "pkg-config", "soup3-sys", - "system-deps 6.2.2", + "system-deps 9.0.0", ] [[package]] @@ -4418,15 +4166,6 @@ dependencies = [ "xkbcommon-dl", ] -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "1.0.4" @@ -4451,8 +4190,7 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" [[package]] name = "wry" version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a819957a01b3119af85e638a38d242af76dbc87d130dca67bfd0441072e21ff0" +source = "git+https://github.com/tauri-apps/wry.git?branch=gtk-0.19#6888d196259e9ec43c7311b9a6208d3969647769" dependencies = [ "base64", "block2 0.6.2", @@ -4480,7 +4218,7 @@ dependencies = [ "raw-window-handle", "sha2", "soup3", - "tao-macros", + "tao-macros 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 2.0.19", "url", "webkit2gtk", diff --git a/Cargo.toml b/Cargo.toml index c8aa7bc7..3ab4308c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ readme = "README.md" repository = "https://github.com/tauri-apps/muda" documentation = "https://docs.rs/muda" categories = ["gui"] -rust-version = "1.90" +rust-version = "1.92" include = [ "README.md", "build.rs", @@ -54,7 +54,7 @@ features = [ ] [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies] -gtk = { version = "0.18", optional = true } +gtk = { version = "0.19", optional = true } gtk4 = { version = "0.11", optional = true, features = ["v4_12"] } libxdo = { version = "0.6.0", optional = true } @@ -106,3 +106,11 @@ winit-gtk4 = { package = "winit", git = "https://github.com/tauri-apps/winit-gtk [[example]] name = "winit_gtk4" required-features = ["gtk4"] + +[patch.crates-io] +tao = { git = "https://github.com/tauri-apps/tao.git", branch = "gtk-0.19" } +wry = { git = "https://github.com/tauri-apps/wry.git", branch = "gtk-0.19" } +javascriptcore-rs = { git = "https://github.com/tauri-apps/javascriptcore-rs.git" } +javascriptcore-rs-sys = { git = "https://github.com/tauri-apps/javascriptcore-rs.git" } +webkit2gtk = { git = "https://github.com/tauri-apps/webkit2gtk-rs.git", branch = "bump-gir" } +webkit2gtk-sys = { git = "https://github.com/tauri-apps/webkit2gtk-rs.git", branch = "bump-gir" } diff --git a/examples/windows-common-controls-v6/Cargo.toml b/examples/windows-common-controls-v6/Cargo.toml index e7e15bb8..0a6614ee 100644 --- a/examples/windows-common-controls-v6/Cargo.toml +++ b/examples/windows-common-controls-v6/Cargo.toml @@ -21,3 +21,6 @@ features = ["Win32_UI_WindowsAndMessaging", "Win32_Foundation"] [build-dependencies] embed-resource = "3" + +[patch.crates-io] +tao = { git = "https://github.com/tauri-apps/tao.git", branch = "gtk-0.19" }