Update to 4.16.1

1 files changed, 18 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b5f6b218a62a..868bb05236ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,14 @@
+# Maintainer: Lars Rustand <rustand dot lars at gmail dot com>
 # Upstream Maintainer (i3-wm): Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Patch Contributor: Marius Muja <mariusm@cs.ubc.ca>
 # Patch Contributor: mickael9 <mickael9@gmail.com>
 # Patch Contributor: Esteve Varela Colominas <esteve.varela@gmail.com>
-# Package Maintainer: cornholio <vigo.the.unholy.carpathian@gmail.com>
+# Contributor: cornholio <vigo.the.unholy.carpathian@gmail.com>
 
 pkgname=i3-wm-iconpatch
 _pkgsourcename=i3
-pkgver=4.14.1
-pkgrel=2
+pkgver=4.16.1
+pkgrel=1
 pkgdesc='An improved dynamic tiling window manager (with titlebar icon patch)'
 arch=('i686' 'x86_64')
 url='http://i3wm.org/'
@@ -15,12 +16,12 @@ license=('BSD')
 provides=('i3-wm')
 conflicts=('i3-wm')
 groups=('i3')
-depends=('xcb-util-cursor' 'xcb-util-keysyms' 'xcb-util-wm' 'xcb-util-xrm' 
+depends=('xcb-util-cursor' 'xcb-util-keysyms' 'xcb-util-wm' 'xcb-util-xrm'
          'libev' 'yajl' 'startup-notification' 'pango' 'libxkbcommon-x11')
 makedepends=('bison' 'flex' 'pkg-config')
 optdepends=('dmenu: As menu.'
             'i3lock: For locking your screen.'
-            'i3status: To display systeminformation with a bar.'
+            'i3status: To display system information with a bar.'
             'perl: i3-save-tree and i3-dmenu-desktop'
             'perl-anyevent-i3: Features like saving the layout.'
             'perl-json-xs: Features like saving the layout.')
@@ -28,15 +29,17 @@ options=('docs' '!strip')
 source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2"
         "http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc"
         "iconsupport.patch")
-sha1sums=('2f98fdebbdc8b6214d8c258db062ae02095ca2f9'
-          'SKIP'
-          '9b91e6490c32c05d6f619e21ae1a7850dd0bc745')
+sha1sums=(
+  '95607b8e09bdf5d18032b2ec391cb1000efcdf5a'
+  'SKIP'
+  '2ccc24022d4bbf1b1f5aa423e0a977ba99447f33'
+)
 validpgpkeys=('424E14D703E7C6D43D9D6F364E7160ED4AC8EE1D') # Michael Stapelberg
 
 prepare() {
 
   cd "$srcdir/$_pkgsourcename-$pkgver"
-  
+
   patch -p1 < "$srcdir/iconsupport.patch"
 
 }
@@ -44,9 +47,11 @@ prepare() {
 build() {
 
   cd "$srcdir/$_pkgsourcename-$pkgver"
+  [ -d build ] && rm -rf build
+  mkdir build
+  cd build
 
-  ./configure --prefix=/usr --sysconfdir=/etc
-  cd ${CARCH}-pc-linux-gnu
+  ../configure --prefix=/usr --sysconfdir=/etc
 
   # In order to avoid problems with bison use only a single process
   MAKEFLAGS="-j1"
@@ -56,7 +61,7 @@ build() {
 
 package() {
 
-  cd "$srcdir/$_pkgsourcename-$pkgver/${CARCH}-pc-linux-gnu"
+  cd "$srcdir/$_pkgsourcename-$pkgver/build"
 
   make DESTDIR="$pkgdir/" install
 
@@ -64,7 +69,7 @@ package() {
   install -m644 ../man/*.1 "${pkgdir}/usr/share/man/man1/"
 
   install -Dm644 ../LICENSE \
-    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE 
+    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
 }