andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-21 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Update dependencies more carefully

Browse Source 
No winit deadlock in this update.
This commit is contained in:
Ivan Molodetskikh
2025-05-13 17:12:34 +03:00
parent 6169c0312a
commit bb8eb377c7
4 changed files with 75 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+70 -58
View File
@@ -49,7 +49,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
dependencies = [
"android-properties",
"bitflags 2.9.0",
"bitflags 2.9.1",
"cc",
"cesu8",
"jni",
@@ -344,7 +344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
dependencies = [
"annotate-snippets",
"bitflags 2.9.0",
"bitflags 2.9.1",
"cexpr",
"clang-sys",
"itertools",
@@ -381,9 +381,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.9.0"
version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
[[package]]
name = "block2"
@@ -445,7 +445,7 @@ version = "0.20.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae50b5510d86cf96ac2370e66d8dc960882f3df179d6a5a1e52bd94a1416c0f7"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"cairo-sys-rs",
"glib",
"libc",
@@ -468,7 +468,7 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"log",
"polling",
"rustix 0.38.44",
@@ -483,7 +483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10929724661d1c43856fd87c7a127ae944ec55579134fb485e4136fb6a46fdcb"
dependencies = [
"async-task",
"bitflags 2.9.0",
"bitflags 2.9.1",
"futures-io",
"polling",
"rustix 0.38.44",
@@ -867,7 +867,7 @@ version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"bytemuck",
"drm-ffi",
"drm-fourcc",
@@ -1168,7 +1168,7 @@ version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce852e998d3ca5e4a97014fb31c940dc5ef344ec7d364984525fd11e8a547e6a"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"drm",
"drm-fourcc",
"gbm-sys",
@@ -1362,7 +1362,7 @@ version = "0.20.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "707b819af8059ee5395a2de9f2317d87a53dbad8846a2f089f0bb44703f37686"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"futures-channel",
"futures-core",
"futures-executor",
@@ -1733,7 +1733,7 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbdc09524a91f9cacd26f16734ff63d7dc650daffadd2b6f84d17a285bd875a9"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"input-sys",
"libc",
"log",
@@ -1945,7 +1945,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4210cfe93a0dc37228e08105e3c13171e5af816f7bd39e00e3d3adcf2b487a2b"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"libc",
"libdisplay-info-derive",
"libdisplay-info-sys",
@@ -1995,7 +1995,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"libc",
"redox_syscall 0.5.11",
]
@@ -2025,13 +2025,13 @@ name = "libspa"
version = "0.8.0"
source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#fd3d8f7861a29c2eeaa4c393402e013578bb36d9"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"cc",
"convert_case",
"cookie-factory",
"libc",
"libspa-sys",
"nix",
"nix 0.29.0",
"nom",
"system-deps 6.2.2",
]
@@ -2184,7 +2184,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"jni-sys",
"log",
"ndk-sys",
@@ -2218,7 +2218,7 @@ dependencies = [
"async-channel",
"async-io",
"atomic",
"bitflags 2.9.0",
"bitflags 2.9.1",
"bytemuck",
"calloop 0.14.2",
"calloop-wayland-source 0.4.0",
@@ -2269,7 +2269,7 @@ dependencies = [
name = "niri-config"
version = "25.2.0"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"csscolorparser",
"insta",
"knuffel",
@@ -2312,7 +2312,19 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"cfg-if",
"cfg_aliases",
"libc",
]
[[package]]
name = "nix"
version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
dependencies = [
"bitflags 2.9.1",
"cfg-if",
"cfg_aliases",
"libc",
@@ -2392,7 +2404,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"block2",
"libc",
"objc2",
@@ -2408,7 +2420,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"block2",
"objc2",
"objc2-core-location",
@@ -2432,7 +2444,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"block2",
"objc2",
"objc2-foundation",
@@ -2474,7 +2486,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"block2",
"dispatch",
"libc",
@@ -2499,7 +2511,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"block2",
"objc2",
"objc2-foundation",
@@ -2511,7 +2523,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"block2",
"objc2",
"objc2-foundation",
@@ -2534,7 +2546,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"block2",
"objc2",
"objc2-cloud-kit",
@@ -2566,7 +2578,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"block2",
"objc2",
"objc2-core-location",
@@ -2627,9 +2639,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
[[package]]
name = "pango"
version = "0.20.9"
version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b1f5dc1b8cf9bc08bfc0843a04ee0fa2e78f1e1fa4b126844a383af4f25f0ec"
checksum = "d88d37c161f2848f0d9382597f0168484c9335ac800995f3956641abb7002938"
dependencies = [
"gio",
"glib",
@@ -2651,9 +2663,9 @@ dependencies = [
[[package]]
name = "pangocairo"
version = "0.20.7"
version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4690509a2fea2a6552a0ef8aa3e5f790c1365365ee0712afa1aedb39af3997b6"
checksum = "58890dc451db9964ac2d8874f903a4370a4b3932aa5281ff0c8d9810937ad84f"
dependencies = [
"cairo-rs",
"glib",
@@ -2784,11 +2796,11 @@ version = "0.8.0"
source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#fd3d8f7861a29c2eeaa4c393402e013578bb36d9"
dependencies = [
"anyhow",
"bitflags 2.9.0",
"bitflags 2.9.1",
"libc",
"libspa",
"libspa-sys",
"nix",
"nix 0.29.0",
"once_cell",
"pipewire-sys",
"thiserror 1.0.69",
@@ -2951,7 +2963,7 @@ checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
dependencies = [
"bit-set",
"bit-vec",
"bitflags 2.9.0",
"bitflags 2.9.1",
"lazy_static",
"num-traits",
"rand 0.8.5",
@@ -3113,7 +3125,7 @@ version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
]
[[package]]
@@ -3192,7 +3204,7 @@ version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"errno",
"libc",
"linux-raw-sys 0.4.15",
@@ -3205,7 +3217,7 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"errno",
"libc",
"linux-raw-sys 0.9.4",
@@ -3424,7 +3436,7 @@ dependencies = [
"aliasable",
"appendlist",
"atomic_float",
"bitflags 2.9.0",
"bitflags 2.9.1",
"calloop 0.14.2",
"cc",
"cgmath",
@@ -3470,7 +3482,7 @@ version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"calloop 0.13.0",
"calloop-wayland-source 0.3.0",
"cursor-icon",
@@ -4065,7 +4077,7 @@ version = "0.31.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"rustix 0.38.44",
"wayland-backend",
"wayland-scanner",
@@ -4077,7 +4089,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"cursor-icon",
"wayland-backend",
]
@@ -4109,7 +4121,7 @@ version = "0.32.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba8de1f9dda5e589d08848af3ad4cd694bbfd059c3eb3c6d89c7120e8c0efa71"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"wayland-backend",
"wayland-client",
"wayland-scanner",
@@ -4122,7 +4134,7 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4557954e564c9b1888289458186f8a04b8fb65ef2ce5369fdf7383cb6e3c3f0a"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"wayland-backend",
"wayland-protocols",
"wayland-scanner",
@@ -4135,7 +4147,7 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87e10c27e3290310d7e0d3221bc4e945d9b296b249577af2eb595726b546a3f8"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -4148,7 +4160,7 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f3334ee752fbe3c228adfda339a9e7a03e0ba65a78806d8d464b69928cf4ef2"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -4173,7 +4185,7 @@ version = "0.31.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eec95c2a85da4e984c0a20bc30a017dd29de15059b56647c35397fb30bf7018"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"downcast-rs",
"rustix 0.38.44",
"wayland-backend",
@@ -4532,7 +4544,7 @@ dependencies = [
"ahash",
"android-activity",
"atomic-waker",
"bitflags 2.9.0",
"bitflags 2.9.1",
"block2",
"bytemuck",
"calloop 0.13.0",
@@ -4589,7 +4601,7 @@ version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
]
[[package]]
@@ -4659,7 +4671,7 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
dependencies = [
"bitflags 2.9.0",
"bitflags 2.9.1",
"dlib",
"log",
"once_cell",
@@ -4734,9 +4746,9 @@ dependencies = [
[[package]]
name = "zbus"
version = "5.6.0"
version = "5.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2522b82023923eecb0b366da727ec883ace092e7887b61d3da5139f26b44da58"
checksum = "88232b74ba057a0c85472ec1bae8a17569960be17da2d5e5ad30d5efe7ea6719"
dependencies = [
"async-broadcast",
"async-executor",
@@ -4752,7 +4764,7 @@ dependencies = [
"futures-core",
"futures-lite",
"hex",
"nix",
"nix 0.30.1",
"ordered-stream",
"serde",
"serde_repr",
@@ -4767,9 +4779,9 @@ dependencies = [
[[package]]
name = "zbus_macros"
version = "5.6.0"
version = "5.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05d2e12843c75108c00c618c2e8ef9675b50b6ec095b36dc965f2e5aed463c15"
checksum = "6969c06899233334676e60da1675740539cf034ee472a6c5b5c54e50a0a554c9"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -4877,9 +4889,9 @@ dependencies = [
[[package]]
name = "zvariant"
version = "5.5.1"
version = "5.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "557e89d54880377a507c94cd5452f20e35d14325faf9d2958ebeadce0966c1b2"
checksum = "9d30786f75e393ee63a21de4f9074d4c038d52c5b1bb4471f955db249f9dffb1"
dependencies = [
"endi",
"enumflags2",
@@ -4891,9 +4903,9 @@ dependencies = [
[[package]]
name = "zvariant_derive"
version = "5.5.1"
version = "5.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "757779842a0d242061d24c28be589ce392e45350dfb9186dfd7a042a2e19870c"
checksum = "75fda702cd42d735ccd48117b1630432219c0e9616bf6cb0f8350844ee4d9580"
dependencies = [
"proc-macro-crate",
"proc-macro2",
Cargo.toml
+5 -5
View File
@@ -16,7 +16,7 @@ rust-version = "1.80.1"
[workspace.dependencies]
anyhow = "1.0.98"
bitflags = "2.9.0"
bitflags = "2.9.1"
clap = { version = "4.5.38", features = ["derive"] }
insta = "1.43.1"
serde = { version = "1.0.219", features = ["derive"] }
@@ -56,7 +56,7 @@ async-channel = "2.3.1"
async-io = { version = "2.4.0", optional = true }
atomic = "0.6.0"
bitflags.workspace = true
bytemuck = { version = "1.22.0", features = ["derive"] }
bytemuck = { version = "1.23.0", features = ["derive"] }
calloop = { version = "0.14.2", features = ["executor", "futures-io"] }
clap = { workspace = true, features = ["string"] }
clap_complete = "4.5.50"
@@ -74,8 +74,8 @@ log = { version = "0.4.27", features = ["max_level_trace", "release_max_level_de
niri-config = { version = "25.2.0", path = "niri-config" }
niri-ipc = { version = "25.2.0", path = "niri-ipc", features = ["clap"] }
ordered-float = "5.0.0"
pango = { version = "0.20.9", features = ["v1_44"] }
pangocairo = "0.20.7"
pango = { version = "0.20.10", features = ["v1_44"] }
pangocairo = "0.20.10"
pipewire = { git = "https://gitlab.freedesktop.org/pipewire/pipewire-rs.git", optional = true, features = ["v0_3_33"] }
png = "0.17.16"
portable-atomic = { version = "1.11.0", default-features = false, features = ["float"] }
@@ -91,7 +91,7 @@ url = { version = "2.5.4", optional = true }
wayland-backend = "0.3.10"
wayland-scanner = "0.31.6"
xcursor = "0.3.8"
zbus = { version = "5.6.0", optional = true }
zbus = { version = "5.7.0", optional = true }
[dependencies.smithay]
workspace = true
src/dbus/gnome_shell_introspect.rs
-2
View File
@@ -1,5 +1,3 @@
#![allow(deprecated)] // Maybe De/SerializeDict will be undeprecated in the future.
use std::collections::HashMap;
use zbus::fdo::{self, RequestNameFlags};
src/dbus/mutter_screen_cast.rs
-2
View File
@@ -1,5 +1,3 @@
#![allow(deprecated)] // Maybe De/SerializeDict will be undeprecated in the future.
use std::collections::HashMap;
use std::mem;
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};