release 0.8.3

3 files changed, 8 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41d4729fccc9..4f8d943d9fd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = circadian
 	pkgdesc = Linux auto-suspend/wake power management daemon
-	pkgver = 0.8.2
-	pkgrel = 2
+	pkgver = 0.8.3
+	pkgrel = 1
 	url = https://github.com/mrmekon/circadian
 	arch = x86_64
 	arch = aarch64
@@ -19,9 +19,7 @@ pkgbase = circadian
 	optdepends = net-tools: for monitoring nfs, smb or ssh
 	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
+	source = circadian-0.8.3.tar.gz::https://github.com/mrmekon/circadian/archive/refs/tags/v0.8.3.tar.gz
+	b2sums = d70793398437bf4fa37d27d7054cc24bbf0eef1680f832a15f94cf127f66d8d44150dcefee2ecbc66ecc45d240d04c896b59e7d0cf72f3ac9d2df57f134a3718
 
 pkgname = circadian
diff --git a/PKGBUILD b/PKGBUILD
index d572a9fdac84..58e115ebb2fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # shellcheck shell=bash disable=SC2034,SC2154,SC2164
 
 pkgname=circadian
-pkgver=0.8.2
-pkgrel=2
+pkgver=0.8.3
+pkgrel=1
 pkgdesc="Linux auto-suspend/wake power management daemon"
 arch=('x86_64' 'aarch64')
 url="https://github.com/mrmekon/${pkgname}"
@@ -18,11 +18,8 @@ optdepends=(
     '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"
-    "w_arg.patch")
-b2sums=('c80c523c4438d6dddb1441deecf98c54eb401f7f764bb47fda18490e4a2dcb3da98b5268025950dd78caab2d9ac152ec73cb030a25c77168818871017df8171c'
-        'b7236454060def7fc91800cbbc0f775fd51c5f58c259ecd7db8959ef1849fcaf44309d89ffb1d63101737d21fb78de6a3d8299d3889dacc93d77b035d1e47a16')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz")
+b2sums=('d70793398437bf4fa37d27d7054cc24bbf0eef1680f832a15f94cf127f66d8d44150dcefee2ecbc66ecc45d240d04c896b59e7d0cf72f3ac9d2df57f134a3718')
 backup=('etc/circadian.conf')
 
 prepare() {
@@ -30,9 +27,6 @@ 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
deleted file mode 100644
index b4ae311df1f8..000000000000
--- a/w_arg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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