rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fir Jul 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.95-3 

- plasma animation crasher (kdebug#198338)
This commit is contained in:
Rex Dieter 2009-07-04 00:52:00 +00:00
parent 259bc7b29c
commit 88dd30de7d
2 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
kdelibs-4.2.95-kdebug#198338.patch Normal file
View File

@ -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 +=

11
kdelibs.spec
View File

@ -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)