Restore `w_arg.patch` for `idle_fn`

4 files changed, 29 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11fe677c0fc0..41d4729fccc9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = circadian
 	pkgdesc = Linux auto-suspend/wake power management daemon
 	pkgver = 0.8.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/mrmekon/circadian
 	arch = x86_64
 	arch = aarch64
@@ -20,6 +20,8 @@ pkgbase = circadian
 	optdepends = pulseaudio: audio detection support via pacmd
 	backup = etc/circadian.conf
 	source = circadian-0.8.2.tar.gz::https://github.com/mrmekon/circadian/archive/refs/tags/v0.8.2.tar.gz
+	source = w_arg.patch
 	b2sums = c80c523c4438d6dddb1441deecf98c54eb401f7f764bb47fda18490e4a2dcb3da98b5268025950dd78caab2d9ac152ec73cb030a25c77168818871017df8171c
+	b2sums = b7236454060def7fc91800cbbc0f775fd51c5f58c259ecd7db8959ef1849fcaf44309d89ffb1d63101737d21fb78de6a3d8299d3889dacc93d77b035d1e47a16
 
 pkgname = circadian
diff --git a/.gitignore b/.gitignore
index 31d27563afeb..aa29a10a7f92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *
 !.gitignore
 !PKGBUILD
-!.SRCINFO
\ No newline at end of file
+!.SRCINFO
+!w_arg.patch
diff --git a/PKGBUILD b/PKGBUILD
index 1b283a65b9b3..d572a9fdac84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,20 +5,24 @@
 
 pkgname=circadian
 pkgver=0.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux auto-suspend/wake power management daemon"
 arch=('x86_64' 'aarch64')
 url="https://github.com/mrmekon/${pkgname}"
 license=('GPL3')
 depends=('awk' 'coreutils' 'gcc-libs' 'grep' 'sed' 'sh')
 makedepends=('cargo')
-optdepends=('xssstate: for monitoring x11 input'
+optdepends=(
+    'xssstate: for monitoring x11 input'
     'xprintidle: for monitoring x11 input'
     'procps: for monitoring tty input, uptime or processes'
     'net-tools: for monitoring nfs, smb or ssh'
     'pulseaudio: audio detection support via pacmd')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz")
-b2sums=('c80c523c4438d6dddb1441deecf98c54eb401f7f764bb47fda18490e4a2dcb3da98b5268025950dd78caab2d9ac152ec73cb030a25c77168818871017df8171c')
+source=(
+    "${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
+    "w_arg.patch")
+b2sums=('c80c523c4438d6dddb1441deecf98c54eb401f7f764bb47fda18490e4a2dcb3da98b5268025950dd78caab2d9ac152ec73cb030a25c77168818871017df8171c'
+        'b7236454060def7fc91800cbbc0f775fd51c5f58c259ecd7db8959ef1849fcaf44309d89ffb1d63101737d21fb78de6a3d8299d3889dacc93d77b035d1e47a16')
 backup=('etc/circadian.conf')
 
 prepare() {
@@ -26,6 +30,9 @@ prepare() {
     export RUSTUP_TOOLCHAIN=stable
     export CARGO_TARGET_DIR=target
 
+    # Arch does not enable the `-f` option for the `w` command per default
+    patch --forward --strip=1 --input="${srcdir}/w_arg.patch"
+
     cargo fetch --locked --target "${CARCH}-unknown-linux-gnu"
 }
 
diff --git a/w_arg.patch b/w_arg.patch
new file mode 100644
index 000000000000..b4ae311df1f8
--- /dev/null
+++ b/w_arg.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main.rs b/src/main.rs
+index 1a63192..11049d3 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -380,7 +380,7 @@ fn idle_fn(cmd: &str, args: Vec<&str>) -> IdleResult {
+         };
+         let display = format!(":{}", device.chars().rev().next().unwrap_or('0'));
+         let mut output = Command::new("w")
+-            .arg("-hus")
++            .arg("-husf")
+             .stdout(Stdio::piped()).spawn()?;
+         let _ = output.wait()?;
+         let w_stdout = output.stdout