Backport patch fixing window tracking, bug 461836

Package-Manager: portage-2.2.0_alpha168/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

4 files changed, 121 insertions, 17 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 3b40dc14912b..cf639351b89e 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.313 2013/03/09 19:44:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.314 2013/03/22 22:41:47 dilfridge Exp $
+
+*kwin-4.10.1-r2 (22 Mar 2013)
+
+  22 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> -kwin-4.10.1.ebuild,
+  +kwin-4.10.1-r2.ebuild, +files/kwin-4.10.1-unref.patch:
+  Backport patch fixing window tracking, bug 461836
 
 *kwin-4.10.1-r1 (09 Mar 2013)
 
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index e08c0edaaca4..9b1db324885e 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -2,29 +2,32 @@
 Hash: SHA256
 
 AUX kwin-4.10.1-nulluuid.patch 1494 SHA256 a7c14bbc4c0a66729c86a1965639eea30a12f1572dd977fb0e2ad40404754643 SHA512 a37f4c7fa60f5640632dd2adc02b6f61a72a816c8cc93e03992dfaac308fc9054e348ae1a5bcefa85c24de82ac4ff3e69b1849561506b6291dad31499ff6b4b2 WHIRLPOOL 29caf3d5eb86f0c450c09bcb436fe95369f186a92ac3cd54e69f72c9a1e02cd84deb4b8fe3ac79bdb1d858fbb63ecc9e9fb39d300aac6d069061a0575398d911
+AUX kwin-4.10.1-unref.patch 3654 SHA256 d5ecb27b5e2bde93abbfcb0b38bacb30a853ca938718d233ca59306cead2936f SHA512 6b505fa9e7e61372e68def7b9c7e355ad259dac023400a306e7701bc8de46b7b5da951a242f5fd0142d2319d501a143dc3658e2f72e0ef82b9e4c9b32715e5f9 WHIRLPOOL 06d7faf204dded7b4f712ca7300979c7cec1547dd4446894688d6de3643828130992f31b4e1d545822327fe943fe0b0996bef9bc457b1248f6c146a9725f3ccf
 DIST kde-workspace-4.10.0.tar.xz 13378604 SHA256 88c90fef1b8ad81eea75ee04b2a9bae91a38e51425a0ec373ca21bedebef1b46 SHA512 d83210abbfc9cf0bb11f5a7c1fcab52aa512b6ecde7712467a74f5dc03a3dec683386408c3e613cb4bb69e215a0129c44aa935cef59f64c594b43bc2dcf739d9 WHIRLPOOL bdf0b7ce8c1a48c43bb593cbdae3620ef597e83844b7c967dc372539767a1597169894b10daf32de316d41f659e156a0ad44cd5f20dfe2deedb48e129a12b1a6
 DIST kde-workspace-4.10.1.tar.xz 13560944 SHA256 19ca159dc6cec2b8cb6a09d7a87ec5f541e35ed0f03c185c7ea5cfe959b212b7 SHA512 efa7cc41bca306a39dc609453af843886b4cce197098524e2842976c5906a78cd8950f9ea03ffc51c1aa72ba52a19d6f943d53a76b32387c953b4d9cb679bb71 WHIRLPOOL d63d6193644fb879b502338d251117975aa71a77dd19bcf53e0e06f2dbacdee68fe5c078217664fa12e470f71fa312752ad5ca578f23cf0ec1b2b710c49507de
 DIST kde-workspace-4.9.5.tar.xz 22520656 SHA256 073e495c4ef4eb4689c5c666c86fb6f24f57f2c00801f965c60bf8b32adb014a SHA512 1a8802e8c9dcaf1e81276c962dce7d321a26f205f60ccd27fa00780c4c09a8cd404a67b037265a4dd5efdc4ffc386cc31f571ac5ca10c1a14bc59259683a5e54 WHIRLPOOL f6ba18b30f7a5c454c9304d42f50238eac9a90abfc29fb6f7e873675eca89d206045f7277e5732e3faf669d36ec822cae0849813c66d72f7ba3af25bac3130ef
 EBUILD kwin-4.10.0.ebuild 1555 SHA256 ce5753278cbbb6e7bd5540fe3b71eeb4a5f869a79a8bc06533772d81807fa9b2 SHA512 0f6a039f05cdfc73fa01057037e07c02f13de0e009d2209f486c0361a8ae9228bcf78607569cf60fdc6bb3df610525e6de358e1ed9514da2669b771bc4a36b31 WHIRLPOOL 2ffd31fdd4d288b9c871dce25069e737f68e04cbfb87942cc4d6ff96e01cd0b1a05215b19125e7322d52d44aba41b119375e3a3ed46ffc96cb023228ba42c890
 EBUILD kwin-4.10.1-r1.ebuild 1611 SHA256 98e0dd0f5ebb775da7ebf89e2b1d53656cbb4c2373d1b1b6f1ce498f22e1a394 SHA512 599c43c76ed21e5611430f5da7a17596268077a3d916ff49ecb2c4e1a70842532bb473089295c8ba1a4f7391d68ee5e4216cbff333061c16f20147f6966b5912 WHIRLPOOL 9912e5430a4421ac25f6ac6b61116801312962f9494b3b93539cef4851d004b8b49a5469df97bb122faaf285d054ace5ed48495ad6a1893941cba435f6cf665c
-EBUILD kwin-4.10.1.ebuild 1561 SHA256 3f6ae90141d8443c69c4f371212220293bb296ece73b5b87b4f343f4b3972914 SHA512 01fbf89545dec98648635e93cb1e7f42cfc8ff9953a3ffcade67e97f482be4df0a079de985b65aab8d37841df9c814c750affadc87e05cc0354f482c1db0b6da WHIRLPOOL 2e859d6dbb477b17bd1e8d996779b6776894e47f733061270d6db694974e3ef93c3a225e26d29b3cc2d148899bee012891a32540cb250fc518f2c04d14c234da
+EBUILD kwin-4.10.1-r2.ebuild 1644 SHA256 caeba9490c9a65e4f4e73f0b5be64c4fc2733f3552dca2a970d145d97dd132e8 SHA512 b646178376d696cc5a088e8ddcb0392d9c259c9fa0b6d5d2f10903bd113b74e4d5ab7de11445cf5be2fb65b5d16258c23ee362a0f6cc23c4ab68c4632ed14411 WHIRLPOOL b36e7804fa912bc2dcc71b8fef7415e17c49876edd1e10444792702702a59d11b02c1961d9db74cf28ca85fbdc9995016c439f83d7a4568145825aa58cd07da3
 EBUILD kwin-4.9.5.ebuild 1551 SHA256 768e7d851b7659764f8ecc6ace5f86a29a35fcb182841811ce78ff08ea948aa8 SHA512 6c5b7f32196cad1597f0ed06af6116619381b032581d0d810980e423e5af7a333d7149e75dac28d1c12a327e4c1af645e23a192a3f7b46e9e75760c78a459d7b WHIRLPOOL 97d67b4ce62adb247e5c7ef5f9eabc57857d0f7de2509edba580be8d1da40e553ef117488948ef8f6c3551cdc778d2434e14d8310c3f6ae79a4b2c861d472da4
-MISC ChangeLog 38272 SHA256 476f7561a955ebb1d2988f6fd8560b4da1468d503739149d090cde5a571e0952 SHA512 d2f38eadeadbe96d32f8fef9ddfabab1c33405fa488bfdc79cf0d92eddde0285d5bfd0c454feaea6a14b0050f36b5385a31269cd013c981fc37968baa9a72826 WHIRLPOOL 58dfa20ebce02abd7dd00c96fae8b3a3c1878a9281aaa22b4fb0e6711771cb8341225e622223ce163e9260ffd093a92e99dd69e6ff0c28d123e9ae0ef0b479b4
+MISC ChangeLog 38492 SHA256 d0db317de5d6a08704d440bb4d05b9e7f0103785c492fee72a8fa1563b2515c4 SHA512 9ce50e1ca0609a53f9ef66efd8d5bef56ca733a597a90b2475f4b36712e8f575a6263e8693213f1efbc94add8f7be354dabd250bbe272511062f55f502d77851 WHIRLPOOL 36f35ccbe061c435d817779efc0648dc0ae1848343ccd0ae7a9f0ba555d2fe1f2ab3651fc4d6b24b9a6cc271fc404a43882847ea02b35a09aad0e494bed5adec
 MISC metadata.xml 229 SHA256 1cd96488355a3e48a2b0b12f09ad8e3ea923e199b4fcbf175590cd317b033af7 SHA512 357e165f3706a18dbab9ce108b28d7b3338e3a458fb9d184d701e7fd932f41d1abdc7785bdd22003b2bd2d702674b3dcc206b39e141d8c3adfda7d6d1d1ec0d8 WHIRLPOOL fd66f59afef8829e84f2be5f0782511e6b16dbd811d432205eaf629470055d1d4173d135a59b95668500c4b4cb15bcf9f6230e96aecf5f0e1d5338d4d4881018
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRO5FEAAoJENwGBM22xffe+SQP/RmcwY3/37QWFfB7C9/YRXZ2
-qOi9ei3LI1uMhVrPBoIYcQZ/zBlQGc/k2SGcsjas4aHNLOiINtN+8nr31hBITZI1
-FWuUMBKnB/UNlOKvcUA+PQs1RhHGVF1rUnRBGT6CSf/4ReZpdA+Emaivr/DLMvXa
-NNq2TxiI8KAKJuPR0rs13HjMrF7AtP8cuM8/ipsVag8fEKp42JXtsQar3wptRCQu
-VBsb2lCSdbIeOp1t7A7mWMjELv6YCA+Md+gFvTB/Z6qhXKf6Uoq2tPsuSHKrBIPj
-PhoLpK0ntEs4M5zNceml+wO7v3fJIyHEbc3LkNZhxEzFuzhhb1cPsSClGLXgMRZQ
-ot8Lwncgwk89PkLC893g7Hlh+iTbrp02+E+5SBRgScFQDDuIRDsPxi7pUStQN7ol
-Qp5D3uPPSAz/wk3HDbr/ahSy9CP9tSZl3cj0WFq6hV07V5losSc1xFXDdvpv4w5X
-AItaUk+K6hcFL1RxsYKO+9Ca1Uem0mc0WNcPgkhBKrwUsNupiv8+/ihFj8qm/3xd
-NB7kvoYRje50OZmoon4IvQyE8s+MZTVgmtP0rL1ImCswmOwsMryTTVYCC3h3St25
-lAgfABPYEXMFSbngZ7IZpKY4yvTrBZE3LC95sLyZTv6dgdKG4OOn5xJ0UJJROFFP
-hLqrWvBF5eT4ztU0HLqu
-=66yT
+iQJ8BAEBCABmBQJRTN5cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc6wgP/jdP6P6zTTt39gUEeoAlzOTE
+o99mpiK4Q4rqMPFW/Pb36IzfZPVKuVmYB1exQA9irgz1raUA6XmX/JCmD4EHLcVl
+j3kWBQ7yJJhBXGr88gG/Ah8iQVXN0+OSijU+gO660vHbjV8DtujAtzC2AHZYRmw4
+5UiFk6lo9OdGXFuWsQKHOFRUMZea55+TmE/XKSGY6z/0UP6JThtywzOvf2PAtXKL
+0sLDOkXJbMp7oebDZySOMn9Ar6/Wvzq8bvzLMmOAueM4h6f5BWZVzCA9YTNOTEg8
+LzZ+en8fswr2A5UmqEAFEoBJaadk5zHmTBZd5UQupkSkVxatHO0EPuKQNBpo6REb
+TSxYrn3s6J/PkxHtvvBP63RUsEtZ/YGFr99EZ21XXxms0V+A0KINi1z5AeSbEBur
+LB9AOqD8HEeKHs0l7h2pHp6LYurErLUiGD49NNMoeE1ldsrYsQyR+32Fhc1Ra4vu
+hTDK3MZSOBAxn95EbFp7wWB4TG+iWME4lc9Ss+L+LdfJH9z6qvgx5ZpO3EnWuYwv
+RXIcFM48zEIL8nPRiskiDw0ZDp8ct7ZDhEnkrfJux9K4woSXRcHU4A9DGEPZvXTl
+s7jpXWLbA+fwnK6Ge1i9Z5AS95XGeji9Nt/n3IO2b06W1/YvcSJRinxX9i/mjjCo
+7WceVW8w3YXVszdttEDG
+=z6Tu
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/kwin-4.10.1-unref.patch b/kde-base/kwin/files/kwin-4.10.1-unref.patch
new file mode 100644
index 000000000000..ebbbd117b47c
--- /dev/null
+++ b/kde-base/kwin/files/kwin-4.10.1-unref.patch
@@ -0,0 +1,90 @@
+From 342f3a9ff2d9587601039605e42df873fa7b75a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
+Date: Mon, 11 Mar 2013 16:19:16 +0100
+Subject: [PATCH] keep + track m_closeWindow to keep m_winData alive
+
+BUG: 259640
+FIXED-IN: 4.10.2
+REVIEW: 109509
+---
+ kwin/effects/presentwindows/presentwindows.cpp | 26 ++++++++++++++++++++------
+ 1 file changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/kwin/effects/presentwindows/presentwindows.cpp b/kwin/effects/presentwindows/presentwindows.cpp
+index 7a59aec..79baadb 100755
+--- a/kwin/effects/presentwindows/presentwindows.cpp
++++ b/kwin/effects/presentwindows/presentwindows.cpp
+@@ -64,6 +64,7 @@ PresentWindowsEffect::PresentWindowsEffect()
+     , m_highlightedWindow(NULL)
+     , m_filterFrame(NULL)
+     , m_closeView(NULL)
++    , m_closeWindow(NULL)
+     , m_dragInProgress(false)
+     , m_dragWindow(NULL)
+     , m_highlightedDropTarget(NULL)
+@@ -217,7 +218,7 @@ void PresentWindowsEffect::postPaintScreen()
+ {
+     if (m_motionManager.areWindowsMoving())
+         effects->addRepaintFull();
+-    else if (!m_activated && m_motionManager.managingWindows()) {
++    else if (!m_activated && m_motionManager.managingWindows() && !m_closeWindow) {
+         // We have finished moving them back, stop processing
+         m_motionManager.unmanageAll();
+ 
+@@ -261,7 +262,7 @@ void PresentWindowsEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &d
+ {
+     // TODO: We should also check to see if any windows are fading just in case fading takes longer
+     //       than moving the windows when the effect is deactivated.
+-    if (m_activated || m_motionManager.areWindowsMoving()) {
++    if (m_activated || m_motionManager.areWindowsMoving() || m_closeWindow) {
+         DataHash::iterator winData = m_windowData.find(w);
+         if (winData == m_windowData.end()) {
+             effects->prePaintWindow(w, data, time);
+@@ -306,6 +307,9 @@ void PresentWindowsEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &d
+                 // we have to keep the window in the list to prevent flickering
+                 winData->referenced = false;
+                 w->unrefWindow();
++                if (w == m_closeWindow) {
++                    m_closeWindow = NULL;
++                }
+             } else
+                 w->enablePainting(EffectWindow::PAINT_DISABLED_BY_DELETE);
+         }
+@@ -437,6 +441,15 @@ void PresentWindowsEffect::slotWindowAdded(EffectWindow *w)
+         rearrangeWindows();
+     }
+     if (m_closeView && w == effects->findWindow(m_closeView->winId())) {
++        if (m_closeWindow != w) {
++            DataHash::iterator winDataIt = m_windowData.find(m_closeWindow);
++            if (winDataIt != m_windowData.end()) {
++                if (winDataIt->referenced) {
++                    m_closeWindow->unrefWindow();
++                }
++                m_windowData.erase(winDataIt);
++            }
++        }
+         winData->visible = true;
+         winData->highlight = 1.0;
+         m_closeWindow = w;
+@@ -452,13 +465,14 @@ void PresentWindowsEffect::slotWindowClosed(EffectWindow *w)
+     if (winData == m_windowData.end())
+         return;
+     winData->deleted = true;
+-    winData->referenced = true;
+-    w->refWindow();
++    if (!winData->referenced) {
++        winData->referenced = true;
++        w->refWindow();
++    }
+     if (m_highlightedWindow == w)
+         setHighlightedWindow(findFirstWindow());
+     if (m_closeWindow == w) {
+-        m_closeWindow = 0;
+-        return; // don't rearrange
++        return; // don't rearrange, get's nulled when unref'd
+     }
+     rearrangeWindows();
+ 
+-- 
+1.8.1.5
+
diff --git a/kde-base/kwin/kwin-4.10.1.ebuild b/kde-base/kwin/kwin-4.10.1-r2.ebuild
index 3ea0f165c091..3e6ea21302b3 100644
--- a/kde-base/kwin/kwin-4.10.1.ebuild
+++ b/kde-base/kwin/kwin-4.10.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.10.1.ebuild,v 1.1 2013/03/06 13:41:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.10.1-r2.ebuild,v 1.1 2013/03/22 22:41:47 dilfridge Exp $
 
 EAPI=5
 
@@ -49,6 +49,11 @@ KMEXTRACTONLY="
 # you need one of these
 REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-nulluuid.patch"
+	"${FILESDIR}/${P}-unref.patch"
+)
+
 src_configure() {
 	# FIXME Remove when activity API moved away from libkworkspace
 	append-cppflags "-I${EPREFIX}/usr/include/kworkspace"