rpms/kdebase-workspace/devel kdebase-workspace-4.4.85-kdebug239963.patch, NONE, 1.1 kdebase-workspace.spec, 1.406, 1.407

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4708

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.4.85-kdebug239963.patch 
Log Message:
* Sun Jun 13 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.85-3
- Significant CPU penalty for using Kwin effects (kde#239963)


kdebase-workspace-4.4.85-kdebug239963.patch:
 main.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE kdebase-workspace-4.4.85-kdebug239963.patch ---
diff -up kdebase-workspace-4.4.85/kwin/main.cpp.kdebug239963 kdebase-workspace-4.4.85/kwin/main.cpp
--- kdebase-workspace-4.4.85/kwin/main.cpp.kdebug239963	2010-06-01 13:10:52.000000000 -0500
+++ kdebase-workspace-4.4.85/kwin/main.cpp	2010-06-13 17:11:17.389165805 -0500
@@ -500,6 +500,10 @@ KDE_EXPORT int kdemain( int argc, char *
     // HACK: this is needed to work around a Qt4.4.0RC1 bug (#157659)
     setenv( "QT_SLOW_TOPLEVEL_RESIZE", "1", true );
 
+    // Disable the glib event loop integration, since it seems to be responsible
+    // for several bug reports about high CPU usage (bug #239963)
+    setenv( "QT_NO_GLIB", "1", true );
+
     KWin::Application a;
     KWin::SessionManager weAreIndeed;
     KWin::SessionSaveDoneHelper helper;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -p -r1.406 -r1.407
--- kdebase-workspace.spec	9 Jun 2010 15:14:48 -0000	1.406
+++ kdebase-workspace.spec	13 Jun 2010 22:10:40 -0000	1.407
@@ -13,7 +13,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.4.85
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -55,14 +55,19 @@ Patch21: kdebase-workspace-4.3.98-platfo
 # fix the Games menu in the classic menu mixing up Name and Description
 Patch22: kdebase-workspace-4.4.0-classicmenu-games.patch
 
-# upstreamable patches:
+## upstreamable patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
 Patch50: kdebase-workspace-4.3.3-kde#171685.patch
 # "Adding "Enable networking" button to knetworkmanager"
 # https://bugzilla.redhat.com/598765 https://bugs.kde.org/238325
 Patch52: kdebase-workspace-4.4.85-kdebug238325.patch 
 
-# 4.5 patches
+## 4.5 patches
+
+## trunk patches
+# Significant CPU penalty for using Kwin effects, https://bugs.kde.org/239963
+Patch200: kdebase-workspace-4.4.85-kdebug239963.patch
+
 
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
@@ -312,6 +317,8 @@ Requires: akonadi
 
 # 4.5 patches
 
+# trunk patches
+%patch200 -p1 -b .kdebug239963
 
 
 %build
@@ -682,6 +689,9 @@ fi
 
 
 %changelog
+* Sun Jun 13 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.85-3
+- Significant CPU penalty for using Kwin effects (kde#239963)
+
 * Tue Jun 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.85-2
 - Adding "Enable networking" button to knetworkmanager (rh#598765, kde#238325)
 - drop < f12 conditionals