Patch getState()

Change dependency libsystemd to systemd.
Change source URL.
Minor edits.

3 files changed, 38 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f70f1bfb747a..a3ab9101caba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = chkservice
-	pkgdesc = Systemd units manager with ncurses terminal interface
+	pkgdesc = Systemd units manager with ncurses, terminal interface
 	pkgver = 0.3
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/linuxenko/chkservice
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
-	depends = libsystemd
-	source = chkservice-0.3.tar.gz::https://github.com/linuxenko/chkservice/archive/0.3.tar.gz
+	depends = systemd
+	source = chkservice-0.3.tar.gz::https://github.com/linuxenko/chkservice/archive/refs/tags/0.3.tar.gz
+	source = get-state.patch
 	sha256sums = 56037fd82be06d6115d0738439c23faa291d036ffe33fe590b484b045d6d180d
+	sha256sums = 3db092cd91bf14ab35db55e692249ba0b08277fce99614812a5d5f0a5d0980c9
 
 pkgname = chkservice
-
diff --git a/PKGBUILD b/PKGBUILD
index 1b92cbaa6a73..d0e087b8689e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,31 @@
-# Maintainer: Caltlgin Stsodaat <contact@fossdaily.xyz>
+# Maintainer: willemw <willemw12@gmail.com>
+# Contributor: Caltlgin Stsodaat <contact@fossdaily.xyz>
 
-pkgname='chkservice'
+pkgname=chkservice
 pkgver=0.3
-pkgrel=2
-pkgdesc='Systemd units manager with ncurses terminal interface'
+pkgrel=3
+pkgdesc="Systemd units manager with ncurses, terminal interface"
 arch=('x86_64')
-url='https://github.com/linuxenko/chkservice'
+url="https://github.com/linuxenko/chkservice"
 license=('GPL3')
-depends=('libsystemd')
+depends=('systemd')
 makedepends=('cmake')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
-sha256sums=('56037fd82be06d6115d0738439c23faa291d036ffe33fe590b484b045d6d180d')
+source=($pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz
+        get-state.patch)
+sha256sums=('56037fd82be06d6115d0738439c23faa291d036ffe33fe590b484b045d6d180d'
+            '3db092cd91bf14ab35db55e692249ba0b08277fce99614812a5d5f0a5d0980c9')
+
+prepare() {
+  patch --directory=$pkgname-$pkgver --forward --strip=1 --input="$srcdir/get-state.patch"
+}
 
 build() {
-  export CFLAGS+=" ${CPPFLAGS}"
-  export CXXFLAGS+=" ${CPPFLAGS}"
-  cmake -B 'build' -S "${pkgname}-${pkgver}" \
-    -DCMAKE_BUILD_TYPE='None' \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -Wno-dev
-  make -C 'build'
+  cmake -B build -S $pkgname-$pkgver -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev
+  make -C build
 }
 
 package() {
-  make DESTDIR="${pkgdir}" PREFIX='/usr' -C 'build' install
-  install -Dvm644 "${pkgname}-${pkgver}/README.md" -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -Dm644 $pkgname-$pkgver/README.md -t "$pkgdir/usr/share/doc/$pkgname"
+  make -C build DESTDIR="$pkgdir/" install
 }
 
-# vim: ts=2 sw=2 et:
diff --git a/get-state.patch b/get-state.patch
new file mode 100644
index 000000000000..f1ce7373234d
--- /dev/null
+++ b/get-state.patch
@@ -0,0 +1,13 @@
+diff --unified --recursive --text chkservice.orig/src/chk-systemd.cpp chkservice/src/chk-systemd.cpp
+--- chkservice.orig/src/chk-systemd.cpp	2019-11-01 20:50:21.000000000 +0100
++++ chkservice/src/chk-systemd.cpp	2021-07-04 16:49:24.069844808 +0200
+@@ -117,9 +117,6 @@
+   finish:
+     sd_bus_error_free(&error);
+     sd_bus_message_unref(busMessage);
+-    if (state < 0) {
+-      throw std::string(errorMessage);
+-    }
+ 
+   return status < 0 ? NULL : strdup(state);
+ }