[arch-commits] Commit in i3-wm/trunk (2 files)

[Thorsten Töpper]

    Date: Thursday, June 26, 2014 @ 07:07:08
  Author: ttoepper
Revision: 113575

upgpkg: i3-wm 4.8-3 - FS#40911

Added:
  i3-wm/trunk/bugfix_dont_focus_unmapped_container_on_manage.patch
Modified:
  i3-wm/trunk/PKGBUILD

------------------------------------------------------+
 PKGBUILD                                             |   10 +++++++---
 bugfix_dont_focus_unmapped_container_on_manage.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-26 00:10:15 UTC (rev 113574)
+++ PKGBUILD	2014-06-26 05:07:08 UTC (rev 113575)
@@ -4,7 +4,7 @@
 pkgname=i3-wm
 _pkgsourcename=i3
 pkgver=4.8
-pkgrel=2
+pkgrel=3
 pkgdesc='An improved dynamic tiling window manager'
 arch=('i686' 'x86_64')
 url='http://i3wm.org/'
@@ -21,13 +21,17 @@
             '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")
+        "http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc"
+        'bugfix_dont_focus_unmapped_container_on_manage.patch')
 md5sums=('4151e8e81fdc78b32a7cb953f67e3bef'
-         'SKIP')
+         'SKIP'
+         '2601c1d3fa5e45bc637a82486fdc5be6')
 
 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

Added: bugfix_dont_focus_unmapped_container_on_manage.patch
===================================================================
--- bugfix_dont_focus_unmapped_container_on_manage.patch	                        (rev 0)
+++ bugfix_dont_focus_unmapped_container_on_manage.patch	2014-06-26 05:07:08 UTC (rev 113575)
@@ -0,0 +1,13 @@
+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);
+     }