rpms/kdelibs/devel kdelibs-4.2.95-kdebug#198338.patch, NONE, 1.1 kdelibs.spec, 1.482, 1.483

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30029

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.95-kdebug#198338.patch 
Log Message:
* Fir Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-3
- plasma animation crasher (kdebug#198338)


kdelibs-4.2.95-kdebug#198338.patch:

--- NEW FILE kdelibs-4.2.95-kdebug#198338.patch ---
--- branches/KDE/4.3/kdelibs/plasma/animator.cpp	2009/06/24 10:17:04	986143
+++ branches/KDE/4.3/kdelibs/plasma/animator.cpp	2009/07/02 22:33:13	990659
@@ -622,6 +622,10 @@
     //kDebug() << "timeEvent, elapsed time: " << elapsed;
 
     foreach (AnimationState *state, d->animatedItems) {
+        if (d->animatedItemsToDelete.contains(state)) {
+            continue;
+        }
+
         if (state->currentInterval <= elapsed) {
             // we need to step forward!
             state->currentFrame +=
@@ -648,6 +652,10 @@
     }
 
     foreach (MovementState *state, d->movingItems) {
+        if (d->movingItemsToDelete.contains(state)) {
+            continue;
+        }
+
         if (state->currentInterval <= elapsed) {
             // we need to step forward!
             state->currentFrame +=
@@ -675,6 +683,10 @@
     }
 
     foreach (ElementAnimationState *state, d->animatedElements) {
+        if (d->animatedElementsToDelete.contains(state)) {
+            continue;
+        }
+
         if (state->currentFrame == state->frames) {
             //kDebug() << "skipping" << state->id << "as it is already at frame"
             //         << state->currentFrame << "of" << state->frames;
@@ -711,6 +723,10 @@
     }
 
     foreach (CustomAnimationState *state, d->customAnims) {
+        if (d->customAnimsToDelete.contains(state)) {
+            continue;
+        }
+
         if (state->currentInterval <= elapsed) {
             // advance the frame
             state->currentFrame +=


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -p -r1.482 -r1.483
--- kdelibs.spec	3 Jul 2009 10:53:26 -0000	1.482
+++ kdelibs.spec	4 Jul 2009 00:52:00 -0000	1.483
@@ -5,7 +5,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.95
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -85,9 +85,8 @@ Patch18: kdelibs-4.1.72-kstandarddirs.pa
 Patch20: kdelibs-4.1.70-cmake.patch
 
 # upstream
-# 4.2 branch
-
 # 4.3 branch
+Patch100: kdelibs-4.2.95-kdebug#198338.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -218,9 +217,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
 %patch20 -p1 -b .xxcmake
 
 # upstream patches
-# 4.2
-
 # 4.3
+%patch100 -p4 -b .kdebug#198338
 
 
 %build
@@ -403,6 +401,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fir Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-3
+- plasma animation crasher (kdebug#198338)
+
 * Fri Jul 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-2
 - up min versions, phonon, strigi, soprano (#509511)