[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD fix-freeze.patch)

[Andrea Scarpino]

    Date: Wednesday, September 5, 2012 @ 00:06:01
  Author: andrea
Revision: 166169

upgpkg: kdebase-workspace 4.9.1-2

Fix the kwin freeze

Added:
  kdebase-workspace/trunk/fix-freeze.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

------------------+
 PKGBUILD         |   11 ++++++++---
 fix-freeze.patch |   25 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-05 03:56:51 UTC (rev 166168)
+++ PKGBUILD	2012-09-05 04:06:01 UTC (rev 166169)
@@ -5,7 +5,7 @@
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -29,7 +29,8 @@
 options=('emptydirs')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service'
-        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+        'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+        'fix-freeze.patch')
 sha1sums=('ac1753e2264246ec6347961f44b0aae07072dbb4'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           '712a90999bd429883dcef5dcaf288aace332ced8'
@@ -38,13 +39,17 @@
           'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
+          'd509dac592bd8b310df27991b208c95b6d907514'
+          '4cea251edacf60815863fa080cbd3916b44e9890')
 
 build() {
 	cd "${srcdir}"/${_pkgname}-${pkgver}
 	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
 	patch -p0 -i "${srcdir}"/fixpath.patch
 	patch -p0 -i "${srcdir}"/terminate-server.patch
+
+    # KDEBUG 306260
+    patch -p1 -i "${srcdir}"/fix-freeze.patch
 	
 	cd "${srcdir}"
 	mkdir build

Added: fix-freeze.patch
===================================================================
--- fix-freeze.patch	                        (rev 0)
+++ fix-freeze.patch	2012-09-05 04:06:01 UTC (rev 166169)
@@ -0,0 +1,25 @@
+diff --git a/kwin/tabbox/clientmodel.cpp b/kwin/tabbox/clientmodel.cpp
+index 9591bab..9790245 100644
+--- a/kwin/tabbox/clientmodel.cpp
++++ b/kwin/tabbox/clientmodel.cpp
+@@ -195,6 +195,9 @@ void ClientModel::createClientList(int desktop, bool partialReset)
+             }
+         }
+         TabBoxClient* stop = c;
++        // test whether the Client marked as stop will be included at all in the list
++        // see BUG: 306260
++        bool stopInFocusChain = !tabBox->clientToAddToList(c, desktop).isNull();
+         do {
+             QWeakPointer<TabBoxClient> add = tabBox->clientToAddToList(c, desktop);
+             if (!add.isNull()) {
+@@ -204,6 +207,10 @@ void ClientModel::createClientList(int desktop, bool partialReset)
+                 }
+             }
+             c = tabBox->nextClientFocusChain(c).data();
++            if (!stopInFocusChain) {
++                stop = c;
++                stopInFocusChain = true;
++            }
+         } while (c && c != stop);
+         break;
+     }