Bring PKGBUILD up-to-date with upstream changes

This includes the following changes:

- Using Meson and Ninja to configure and build.
- Update URL to point to GitHub, the website seems gone.
- Added missing dependencies (and make dependencies).
- Add the libnkutils repository to the sources.

2 files changed, 29 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8544057d9bea..0ef683d8cbb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,30 @@
 pkgbase = j4status-git
 	pkgdesc = A plugin-based status line generator: j4status generates a status line to use with bar programs (like i3bar). It is plugin-based to allow anyone to extend it easily.
-	pkgver = 227.7bbb63d
+	pkgver = 448.6dd031e
 	pkgrel = 1
-	url = http://j4status.j4tools.org/
+	url = https://sardemff7.github.io/j4status/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
 	makedepends = docbook-xsl
+	makedepends = meson
+	makedepends = ninja
 	depends = dbus
 	depends = yajl
 	depends = networkmanager
 	depends = upower
 	depends = lm_sensors
+	depends = systemd
+	depends = libnl
+	depends = pulseaudio
+	depends = libmpdclient
 	provides = j4status
 	options = !libtool
-	source = git://github.com/sardemff7/j4status.git
-	source = git://github.com/sardemff7/libgwater.git
+	source = j4status::git+https://github.com/sardemff7/j4status
+	source = libgwater::git+https://github.com/sardemff7/libgwater
+	source = libnkutils::git+https://github.com/sardemff7/libnkutils
+	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index ca90faec0529..12da0b1577b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,46 @@
 # Maintainer: Moritz Maxeiner <moritz@ucworks.org>
 
 pkgname=j4status-git
-_gitname=j4status
-pkgver=227.7bbb63d
+pkgver=448.6dd031e
 pkgrel=1
 pkgdesc="A plugin-based status line generator: j4status generates a status line to use with bar programs (like i3bar). It is plugin-based to allow anyone to extend it easily."
 arch=('i686' 'x86_64')
-url="http://j4status.j4tools.org/"
+url='https://sardemff7.github.io/j4status/'
 license=('GPL')
 provides=('j4status')
-depends=('dbus' 'yajl' 'networkmanager' 'upower' 'lm_sensors')
-makedepends=('git' 'docbook-xsl')
+depends=('dbus' 'yajl' 'networkmanager' 'upower' 'lm_sensors' 'systemd'
+         'libnl' 'pulseaudio' 'libmpdclient')
+makedepends=('git' 'docbook-xsl' 'meson' 'ninja')
 options=('!libtool')
-source=('git://github.com/sardemff7/j4status.git'
-        'git://github.com/sardemff7/libgwater.git')
-sha256sums=('SKIP'
-            'SKIP')
+source=('j4status::git+https://github.com/sardemff7/j4status'
+        'libgwater::git+https://github.com/sardemff7/libgwater'
+        'libnkutils::git+https://github.com/sardemff7/libnkutils')
+sha256sums=('SKIP' 'SKIP' 'SKIP')
 
 pkgver()
 {
-  cd "${srcdir}/${_gitname}"
+  cd j4status
   echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
 prepare()
 {
-  cd "${srcdir}/${_gitname}"
+  cd j4status
   git submodule init
   git config submodule.libgwater.url "${srcdir}/libgwater"
+  git config submodule.libnkutils.url "${srcdir}/libnkutils"
   git submodule update
 }
 
 build()
 {
-  cd "${srcdir}/${_gitname}"
-
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-systemd-input
-  make
+  rm -rf build
+  arch-meson j4status build
+  ninja -C build
 }
 
 package()
 {
-  cd "${srcdir}/${_gitname}"
-
-  make DESTDIR=${pkgdir} install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  DESTDIR="${pkgdir}" ninja -C build install
+  install -D -m644 j4status/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }