rpms/kdelibs/devel kdelibs-4.4.85-kdebug241298.patch, NONE, 1.1 kdelibs.spec, 1.637, 1.638

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18938

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.4.85-kdebug241298.patch 
Log Message:
* Thu Jun 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.85-3
- Plasma crash on startup (kde#241298)


kdelibs-4.4.85-kdebug241298.patch:
 containment.cpp |   10 ++++++++--
 corona.cpp      |    1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-4.4.85-kdebug241298.patch ---
--- trunk/KDE/kdelibs/plasma/containment.cpp	2010/06/10 17:07:31	1136766
+++ trunk/KDE/kdelibs/plasma/containment.cpp	2010/06/10 17:07:50	1136767
@@ -460,10 +460,16 @@
     foreach (Applet *applet, applets) {
         applet->restore(*applet->d->mainConfigGroup());
         applet->init();
-        // We have to flush the applet constraints manually
-        applet->flushPendingConstraintsEvents();
         kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Applet" << applet->name();
     }
+
+    q->flushPendingConstraintsEvents();
+
+    foreach (Applet *applet, applets) {
+        applet->flushPendingConstraintsEvents();
+    }
+
+    kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Containment's applets initialized" << q->name();
 }
 
 void Containment::restoreContents(KConfigGroup &group)
--- trunk/KDE/kdelibs/plasma/corona.cpp	2010/06/10 17:07:31	1136766
+++ trunk/KDE/kdelibs/plasma/corona.cpp	2010/06/10 17:07:50	1136767
@@ -508,7 +508,6 @@
 
     foreach (Containment *containment, newContainments) {
         containment->updateConstraints(Plasma::StartupCompletedConstraint);
-        containment->flushPendingConstraintsEvents();
         containment->d->initApplets();
         emit q->containmentAdded(containment);
         kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Containment" << containment->name();


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -p -r1.637 -r1.638
--- kdelibs.spec	8 Jun 2010 16:29:13 -0000	1.637
+++ kdelibs.spec	17 Jun 2010 18:06:45 -0000	1.638
@@ -8,7 +8,7 @@
 
 Summary: KDE Libraries
 Version: 4.4.85
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -82,6 +82,8 @@ Patch28: kdelibs-4.4.80-icon-name-qt47.p
 ## 4.4 upstream
 
 ## trunk upstream
+# https://bugs.kde.org/241298
+Patch100: kdelibs-4.4.85-kdebug241298.patch
 
 ## security fix
 # Not Upstreamed? why not ? -- Rex
@@ -232,6 +234,7 @@ format for easy browsing.
 # upstreamable patches
 
 # upstream patches
+%patch100 -p3 -b .kdebug241298
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -447,6 +450,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jun 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.85-3
+- Plasma crash on startup (kde#241298)
+
 * Tue Jun 08 2010 Jaroslav Reznik <jreznik at redhat.com> - 6:4.4.85-2
 - (Build)Requires: docbook-dtds, docbook-style-xsl
 - drop fedora < 12 conditionals