diff --git a/kdelibs-4.1.1-kde#157789.patch b/kdelibs-4.1.1-kde#157789.patch index f1c3aa2..8c9ed80 100644 --- a/kdelibs-4.1.1-kde#157789.patch +++ b/kdelibs-4.1.1-kde#157789.patch @@ -78,7 +78,7 @@ diff -ur kdelibs-4.1.1/khtml/imload/decoders/gifloader.cpp kdelibs-4.1.1-kde#157 diff -ur kdelibs-4.1.1/khtml/imload/image.cpp kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp --- kdelibs-4.1.1/khtml/imload/image.cpp 2008-05-21 13:06:09.000000000 +0200 -+++ kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp 2008-09-19 01:12:02.000000000 +0200 ++++ kdelibs-4.1.1-kde#157789/khtml/imload/image.cpp 2008-09-19 02:20:03.000000000 +0200 @@ -48,6 +48,7 @@ inError = false; @@ -87,20 +87,17 @@ diff -ur kdelibs-4.1.1/khtml/imload/image.cpp kdelibs-4.1.1-kde#157789/khtml/iml noUpdates(); } -@@ -214,6 +215,12 @@ +@@ -214,6 +215,9 @@ } else { -+ for (PixmapPlane* cur = original; cur; cur = cur->nextFrame) -+ { -+ if (cur->animProvider) -+ cur->animProvider->setShowAnimations(animationAdvice); -+ } ++ if (original && original->animProvider) ++ original->animProvider->setShowAnimations(animationAdvice); + fullyDecoded = true; owner->imageDone(this); } -@@ -452,6 +459,19 @@ +@@ -452,6 +456,16 @@ return original->parent->format.hasAlpha(); } @@ -109,11 +106,8 @@ diff -ur kdelibs-4.1.1/khtml/imload/image.cpp kdelibs-4.1.1-kde#157789/khtml/iml + if (animationAdvice != newAdvice) + { + animationAdvice = newAdvice; -+ for (PixmapPlane* cur = original; cur; cur = cur->nextFrame) -+ { -+ if (cur->animProvider) -+ cur->animProvider->setShowAnimations(newAdvice); -+ } ++ if (original && original->animProvider) ++ original->animProvider->setShowAnimations(newAdvice); + } +} + @@ -197,3 +191,14 @@ diff -ur kdelibs-4.1.1/khtml/misc/loader.cpp kdelibs-4.1.1-kde#157789/khtml/misc } // void CachedImage::deleteMovie() +diff -ur kdelibs-4.1.1/khtml/misc/loader.h kdelibs-4.1.1-kde#157789/khtml/misc/loader.h +--- kdelibs-4.1.1/khtml/misc/loader.h 2008-05-21 13:05:54.000000000 +0200 ++++ kdelibs-4.1.1-kde#157789/khtml/misc/loader.h 2008-09-19 02:15:41.000000000 +0200 +@@ -363,7 +363,6 @@ + bool typeChecked : 1; + bool isFullyTransparent : 1; + bool monochrome : 1; +- KHTMLSettings::KAnimationAdvice m_showAnimations : 2; + + friend class Cache; + friend class ::KHTMLPart; diff --git a/kdelibs.spec b/kdelibs.spec index d158f00..18dde3a 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -80,10 +80,6 @@ Patch18: kdelibs-4.1.0-kstandarddirs.patch # fix running commands in kglobalconfig before KComponentData init (#455130) Patch19: kdelibs-4.1.0-#455130.patch Patch20: kdelibs-4.1.1-cmake.patch -# make "Stop Animations" work again in Konqueror -# https://bugs.kde.org/show_bug.cgi?id=157789 -# submitted upstream (attached to above bug report) -Patch21: kdelibs-4.1.1-kde#157789.patch ## upstream patches Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch @@ -95,6 +91,10 @@ Patch105: kdelibs-4.1.1-kde#858795-mimeassoc.patch Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch Patch108: kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch +# make "Stop Animations" work again in Konqueror +# https://bugs.kde.org/show_bug.cgi?id=157789 +# submitted upstream (attached to above bug report) +Patch109: kdelibs-4.1.1-kde#157789.patch BuildRequires: qt4-devel >= 4.4.0 Requires: qt4 >= %{_qt4_version} @@ -220,7 +220,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch18 -p1 -b .kstandarddirs %patch19 -p1 -b .#455130 %patch20 -p1 -b .cmake -%patch21 -p1 -b .kde#157789 ## upstream patches %patch100 -p0 -b .kde#169447-khtml-regression @@ -232,6 +231,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch106 -p0 -b .kde#860095-khtml-scroll-crash %patch107 -p0 -b .kde#860005-emoticons %patch108 -p0 -b .kde#170461-khtml-regression +%patch109 -p1 -b .kde#157789 %build @@ -392,7 +392,7 @@ rm -rf %{buildroot} %changelog -* Thu Sep 18 2008 Kevin Kofler 4.1.1-12 +* Fri Sep 19 2008 Kevin Kofler 4.1.1-12 - make "Stop Animations" work again in Konqueror (KDE 4 regression kde#157789) * Thu Sep 18 2008 Than Ngo 4.1.1-11