Package: inputplug Version: 0.4.0-2 We are preparing an update of rust-nix to version 0.27 and rust-x11rb to 0.13, the new versions are available in experimental.
The new version of rustix does not seem to require any code changes, but it does require the "process" feature to be explicitly enabled. The new version of x11rb changed HierarchyInfo.flags from a u32 to a HierarchyMask. Heirachymask implements into<u32>, so I just added a conversion. A debdiff is attached, if I get no response I will probablly NMU this when I upload the new nix and x11rb packages to unstable.
diff -Nru inputplug-0.4.0/debian/changelog inputplug-0.4.0/debian/changelog --- inputplug-0.4.0/debian/changelog 2021-07-22 10:08:15.000000000 +0000 +++ inputplug-0.4.0/debian/changelog 2024-02-23 00:48:38.000000000 +0000 @@ -1,3 +1,13 @@ +inputplug (0.4.0-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Explicitly enable the "process" feature in nix dependency (needed for nix 0.27) + * Use u32::from on info.flags, with x11rb 0.10 and lower, this is a no-op + because flags is already a u32. With x11rb 0.13 this will convert the flags + to a u32. + + -- Peter Michael Green <plugw...@debian.org> Fri, 23 Feb 2024 00:48:38 +0000 + inputplug (0.4.0-2) unstable; urgency=medium * Fix the copyright file. diff -Nru inputplug-0.4.0/debian/control inputplug-0.4.0/debian/control --- inputplug-0.4.0/debian/control 2021-07-22 10:08:15.000000000 +0000 +++ inputplug-0.4.0/debian/control 2024-02-23 00:48:38.000000000 +0000 @@ -14,7 +14,7 @@ librust-nix-0+default-dev (>= 0.19.0-~~), librust-pidfile-rs-0.1+default-dev, librust-structopt-0.3+default-dev, - librust-x11rb-0.8+default-dev, + librust-x11rb+default-dev (>= 0.8), pkgconf | pkg-config Standards-Version: 4.5.1 Homepage: https://github.com/andrewshadura/inputplug diff -Nru inputplug-0.4.0/debian/patches/nix-features.patch inputplug-0.4.0/debian/patches/nix-features.patch --- inputplug-0.4.0/debian/patches/nix-features.patch 1970-01-01 00:00:00.000000000 +0000 +++ inputplug-0.4.0/debian/patches/nix-features.patch 2024-02-23 00:48:38.000000000 +0000 @@ -0,0 +1,12 @@ +Index: inputplug-0.4.0/Cargo.toml +=================================================================== +--- inputplug-0.4.0.orig/Cargo.toml ++++ inputplug-0.4.0/Cargo.toml +@@ -23,6 +23,7 @@ version = "1.0" + + [dependencies.nix] + version = ">= 0.19, <1.0" ++features = ["process"] + + [dependencies.pidfile-rs] + version = "0.1" diff -Nru inputplug-0.4.0/debian/patches/series inputplug-0.4.0/debian/patches/series --- inputplug-0.4.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ inputplug-0.4.0/debian/patches/series 2024-02-23 00:48:38.000000000 +0000 @@ -0,0 +1,2 @@ +nix-features.patch +x11rb-0.13.patch diff -Nru inputplug-0.4.0/debian/patches/x11rb-0.13.patch inputplug-0.4.0/debian/patches/x11rb-0.13.patch --- inputplug-0.4.0/debian/patches/x11rb-0.13.patch 1970-01-01 00:00:00.000000000 +0000 +++ inputplug-0.4.0/debian/patches/x11rb-0.13.patch 2024-02-23 00:48:38.000000000 +0000 @@ -0,0 +1,26 @@ +Index: inputplug-0.4.0/Cargo.toml +=================================================================== +--- inputplug-0.4.0.orig/Cargo.toml ++++ inputplug-0.4.0/Cargo.toml +@@ -33,7 +34,7 @@ version = "0.3" + default-features = false + + [dependencies.x11rb] +-version = "0.8" ++version = ">= 0.8" + features = ["xinput"] + + [features] +Index: inputplug-0.4.0/src/main.rs +=================================================================== +--- inputplug-0.4.0.orig/src/main.rs ++++ inputplug-0.4.0/src/main.rs +@@ -222,7 +222,7 @@ fn main() -> Result<()> { + continue; + } + for info in hier_event.infos { +- let flags = IterableMask::from(info.flags) ++ let flags = IterableMask::from(u32::from(info.flags)) + .map(|x| HierarchyMask::from(x as u8)) + .collect::<Vec<HierarchyMask>>(); +
