upgpkg: i3-wm 4.9-1 - validpgpkeys: Michael

PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgname=i3-wm
 _pkgsourcename=i3
-pkgver=4.8
-pkgrel=3
+pkgver=4.9
+pkgrel=1
 pkgdesc='An improved dynamic tiling window manager'
 arch=('i686' 'x86_64')
 url='http://i3wm.org/'
@@ -11,7 +11,7 @@ license=('BSD')
 replaces=('i3' 'i3bar')
 groups=('i3')
 depends=('xcb-util-cursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl'
-         'startup-notification' 'pango')
+         'startup-notification' 'pango' 'libxkbcommon-x11')
 makedepends=('bison' 'flex')
 optdepends=('dmenu: As menu.'
             'i3lock: For locking your screen.'
@@ -20,17 +20,14 @@ optdepends=('dmenu: As menu.'
             'perl-json-xs: Features like saving the layout.')
 options=('docs' '!strip')
 source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2"
-        "http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc"
-        'bugfix_dont_focus_unmapped_container_on_manage.patch')
-md5sums=('4151e8e81fdc78b32a7cb953f67e3bef'
-         'SKIP'
-         '2601c1d3fa5e45bc637a82486fdc5be6')
+        "http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc")
+md5sums=('7e00bc788345e2b5759461f9eaa799a6'
+         'SKIP')
+validpgpkeys=('424E14D703E7C6D43D9D6F364E7160ED4AC8EE1D') # Michael Stapelberg
 
 build() {
   cd "$srcdir/$_pkgsourcename-$pkgver"
   
-  patch -p1 < "$srcdir/bugfix_dont_focus_unmapped_container_on_manage.patch"
-
   # In order to avoid problems with bison use only a single process
   MAKEFLAGS="-j1"
   make

bugfix_dont_focus_unmapped_container_on_manage.patch

-diff --git a/8f442e0..9eee357 b/9eee357
-index 8f442e0..9eee357 100644
---- a/src/manage.c
-+++ b/src/manage.c
-@@ -505,7 +505,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
- 
-     /* Defer setting focus after the 'new' event has been sent to ensure the
-      * proper window event sequence. */
--    if (set_focus) {
-+    if (set_focus && nc->mapped) {
-         DLOG("Now setting focus.\n");
-         con_focus(nc);
-     }