Package: wlgreet
Version: 0.5.0-2
I hope to update the rust-nix package to 0.29 soon. wlgreet
needs some code changes for this, nothing too massive but
unfortunately the changes will mean the package no longer
builds with the old version of rust-nix. So the upload to
unstable will have to wait until rust-nix is in unstable.
The new version of rust-nix is available in experimental
if you want to do further testing (I have only build tested
the package).
Also while working on this I ran into another issue. There
are two versions of the smithay-client-toolkit crate
packaged in Debian currently. Version 0.18 is packaged
in librust-smithay-client-toolkit-dev and version 0.16
packaged in librust-smithay-client-toolkit-0.16-dev.
Your Debian build-dependency corectly reflects that your
package needs 0.16, but your cargo dependency
currently does not. If both are installed cargo picks
0.18 and your package fails to build. I adjusted the
cargo dependency to reflect what your package needs.
Debdiff is attatched.
diff -Nru wlgreet-0.5.0/debian/changelog wlgreet-0.5.0/debian/changelog
--- wlgreet-0.5.0/debian/changelog 2024-07-17 02:53:57.000000000 +0000
+++ wlgreet-0.5.0/debian/changelog 2024-10-19 22:46:25.000000000 +0000
@@ -1,3 +1,12 @@
+wlgreet (0.5.0-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Tighten cargo dependency on smithay-client-toolkit to match Debian
+ build-dependency.
+ * Add patch for nix 0.29 and update Debian build-dependency accordingly.
+
+ -- Peter Michael Green <plugw...@debian.org> Sat, 19 Oct 2024 22:46:25 +0000
+
wlgreet (0.5.0-2) unstable; urgency=medium
* Rebuild with smithay 0.16, kindly provided by James McCoy
diff -Nru wlgreet-0.5.0/debian/control wlgreet-0.5.0/debian/control
--- wlgreet-0.5.0/debian/control 2024-07-17 02:53:57.000000000 +0000
+++ wlgreet-0.5.0/debian/control 2024-10-19 22:46:25.000000000 +0000
@@ -9,7 +9,7 @@
librust-smithay-client-toolkit-0.16-dev,
librust-rusttype-dev (>= 0.9.2),
librust-chrono-dev (>= 0.4),
- librust-nix-dev (>= 0.15),
+ librust-nix-dev (>= 0.19),
librust-memmap2-dev (>= 0.3),
librust-os-pipe-dev (>= 0.8),
librust-wayland-client-0.29-dev,
diff -Nru wlgreet-0.5.0/debian/patches/nix-0.29.patch
wlgreet-0.5.0/debian/patches/nix-0.29.patch
--- wlgreet-0.5.0/debian/patches/nix-0.29.patch 1970-01-01 00:00:00.000000000
+0000
+++ wlgreet-0.5.0/debian/patches/nix-0.29.patch 2024-10-19 22:46:25.000000000
+0000
@@ -0,0 +1,45 @@
+Index: wlgreet-0.5.0/Cargo.toml
+===================================================================
+--- wlgreet-0.5.0.orig/Cargo.toml
++++ wlgreet-0.5.0/Cargo.toml
+@@ -14,7 +14,7 @@ damage_debug = []
+ smithay-client-toolkit = "0.16"
+ rusttype = ">=0.9"
+ chrono = ">=0.4"
+-nix = ">=0.27"
++nix = ">=0.29"
+ memmap2 = ">=0.3"
+ os_pipe = { version = ">=1.1", features = ["io_safety"] }
+ wayland-client = { version = "0.29" }
+Index: wlgreet-0.5.0/src/main.rs
+===================================================================
+--- wlgreet-0.5.0.orig/src/main.rs
++++ wlgreet-0.5.0/src/main.rs
+@@ -4,6 +4,7 @@ use std::os::fd::BorrowedFd;
+ use std::sync::mpsc::channel;
+
+ use nix::poll::{poll, PollFd, PollFlags};
++use nix::poll::PollTimeout;
+ use os_pipe::pipe;
+
+ mod app;
+@@ -41,8 +42,8 @@ fn main() {
+ let connection_fd = unsafe {
BorrowedFd::borrow_raw(app.display().get_connection_fd()) };
+ let rx_pipe_fd = unsafe { BorrowedFd::borrow_raw(rx_pipe.as_raw_fd()) };
+ let mut fds = [
+- PollFd::new(&connection_fd, PollFlags::POLLIN),
+- PollFd::new(&rx_pipe_fd, PollFlags::POLLIN),
++ PollFd::new(connection_fd, PollFlags::POLLIN),
++ PollFd::new(rx_pipe_fd, PollFlags::POLLIN),
+ ];
+
+ app.cmd_queue().lock().unwrap().push_back(Cmd::Draw);
+@@ -85,7 +86,7 @@ fn main() {
+ None => {
+ app.flush_display();
+
+- poll(&mut fds, -1).unwrap();
++ poll(&mut fds, PollTimeout::NONE).unwrap();
+
+ if fds[0].revents().unwrap().contains(PollFlags::POLLIN) {
+ if let Some(guard) = app.event_queue().prepare_read() {
diff -Nru wlgreet-0.5.0/debian/patches/series
wlgreet-0.5.0/debian/patches/series
--- wlgreet-0.5.0/debian/patches/series 2024-07-17 02:53:57.000000000 +0000
+++ wlgreet-0.5.0/debian/patches/series 2024-10-19 22:46:25.000000000 +0000
@@ -1,2 +1,3 @@
update_deps.patch
nix-0.27.patch
+nix-0.29.patch
diff -Nru wlgreet-0.5.0/debian/patches/update_deps.patch
wlgreet-0.5.0/debian/patches/update_deps.patch
--- wlgreet-0.5.0/debian/patches/update_deps.patch 2024-07-17
02:53:57.000000000 +0000
+++ wlgreet-0.5.0/debian/patches/update_deps.patch 2024-10-19
22:44:20.000000000 +0000
@@ -16,7 +16,7 @@
-nix = "0.25"
-memmap2 = "0.3"
-os_pipe = "1.1"
-+smithay-client-toolkit = ">=0.16"
++smithay-client-toolkit = "0.16"
+rusttype = ">=0.9"
+chrono = ">=0.4"
+nix = ">=0.27"
