Merge changes from community/swayidle

2 files changed, 34 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 119384a8bb30..5d9d41344bb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
 pkgbase = swayidle-git
-	pkgdesc = Sway's idle management daemon
-	pkgver = r36.1fe7145
+	pkgdesc = Idle management daemon for Wayland
+	pkgver = 1.6.r9.g85b57cc
 	pkgrel = 1
-	url = https://swaywm.org
-	arch = i686
+	url = https://github.com/swaywm/swayidle
 	arch = x86_64
 	license = MIT
 	makedepends = meson
-	makedepends = git
 	makedepends = scdoc
 	makedepends = wayland-protocols
+	makedepends = git
 	depends = wayland
+	depends = systemd-libs
 	provides = swayidle
 	conflicts = swayidle
-	options = debug
-	options = !strip
 	source = swayidle::git+https://github.com/swaywm/swayidle.git
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index b22dea881fa3..4c1ca8ad57be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,45 @@
+# Maintainer: Sibren Vasse <arch@sibrenvasse.nl>
 # Maintainer: gilbus <aur(AT)tinkershell.eu>
 pkgname=swayidle-git
 _pkgname=swayidle
-pkgver=r36.1fe7145
+pkgver=1.6.r9.g85b57cc
 pkgrel=1
-license=("MIT")
-pkgdesc="Sway's idle management daemon"
-makedepends=("meson" "git" "scdoc" "wayland-protocols")
+license=('MIT')
+pkgdesc='Idle management daemon for Wayland'
+makedepends=(
+    'meson'
+    'scdoc'
+    'wayland-protocols'
+    'git'
+)
 depends=(
-	"wayland"
+    'wayland'
+    'systemd-libs'
 )
-arch=("i686" "x86_64")
-url="https://swaywm.org"
+arch=('x86_64')
+url="https://github.com/swaywm/swayidle"
 source=("${pkgname%-*}::git+https://github.com/swaywm/swayidle.git")
-sha1sums=("SKIP")
-provides=("swayidle")
-conflicts=("swayidle")
-options=(debug !strip)
+sha1sums=('SKIP')
+provides=('swayidle')
+conflicts=('swayidle')
 
 pkgver() {
-	cd "${srcdir}/${_pkgname}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-	cd "${srcdir}/${_pkgname}"
-	meson -Dwerror=false --prefix /usr "$srcdir/build"
+    cd "$_pkgname"
+    ( set -o pipefail
+      git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+      printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    )
 }
 
 build() {
-	cd "${srcdir}/${_pkgname}"
-	ninja -C "$srcdir/build"
+    meson "$_pkgname" build \
+        --prefix /usr \
+        --buildtype=plain
+    ninja -C build
 }
 
 package() {
-	cd "${srcdir}/${_pkgname}"
-	DESTDIR="$pkgdir/" ninja -C "$srcdir/build" install
+    DESTDIR="$pkgdir/" ninja -C build install
+    install -Dm644 "$_pkgname/LICENSE" -t "$pkgdir/usr/share/licenses/$_pkgname"
+    install -Dm644 "$_pkgname/README.md" -t "$pkgdir/usr/share/doc/$_pkgname"
 }