Update to the latest release 4.20.1

- New maintainer, new repository
- Refresh PKGBUILD based on i3-gaps from community

2 files changed, 25 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 154e52f124df..437b713e7ac7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = i3-gaps-kde-git
 	pkgdesc = A fork of i3wm tiling window manager with more features, including gaps (with KDE patches)
-	pkgver = 4.18.2.r10.g07d82753
+	pkgver = 4.20.1
 	pkgrel = 1
-	url = https://github.com/h0cheung/i3-gaps-kde
+	url = https://github.com/exzombie/i3-gaps-kde
 	arch = i686
 	arch = x86_64
 	groups = i3
@@ -11,6 +11,7 @@ pkgbase = i3-gaps-kde-git
 	makedepends = flex
 	makedepends = asciidoc
 	makedepends = xmlto
+	makedepends = meson
 	depends = xcb-util-keysyms
 	depends = xcb-util-wm
 	depends = libev
@@ -30,9 +31,9 @@ pkgbase = i3-gaps-kde-git
 	provides = i3-wm
 	conflicts = i3-wm
 	options = docs
+	options = debug
 	backup = etc/i3/config
-	source = git+https://github.com/h0cheung/i3-gaps-kde.git#branch=gaps-kde
+	source = git+https://github.com/exzombie/i3-gaps-kde.git#branch=release-4.20.1-kde
 	sha256sums = SKIP
 
 pkgname = i3-gaps-kde-git
-
diff --git a/PKGBUILD b/PKGBUILD
index b3ea7c0e7b78..0f78c0de1337 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,15 @@
-# Maintainer: Howard Cheung <mail@h-cheung.cf>
+# Maintainer: Jure Varlec <jure@varlec.si>
+# Contributor: Howard Cheung <mail@h-cheung.cf>
 # Contributor: Morten Linderud <foxboron@archlinux.org>
 # Contributor: Ingo Bürk <admin at airblader dot de>
 
-pkgname=i3-gaps-kde-git
-pkgver=4.18.2.r10.g07d82753
+_reponame=i3-gaps-kde
+pkgname=${_reponame}-git
+pkgver=4.20.1
 pkgrel=1
 pkgdesc='A fork of i3wm tiling window manager with more features, including gaps (with KDE patches)'
 arch=('i686' 'x86_64')
-url='https://github.com/h0cheung/i3-gaps-kde'
+url='https://github.com/exzombie/i3-gaps-kde'
 license=('BSD')
 provides=('i3-wm')
 conflicts=('i3-wm')
@@ -15,7 +17,7 @@ groups=('i3')
 depends=('xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl'
          'startup-notification' 'pango' 'perl' 'xcb-util-cursor' 'xcb-util-xrm'
          'libxkbcommon-x11')
-makedepends=('bison' 'flex' 'asciidoc' 'xmlto')
+makedepends=('bison' 'flex' 'asciidoc' 'xmlto' 'meson')
 optdepends=('rxvt-unicode: The terminal emulator used in the default config.'
             'dmenu: As menu.'
             'i3lock: For locking your screen.'
@@ -23,37 +25,23 @@ optdepends=('rxvt-unicode: The terminal emulator used in the default config.'
             'perl-json-xs: For i3-save-tree'
             'perl-anyevent-i3: For i3-save-tree')
 backup=(etc/i3/config)
-options=('docs')
-source=('git+https://github.com/h0cheung/i3-gaps-kde.git#branch=gaps-kde')
+options=('docs' 'debug')
+source=("git+https://github.com/exzombie/${_reponame}.git#branch=release-${pkgver}-kde")
 sha256sums=('SKIP')
 
-_gitname='i3-gaps-kde'
-
-pkgver() {
-  cd "$_gitname"
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare(){
-  mkdir -p build
-  cd "$_gitname"
-  autoreconf -fvi
-}
-
 build() {
-  cd build
-
-  ../$_gitname/configure \
-    --disable-sanitizers \
-    --prefix=/usr \
-    --sysconfdir=/etc
-  make
+  cd "${_reponame}"
+  arch-meson \
+    -Ddocs=true \
+    -Dmans=true \
+  ../build
+  meson compile -C ../build
 }
 
 package() {
-  cd build
-
-  make DESTDIR="${pkgdir}/" install
-  install -Dt "$pkgdir/usr/share/man/man1" -m644 man/*.1
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 ../$_gitname/LICENSE
+  cd "${_reponame}"
+  DESTDIR="$pkgdir" meson install -C ../build
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
 }
+
+# vim:set ts=2 sw=2 et: