Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2015-07-14 17:23:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeclarative" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2015-06-23 12:07:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2015-07-14 17:23:05.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Jul 8 18:58:24 UTC 2015 - [email protected] + +- Added 0001-Only-resize-plot-texture-if-size-actually-changes.patch + (kde#346134, kde#348385) + +------------------------------------------------------------------- +Sun Jul 5 18:44:54 UTC 2015 - [email protected] + +- Update to 5.12.0 + * Add QQC clone of KColorButton + * Assign a QmlObject for each kdeclarative instance when possible + * Make Qt.quit() from QML code work + * Merge branch 'mart/singleQmlEngineExperiment' + * Implement sizeHint based on implicitWidth/height + * Subclass of QmlObject with static engine + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.12.0.php + +------------------------------------------------------------------- Old: ---- kdeclarative-5.11.0.tar.xz New: ---- 0001-Only-resize-plot-texture-if-size-actually-changes.patch kdeclarative-5.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.VoDzhG/_old 2015-07-14 17:23:06.000000000 +0200 +++ /var/tmp/diff_new_pack.VoDzhG/_new 2015-07-14 17:23:06.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Declarative5 -%define _tar_path 5.11 +%define _tar_path 5.12 Name: kdeclarative -Version: 5.11.0 +Version: 5.12.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -49,6 +49,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-Only-resize-plot-texture-if-size-actually-changes.patch +Patch0: 0001-Only-resize-plot-texture-if-size-actually-changes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -104,6 +106,7 @@ %lang_package -n %lname %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build ++++++ 0001-Only-resize-plot-texture-if-size-actually-changes.patch ++++++ >From f399aa8b48db02f809454be5427c0ca01b809882 Mon Sep 17 00:00:00 2001 From: David Edmundson <[email protected]> Date: Tue, 7 Jul 2015 11:54:11 +0100 Subject: [PATCH 1/1] Only resize plot texture if size actually changes Test compared rounded QSize with QSizeF, which will be almost always returning true. CCBUG: 348385 REVIEW: 124280 --- src/qmlcontrols/kquickcontrolsaddons/plotter.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp b/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp index 9a939c3626fc6321a39e898b88e5b69c14b4e1b7..93da3c75e87aa21f6c5356b35764ded03f01d2e7 100644 --- a/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp +++ b/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp @@ -799,16 +799,15 @@ QSGNode *Plotter::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updateP u_matrix = s_program->uniformLocation("matrix"); } - if (n->texture()->textureSize() != boundingRect().size()) { - //we need a size always equal or smaller, size.toSize() won't do - static_cast<PlotTexture *>(n->texture())->recreate(QSize(qRound(boundingRect().size().width()), qRound(boundingRect().size().height()))); + //we need a size always equal or smaller, size.toSize() won't do + const QSize targetTextureSize(qRound(boundingRect().size().width()), qRound(boundingRect().size().height())); + if (n->texture()->textureSize() != targetTextureSize) { + static_cast<PlotTexture *>(n->texture())->recreate(targetTextureSize); m_matrix = QMatrix4x4(); - m_matrix.ortho(0, qRound(width()), 0, qRound(height()), -1, 1); + m_matrix.ortho(0, targetTextureSize.width(), 0, targetTextureSize.height(), -1, 1); } - n->setRect(QRect(QPoint(0,0), - QSize(qRound(boundingRect().size().width()), - qRound(boundingRect().size().height())))); + n->setRect(QRect(QPoint(0,0), targetTextureSize)); return n; } -- 2.4.5 ++++++ kdeclarative-5.11.0.tar.xz -> kdeclarative-5.12.0.tar.xz ++++++ ++++ 1649 lines of diff (skipped)
