pool/kdeclarative
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 315926 from KDE:Frameworks5

Browse Source 
Update to 5.12.0

OBS-URL: https://build.opensuse.org/request/show/315926
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdeclarative?expand=0&rev=18
This commit is contained in:
Stephan Kulow
2015-07-14 15:23:04 +00:00
committed by Git OBS Bridge
parent adcce73cff 47e5adc819
commit 4620597ba3
5 changed files with 71 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
0001-Only-resize-plot-texture-if-size-actually-changes.patch Normal file
View File

@@ -0,0 +1,44 @@
From f399aa8b48db02f809454be5427c0ca01b809882 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
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

3
kdeclarative-5.11.0.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d93148c3284d85b31cc79378ba52bbc38aad2a7364a93ecaaf2206b2771c40ea
size 159108

3
kdeclarative-5.12.0.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f521aacf66367c9f76e94c473b158cf78f104f01e006a4c91515c45eb232cc4c
size 163848

19
kdeclarative.changes
View File

@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Wed Jul 8 18:58:24 UTC 2015 - hrvoje.senjan@gmail.com
- Added 0001-Only-resize-plot-texture-if-size-actually-changes.patch
(kde#346134, kde#348385)
-------------------------------------------------------------------
Sun Jul 5 18:44:54 UTC 2015 - hrvoje.senjan@gmail.com
- 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
-------------------------------------------------------------------
Sun Jun 7 19:07:17 UTC 2015 - hrvoje.senjan@gmail.com

7
kdeclarative.spec
View File

@@ -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 @@ Group: System/GUI/KDE
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 @@ Development files.
%lang_package -n %lname
%prep
%setup -q
%patch0 -p1
%build
%cmake_kf5 -d build