From 0b985cc974c2ba7404b8b596ab818a9a2b572bf5 Mon Sep 17 00:00:00 2001 From: NoisyCoil Date: Thu, 31 Jul 2025 15:00:09 +0200 Subject: [PATCH] accept newer branches of crate rustix --- debian/control | 2 +- debian/patches/1001_rustix.patch | 17 +++++++++++++++++ debian/patches/2001_inotify.patch | 2 +- debian/patches/2002_windows.patch | 2 +- debian/patches/series | 1 + debian/tests/control | 6 +++--- 6 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 debian/patches/1001_rustix.patch diff --git a/debian/control b/debian/control index 0b2b90b..b19e186 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: librust-futures-lite-2+default-dev, librust-inotify-0-dev (<< 0.11), librust-native-tls-0.2+default-dev, - librust-rustix-0.38+default-dev, + librust-rustix-1+default-dev, librust-signal-hook-0.3+default-dev, librust-tempfile-3+default-dev, librust-timerfd-1+default-dev, diff --git a/debian/patches/1001_rustix.patch b/debian/patches/1001_rustix.patch new file mode 100644 index 0000000..90d44cb --- /dev/null +++ b/debian/patches/1001_rustix.patch @@ -0,0 +1,17 @@ +Description: accept newer branches of crate rustix +Author: NoisyCoil +Forwarded: not-needed +Last-Update: 2025-07-31 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -53,7 +53,7 @@ + + [target.'cfg(target_os = "linux")'.dev-dependencies] + inotify = { version = "0.11", default-features = false } +-rustix = "0.38" ++rustix = "1" + timerfd = "1" + + [target.'cfg(windows)'.dev-dependencies] diff --git a/debian/patches/2001_inotify.patch b/debian/patches/2001_inotify.patch index f369285..e5c280e 100644 --- a/debian/patches/2001_inotify.patch +++ b/debian/patches/2001_inotify.patch @@ -13,6 +13,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ [target.'cfg(target_os = "linux")'.dev-dependencies] -inotify = { version = "0.11", default-features = false } +inotify = { version = ">= 0.9, <= 0.11", default-features = false } - rustix = "0.38" + rustix = "1" timerfd = "1" diff --git a/debian/patches/2002_windows.patch b/debian/patches/2002_windows.patch index 87730f0..562690e 100644 --- a/debian/patches/2002_windows.patch +++ b/debian/patches/2002_windows.patch @@ -8,7 +8,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +++ b/Cargo.toml @@ -45,6 +45,3 @@ inotify = { version = ">= 0.9, <= 0.11", default-features = false } - rustix = "0.38" + rustix = "1" timerfd = "1" - -[target.'cfg(windows)'.dev-dependencies] diff --git a/debian/patches/series b/debian/patches/series index 31e956b..ab9f48f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +1001_rustix.patch 2001_inotify.patch 2002_tests.patch 2002_windows.patch diff --git a/debian/tests/control b/debian/tests/control index 6662596..442ecd5 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -9,7 +9,7 @@ Depends: librust-futures-0.3+default-dev, librust-inotify-0-dev, librust-native-tls-0.2+default-dev, - librust-rustix-0.38+default-dev, + librust-rustix-1+default-dev, librust-smol-2-dev, librust-signal-hook-0.3+default-dev, librust-tempfile-3+default-dev, @@ -29,7 +29,7 @@ Depends: librust-futures-0.3+default-dev, librust-inotify-0-dev, librust-native-tls-0.2+default-dev, - librust-rustix-0.38+default-dev, + librust-rustix-1+default-dev, librust-smol-2-dev, librust-signal-hook-0.3+default-dev, librust-tempfile-3+default-dev, @@ -49,7 +49,7 @@ Depends: librust-futures-0.3+default-dev, librust-inotify-0-dev, librust-native-tls-0.2+default-dev, - librust-rustix-0.38+default-dev, + librust-rustix-1+default-dev, librust-smol-2+default-dev, librust-signal-hook-0.3+default-dev, librust-tempfile-3+default-dev, -- 2.47.2