From 88dd30de7de6210accf7c293b2bba2b417f01f64 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sat, 4 Jul 2009 00:52:00 +0000
Subject: [PATCH] * Fir Jul 03 2009 Rex Dieter <rdieter@fedoraproject.org> -
 4.2.95-3 - plasma animation crasher (kdebug#198338)

---
 kdelibs-4.2.95-kdebug#198338.patch | 46 ++++++++++++++++++++++++++++++
 kdelibs.spec                       | 11 +++----
 2 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 kdelibs-4.2.95-kdebug#198338.patch

diff --git a/kdelibs-4.2.95-kdebug#198338.patch b/kdelibs-4.2.95-kdebug#198338.patch
new file mode 100644
index 0000000..44c85e9
--- /dev/null
+++ b/kdelibs-4.2.95-kdebug#198338.patch
@@ -0,0 +1,46 @@
+--- 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 +=
diff --git a/kdelibs.spec b/kdelibs.spec
index d6657ea..3e345bd 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -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.patch
 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@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %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@fedoraproject.org> - 4.2.95-3
+- plasma animation crasher (kdebug#198338)
+
 * Fri Jul 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.95-2
 - up min versions, phonon, strigi, soprano (#509511)