Package: greetd
Version: 0.10.3-1

I hope to update rust-nix to 0.29 soon. Greetd needs a small patch
to build with the new version.

Unfortunately the patch will break the build with nix 0.27, so
it will need to be uploaded after nix is updated. In the
meantime the new version of nix has been uploded to experimental
if you want to do further testing.

Debdiff is attached.
diff -Nru greetd-0.10.3/debian/changelog greetd-0.10.3/debian/changelog
--- greetd-0.10.3/debian/changelog      2024-07-19 05:09:19.000000000 +0000
+++ greetd-0.10.3/debian/changelog      2024-10-19 14:33:13.000000000 +0000
@@ -1,3 +1,10 @@
+greetd (0.10.3-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch for rust-nix 0.29.
+
+ -- Peter Michael Green <[email protected]>  Sat, 19 Oct 2024 14:33:13 +0000
+
 greetd (0.10.3-1) unstable; urgency=medium
 
   * NUR.
diff -Nru greetd-0.10.3/debian/control greetd-0.10.3/debian/control
--- greetd-0.10.3/debian/control        2024-07-19 05:09:19.000000000 +0000
+++ greetd-0.10.3/debian/control        2024-10-19 14:30:30.000000000 +0000
@@ -6,7 +6,7 @@
  debhelper-compat (= 13),
  dh-cargo,
 # greetd & greetd_ipc
- librust-nix-dev (>= 0.25),
+ librust-nix-dev (>= 0.29),
  librust-pam-sys-dev (>= 0.5.6),
  librust-users-dev (>= 0.11.0),
  librust-serde-derive-dev (>= 1.0),
diff -Nru greetd-0.10.3/debian/patches/nix-0.29.patch 
greetd-0.10.3/debian/patches/nix-0.29.patch
--- greetd-0.10.3/debian/patches/nix-0.29.patch 1970-01-01 00:00:00.000000000 
+0000
+++ greetd-0.10.3/debian/patches/nix-0.29.patch 2024-10-19 14:33:13.000000000 
+0000
@@ -0,0 +1,27 @@
+Index: greetd-0.10.3/greetd/Cargo.toml
+===================================================================
+--- greetd-0.10.3.orig/greetd/Cargo.toml
++++ greetd-0.10.3/greetd/Cargo.toml
+@@ -11,7 +11,7 @@ repository = "https://git.sr.ht/~kennyle
+ debug = []
+ 
+ [dependencies]
+-nix = { version = ">=0.27", features = ["ioctl", "signal", "user", "fs", 
"mman"] }
++nix = { version = ">=0.29", features = ["ioctl", "signal", "user", "fs", 
"mman"] }
+ pam-sys = "0.5.6"
+ serde = { version = "1.0", features = ["derive"] }
+ serde_json = "1.0"
+Index: greetd-0.10.3/greetd/src/terminal/mod.rs
+===================================================================
+--- greetd-0.10.3.orig/greetd/src/terminal/mod.rs
++++ greetd-0.10.3/greetd/src/terminal/mod.rs
+@@ -218,7 +218,8 @@ impl Terminal {
+     /// Clear this terminal by sending the appropciate escape codes to it. 
Only
+     /// affects text mode.
+     pub fn term_clear(&self) -> Result<(), Error> {
+-        let res = write(self.fd, b"\x1B[H\x1B[2J");
++        use std::os::fd::BorrowedFd;
++        let res = write(unsafe { BorrowedFd::borrow_raw(self.fd) }, 
b"\x1B[H\x1B[2J");
+         if let Err(v) = res {
+             Err(format!("terminal: unable to clear: {}", v).into())
+         } else {
diff -Nru greetd-0.10.3/debian/patches/series 
greetd-0.10.3/debian/patches/series
--- greetd-0.10.3/debian/patches/series 2024-07-19 05:09:19.000000000 +0000
+++ greetd-0.10.3/debian/patches/series 2024-10-19 14:29:25.000000000 +0000
@@ -2,3 +2,4 @@
 config_tweaks.patch
 relax_deps.patch
 rpassword_6.0_adaptation.patch
+nix-0.29.patch

Reply via email to