This commit is contained in:
Than Ngo 2009-07-10 20:13:40 +00:00
parent a4c231454d
commit 9674377c21
4 changed files with 7 additions and 50 deletions

View File

@ -1,2 +1,3 @@
kdelibs-4.2.90.tar.bz2
kdelibs-4.2.95.tar.bz2
kdelibs-4.2.96.tar.bz2

View File

@ -1,46 +0,0 @@
--- 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 +=

View File

@ -4,8 +4,8 @@
%define strigi_ver 0.6.5
Summary: K Desktop Environment 4 - Libraries
Version: 4.2.95
Release: 4%{?dist}
Version: 4.2.96
Release: 1%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -86,7 +86,6 @@ Patch20: kdelibs-4.1.70-cmake.patch
# upstream
# 4.3 branch
Patch100: kdelibs-4.2.95-kdebug#198338.patch
BuildRequires: qt4-devel >= 4.4.0
# qt4%{_?_isa} isn't provided yet -- Rex
@ -401,6 +400,9 @@ rm -rf %{buildroot}
%changelog
* Fri Jul 10 2009 Than Ngo <than@redhat.com> - 4.2.96-1
- 4.3rc2
* Wed Jul 08 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.95-4
- fix CMake dependency in parallel_devel patch (#510259, CHIKAMA Masaki)

View File

@ -1 +1 @@
54cf6d01b0156c2b82fe23321b338007 kdelibs-4.2.95.tar.bz2
a7f2d4eb81c05f9e6c97a8fa09670c0f kdelibs-4.2.96.tar.bz2