* Fir Jul 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.95-3
- plasma animation crasher (kdebug#198338)
This commit is contained in:
parent
259bc7b29c
commit
88dd30de7d
|
@ -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
11
kdelibs.spec
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
Summary: K Desktop Environment 4 - Libraries
|
Summary: K Desktop Environment 4 - Libraries
|
||||||
Version: 4.2.95
|
Version: 4.2.95
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
|
@ -85,9 +85,8 @@ Patch18: kdelibs-4.1.72-kstandarddirs.patch
|
||||||
Patch20: kdelibs-4.1.70-cmake.patch
|
Patch20: kdelibs-4.1.70-cmake.patch
|
||||||
|
|
||||||
# upstream
|
# upstream
|
||||||
# 4.2 branch
|
|
||||||
|
|
||||||
# 4.3 branch
|
# 4.3 branch
|
||||||
|
Patch100: kdelibs-4.2.95-kdebug#198338.patch
|
||||||
|
|
||||||
BuildRequires: qt4-devel >= 4.4.0
|
BuildRequires: qt4-devel >= 4.4.0
|
||||||
# qt4%{_?_isa} isn't provided yet -- Rex
|
# 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
|
%patch20 -p1 -b .xxcmake
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
# 4.2
|
|
||||||
|
|
||||||
# 4.3
|
# 4.3
|
||||||
|
%patch100 -p4 -b .kdebug#198338
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
@ -403,6 +401,9 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Jul 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.2.95-2
|
||||||
- up min versions, phonon, strigi, soprano (#509511)
|
- up min versions, phonon, strigi, soprano (#509511)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue