diff --git a/Cargo.lock b/Cargo.lock index 900ba44a49f4..c0774c5b333f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -154,7 +154,7 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cairo-rs" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "bitflags 2.9.4", "cairo-sys-rs", @@ -165,7 +165,7 @@ dependencies = [ [[package]] name = "cairo-sys-rs" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "glib-sys", "libc", @@ -174,9 +174,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.35" +version = "1.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3" +checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54" dependencies = [ "find-msvc-tools", "shlex", @@ -215,7 +215,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-link", + "windows-link 0.1.3", ] [[package]] @@ -432,9 +432,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650" +checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d" [[package]] name = "fnv" @@ -544,7 +544,7 @@ dependencies = [ [[package]] name = "gdk-pixbuf" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -555,7 +555,7 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "gio-sys", "glib-sys", @@ -723,7 +723,7 @@ dependencies = [ "js-sys", "libc", "r-efi", - "wasi 0.14.3+wasi-0.2.4", + "wasi 0.14.4+wasi-0.2.4", "wasm-bindgen", ] @@ -746,7 +746,7 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gio" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "futures-channel", "futures-core", @@ -762,13 +762,13 @@ dependencies = [ [[package]] name = "gio-sys" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "windows-sys 0.60.2", + "windows-sys 0.61.0", ] [[package]] @@ -811,7 +811,7 @@ dependencies = [ [[package]] name = "glib" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "bitflags 2.9.4", "futures-channel", @@ -831,7 +831,7 @@ dependencies = [ [[package]] name = "glib-macros" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "heck", "proc-macro-crate", @@ -843,7 +843,7 @@ dependencies = [ [[package]] name = "glib-sys" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "libc", "system-deps", @@ -883,7 +883,7 @@ dependencies = [ [[package]] name = "gobject-sys" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "glib-sys", "libc", @@ -893,7 +893,7 @@ dependencies = [ [[package]] name = "graphene-rs" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "glib", "graphene-sys", @@ -903,7 +903,7 @@ dependencies = [ [[package]] name = "graphene-sys" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "glib-sys", "libc", @@ -1140,7 +1140,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core", + "windows-core 0.61.2", ] [[package]] @@ -1337,9 +1337,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738" dependencies = [ "once_cell", "wasm-bindgen", @@ -1418,9 +1418,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "lru" @@ -1514,7 +1514,7 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "pango" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "gio", "glib", @@ -1525,7 +1525,7 @@ dependencies = [ [[package]] name = "pango-sys" version = "0.22.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#bb6ea9a8cdba49167f8d4406d7f8974100b4ab35" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8b15a80885e929718c9c44f5e93360d8670d8a9d" dependencies = [ "glib-sys", "gobject-sys", @@ -2465,30 +2465,31 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" -version = "0.14.3+wasi-0.2.4" +version = "0.14.4+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95" +checksum = "88a5f4a424faf49c3c2c344f166f0662341d470ea185e939657aaff130f0ec4a" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb" dependencies = [ "bumpalo", "log", @@ -2500,9 +2501,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe" dependencies = [ "cfg-if", "js-sys", @@ -2513,9 +2514,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2523,9 +2524,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" dependencies = [ "proc-macro2", "quote", @@ -2536,9 +2537,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1" dependencies = [ "unicode-ident", ] @@ -2605,9 +2606,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12" dependencies = [ "js-sys", "wasm-bindgen", @@ -2640,33 +2641,33 @@ checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3" [[package]] name = "winapi-util" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.0", ] [[package]] name = "windows" -version = "0.61.3" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +checksum = "9579d0e6970fd5250aa29aba5994052385ff55cf7b28a059e484bb79ea842e42" dependencies = [ "windows-collections", - "windows-core", + "windows-core 0.62.0", "windows-future", - "windows-link", + "windows-link 0.2.0", "windows-numerics", ] [[package]] name = "windows-collections" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +checksum = "a90dd7a7b86859ec4cdf864658b311545ef19dbcf17a672b52ab7cefe80c336f" dependencies = [ - "windows-core", + "windows-core 0.62.0", ] [[package]] @@ -2677,19 +2678,32 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ "windows-implement", "windows-interface", - "windows-link", - "windows-result", - "windows-strings", + "windows-link 0.1.3", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + +[[package]] +name = "windows-core" +version = "0.62.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.2.0", + "windows-result 0.4.0", + "windows-strings 0.5.0", ] [[package]] name = "windows-future" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +checksum = "b2194dee901458cb79e1148a4e9aac2b164cc95fa431891e7b296ff0b2f1d8a6" dependencies = [ - "windows-core", - "windows-link", + "windows-core 0.62.0", + "windows-link 0.2.0", "windows-threading", ] @@ -2722,13 +2736,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" [[package]] -name = "windows-numerics" +name = "windows-link" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" + +[[package]] +name = "windows-numerics" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ce3498fe0aba81e62e477408383196b4b0363db5e0c27646f932676283b43d8" dependencies = [ - "windows-core", - "windows-link", + "windows-core 0.62.0", + "windows-link 0.2.0", ] [[package]] @@ -2737,7 +2757,16 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.3", +] + +[[package]] +name = "windows-result" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" +dependencies = [ + "windows-link 0.2.0", ] [[package]] @@ -2746,7 +2775,16 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-link", + "windows-link 0.1.3", +] + +[[package]] +name = "windows-strings" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" +dependencies = [ + "windows-link 0.2.0", ] [[package]] @@ -2776,6 +2814,15 @@ dependencies = [ "windows-targets 0.53.3", ] +[[package]] +name = "windows-sys" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" +dependencies = [ + "windows-link 0.2.0", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -2798,7 +2845,7 @@ version = "0.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" dependencies = [ - "windows-link", + "windows-link 0.1.3", "windows_aarch64_gnullvm 0.53.0", "windows_aarch64_msvc 0.53.0", "windows_i686_gnu 0.53.0", @@ -2811,11 +2858,11 @@ dependencies = [ [[package]] name = "windows-threading" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +checksum = "ab47f085ad6932defa48855254c758cdd0e2f2d48e62a34118a268d8f345e118" dependencies = [ - "windows-link", + "windows-link 0.2.0", ] [[package]] @@ -2925,9 +2972,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.45.0" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814" +checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36" [[package]] name = "writeable" @@ -2986,18 +3033,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", diff --git a/gdk4-win32/Cargo.toml b/gdk4-win32/Cargo.toml index 7d261447ab42..7b4fd8118fe5 100644 --- a/gdk4-win32/Cargo.toml +++ b/gdk4-win32/Cargo.toml @@ -31,7 +31,7 @@ gio.workspace = true glib.workspace = true libc.workspace = true khronos-egl = {version = "6.0", optional = true} -windows = { version = "0.61", features = [ +windows = { version = ">= 0.61, <= 0.62", features = [ "Win32_Foundation", "Win32_UI_WindowsAndMessaging", ], optional = true }