rpms/kdebase-workspace/devel kdebase-workspace-4.0.0-kde#155122.patch, NONE, 1.1 kdebase-workspace.spec, 1.23, 1.24

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27026

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.0-kde#155122.patch 
Log Message:
* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0.0-5
- initial login with white background (#428131, kde#155122)


kdebase-workspace-4.0.0-kde#155122.patch:

--- NEW FILE kdebase-workspace-4.0.0-kde#155122.patch ---
--- trunk/KDE/kdebase/workspace/plasma/containments/desktop/renderthread.cpp	2007/12/12 02:24:42	747476
+++ trunk/KDE/kdebase/workspace/plasma/containments/desktop/renderthread.cpp	2008/01/05 14:41:28	757616
@@ -45,6 +45,7 @@
                           Background::ResizeMethod method,
                           Qt::TransformationMode mode)
 {
+    int token;
     {
         QMutexLocker lock(&m_mutex);
         m_file = file;
@@ -52,6 +53,7 @@
         m_method = method;
         m_mode = mode;
         m_restart = true;
+        token = ++m_current_token;
     }
     
     if (!isRunning()) {
@@ -61,7 +63,7 @@
         m_condition.wakeOne();
     }
     
-    return ++m_current_token;
+    return token;
 }
 
 void RenderThread::run()


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kdebase-workspace.spec	9 Jan 2008 14:15:05 -0000	1.23
+++ kdebase-workspace.spec	9 Jan 2008 14:27:03 -0000	1.24
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.0
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -15,8 +15,10 @@
 
 Patch1: kdebase-workspace-4.0.0-redhat-startkde.patch
 Patch2: kdebase-workspace-4.0.0-consolekit-kdm.patch
-# see http://bugs.kde.org/153193#c35 
+# http://bugs.kde.org/153193#c35,36
 Patch3: kdebase-workspace-4.0.0-systemtray.patch
+# http://bugzilla.redhat.com/428131, http://bugs.kde.org/155122
+Patch4: kdebase-workspace-4.0.0-kde#155122.patch
 
 # upgrade path for former kde-redhat'ers
 Obsoletes: kdebase-kdm < 6:%{version}-%{release}
@@ -101,6 +103,7 @@
 %patch2 -p1 -b .consolekit
 # 
 %patch3 -p1 -b .systemtray
+%patch4 -p4 -b .kde#155122
 
 
 %build
@@ -212,8 +215,11 @@
 
 
 %changelog
+* Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0.0-5
+- initial login with white background (#428131, kde#155122)
+
 * Wed Jan 09 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0.0-4
-- use upstream systemtray patch (#427442, kde#153193#c35)
+- use upstream systemtray patch (#427442, kde#153193)
 
 * Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0.0-3
 - respun tarball