Timo Jyrinki has proposed merging lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
Commit message: * Fix_QSmoothedAnimation_sometimes_getting_stuck.patch - Fix SmoothedAnimation getting stuck (LP: #1305015) (LP: #1300326) Requested reviews: Kubuntu Packagers (kubuntu-packagers) Related bugs: Bug #1300326 in qtdeclarative-opensource-src (Ubuntu): "Shell randomly freezes with grey tint" https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1300326 Bug #1305015 in qtdeclarative-opensource-src (Ubuntu): "[PATCH] Fix QSmoothedAnimation sometimes getting stuck" https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1305015 For more details, see: https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives/+merge/215080 -- https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives/+merge/215080 Your team Kubuntu Packagers is requested to review the proposed merge of lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative_fix_smoothedanimation_and_sync_with_archives into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src.
=== modified file 'debian/changelog' --- debian/changelog 2014-04-03 08:34:03 +0000 +++ debian/changelog 2014-04-10 06:01:40 +0000 @@ -1,3 +1,19 @@ +qtdeclarative-opensource-src (5.2.1-3ubuntu15) trusty; urgency=medium + + * Fix_QSmoothedAnimation_sometimes_getting_stuck.patch + - Fix SmoothedAnimation getting stuck (LP: #1305015) (LP: #1300326) + + -- Timo Jyrinki <[email protected]> Thu, 10 Apr 2014 09:00:28 +0300 + +qtdeclarative-opensource-src (5.2.1-3ubuntu14) trusty; urgency=medium + + * libqt5quick5.symbols, libqt5quicktest5.symbols: adding dep alternatives + for the version compatible with OpenGLES (provided by another src pkg) + * debian/control: changing qtdeclarative5-dev deps so it can also be used + together with the ones built with the OpenGLES backend by default + + -- Ricardo Salveti de Araujo <[email protected]> Thu, 10 Apr 2014 00:33:21 -0300 + qtdeclarative-opensource-src (5.2.1-3ubuntu13) trusty; urgency=medium * debian/patches/Support-RFC2822Date-date-format-similar-to-V8.patch === modified file 'debian/control' --- debian/control 2014-02-26 11:09:29 +0000 +++ debian/control 2014-04-10 06:01:40 +0000 @@ -201,8 +201,8 @@ Section: libdevel Architecture: any Depends: libqt5qml5 (= ${binary:Version}), - libqt5quick5 (= ${binary:Version}), - libqt5quickparticles5 (= ${binary:Version}), + libqt5quick5 (= ${binary:Version}) | libqt5quick5-gles, + libqt5quickparticles5 (= ${binary:Version}) | libqt5quickparticles5-gles, libqt5quicktest5 (= ${binary:Version}), qtbase5-dev, ${misc:Depends} === modified file 'debian/libqt5quick5.symbols' --- debian/libqt5quick5.symbols 2014-02-28 05:43:33 +0000 +++ debian/libqt5quick5.symbols 2014-04-10 06:01:40 +0000 @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.2.1 amd64 i386 powerpc -libQt5Quick.so.5 libqt5quick5 #MINVER# -| libqt5quick5 #MINVER#, qtdeclarative-abi-5-2-1 +libQt5Quick.so.5 libqt5quick5 #MINVER# | libqt5quick5-gles #MINVER# +| libqt5quick5 #MINVER# | libqt5quick5-gles #MINVER#, qtdeclarative-abi-5-2-1 _ZN10QQuickItem10classBeginEv@Base 5.0.2 _ZN10QQuickItem10itemChangeENS_10ItemChangeERKNS_14ItemChangeDataE@Base 5.0.2 _ZN10QQuickItem10resetWidthEv@Base 5.0.2 === modified file 'debian/libqt5quickparticles5.symbols' --- debian/libqt5quickparticles5.symbols 2014-02-28 05:43:33 +0000 +++ debian/libqt5quickparticles5.symbols 2014-04-10 06:01:40 +0000 @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.2.1 i386 -libQt5QuickParticles.so.5 libqt5quickparticles5 #MINVER# -| libqt5quickparticles5 #MINVER#, qtdeclarative-abi-5-2-1 +libQt5QuickParticles.so.5 libqt5quickparticles5 #MINVER# | libqt5quickparticles5-gles #MINVER# +| libqt5quickparticles5 #MINVER# | libqt5quickparticles5-gles #MINVER#, qtdeclarative-abi-5-2-1 (arch=amd64 i386)_ZN10QByteArray7reserveEi@Base 5.2.1 _ZN21QQuickParticlesModule12defineModuleEv@Base 5.0.2 1 _ZTIN9QV8Engine9DeletableE@Base 5.0.2 1 === added file 'debian/patches/Fix_QSmoothedAnimation_sometimes_getting_stuck.patch' --- debian/patches/Fix_QSmoothedAnimation_sometimes_getting_stuck.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/Fix_QSmoothedAnimation_sometimes_getting_stuck.patch 2014-04-10 06:01:40 +0000 @@ -0,0 +1,15 @@ +diff -ru qtdeclarative-opensource-src-5.2.1/src/quick/util/qquicksmoothedanimation.cpp qtdeclarative-opensource-src-5.2.1-patched/src/quick/util/qquicksmoothedanimation.cpp +--- qtdeclarative-opensource-src-5.2.1/src/quick/util/qquicksmoothedanimation.cpp 2014-02-01 21:38:03.000000000 +0100 ++++ qtdeclarative-opensource-src-5.2.1-patched/src/quick/util/qquicksmoothedanimation.cpp 2014-04-09 13:24:15.977541285 +0200 +@@ -242,7 +242,10 @@ + + void QSmoothedAnimation::updateCurrentTime(int t) + { +- if (!isRunning() && !isPaused()) // This can happen if init() stops the animation in some cases ++ // We should drop the delayedStopTimer->isActive() part ++ // when updating to 5.3 since the bug seems to be fixed ++ // in a more elaborate way in there ++ if ((!isRunning() && !isPaused()) || delayedStopTimer->isActive()) // This can happen if init() stops the animation in some cases + return; + + qreal time_seconds = useDelta ? qreal(QQmlAnimationTimer::instance()->currentDelta()) / 1000. : qreal(t - lastTime) / 1000.; === modified file 'debian/patches/series' --- debian/patches/series 2014-04-03 08:34:03 +0000 +++ debian/patches/series 2014-04-10 06:01:40 +0000 @@ -19,3 +19,4 @@ V4-regalloc-fix-interval-splitting-when-register-pre.patch 0001-Call-tzset-from-getLocalTZA-so-we-learn-about-tz-cha.patch Support-RFC2822Date-date-format-similar-to-V8.patch +Fix_QSmoothedAnimation_sometimes_getting_stuck.patch
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
