diff --git a/0001-Don-t-refresh-the-entire-window-when-we-render-the-p.patch b/0001-Don-t-refresh-the-entire-window-when-we-render-the-p.patch deleted file mode 100644 index f661366..0000000 --- a/0001-Don-t-refresh-the-entire-window-when-we-render-the-p.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7a6a2cda780784e504960c96b4b41241ddf10531 Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Mon, 27 Jul 2015 12:54:17 +0200 -Subject: [PATCH 1/1] Don't refresh the entire window when we render the - plotter - -This means the window is only updated when the plotter changes, rather -than effectively every possible frame. - -Reviewed by: Marco Martin - -CCBUG: 348385 ---- - src/qmlcontrols/kquickcontrolsaddons/plotter.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp b/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp -index 93da3c75e87aa21f6c5356b35764ded03f01d2e7..233dd6b9bc0dbeddcbeb8ee02ebc500bf10282b3 100644 ---- a/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp -+++ b/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp -@@ -709,9 +709,6 @@ void Plotter::render() - - // Delete the VBO - glDeleteBuffers(1, &vbo); -- if (window()) { -- window()->update(); -- } - } - - QSGNode *Plotter::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) --- -2.4.6 - diff --git a/0001-Only-resize-plot-texture-if-size-actually-changes.patch b/0001-Only-resize-plot-texture-if-size-actually-changes.patch deleted file mode 100644 index 26c781e..0000000 --- a/0001-Only-resize-plot-texture-if-size-actually-changes.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f399aa8b48db02f809454be5427c0ca01b809882 Mon Sep 17 00:00:00 2001 -From: David Edmundson -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(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(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 - diff --git a/kdeclarative-5.12.0.tar.xz b/kdeclarative-5.12.0.tar.xz deleted file mode 100644 index 2db111b..0000000 --- a/kdeclarative-5.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f521aacf66367c9f76e94c473b158cf78f104f01e006a4c91515c45eb232cc4c -size 163848 diff --git a/kdeclarative-5.13.0.tar.xz b/kdeclarative-5.13.0.tar.xz new file mode 100644 index 0000000..ade28cb --- /dev/null +++ b/kdeclarative-5.13.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24c082c504cefcf54b39579e73fae697c4d350847df0ddeb55e1e12b80a6c5b0 +size 164172 diff --git a/kdeclarative.changes b/kdeclarative.changes index cdb6e44..f1cee79 100644 --- a/kdeclarative.changes +++ b/kdeclarative.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Aug 4 19:20:20 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.13.0 + * The Qt version requirement has been bumped from 5.2 to 5.3 + * Debug output has been ported to categorized output, for less + noise by default + * Docbook documentation has been reviewed and updated + * Fix deprecated KRun::run call + * Same behavior of MouseArea to map coords of filtered child + events + * Detect initial face icon being created + * Don't refresh the entire window when we render the plotter + (kde#348385) + * add the userPaths context property + * Don't choke on empty QIconItem + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.13.0.php +- Drop patches merged upstream: + 0001-Only-resize-plot-texture-if-size-actually-changes.patch + 0001-Don-t-refresh-the-entire-window-when-we-render-the-p.patch + ------------------------------------------------------------------- Mon Jul 27 16:07:54 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kdeclarative.spec b/kdeclarative.spec index 387bec8..1bc38c8 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Declarative5 -%define _tar_path 5.12 +%define _tar_path 5.13 Name: kdeclarative -Version: 5.12.0 +Version: 5.13.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -38,21 +38,17 @@ BuildRequires: kpackage-devel >= %{_tar_path} BuildRequires: kwidgetsaddons-devel >= %{_tar_path} BuildRequires: kwindowsystem-devel >= %{_tar_path} BuildRequires: libepoxy-devel -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Qml) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Quick) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 +BuildRequires: cmake(Qt5Core) >= 5.3.0 +BuildRequires: cmake(Qt5Gui) >= 5.3.0 +BuildRequires: cmake(Qt5Qml) >= 5.3.0 +BuildRequires: cmake(Qt5Quick) >= 5.3.0 +BuildRequires: cmake(Qt5Test) >= 5.3.0 Summary: Integration of QML and KDE workspaces License: LGPL-2.1+ 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 -# PATCH-FIX-UPSTREAM 0001-Don-t-refresh-the-entire-window-when-we-render-the-p.patch -Patch1: 0001-Don-t-refresh-the-entire-window-when-we-render-the-p.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -99,7 +95,7 @@ Requires: kconfig-devel >= %{_tar_path} Requires: kcoreaddons-devel >= %{_tar_path} Requires: kpackage-devel >= %{_tar_path} Requires: libKF5QuickAddons5 = %{version} -Requires: pkgconfig(Qt5Qml) >= 5.2.0 +Requires: cmake(Qt5Qml) >= 5.3.0 %description devel KDeclarative provides integration of QML and KDE workspaces. @@ -108,8 +104,6 @@ Development files. %lang_package -n %lname %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %cmake_kf5 -d build