diff --git a/0001-Fix-build-against-Qt-5.14.patch b/0001-Fix-build-against-Qt-5.14.patch deleted file mode 100644 index af7946e..0000000 --- a/0001-Fix-build-against-Qt-5.14.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3bde546403e1fe27881bdfee4d0aa0dc4acbe2c7 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 21 Jul 2019 16:53:20 +0200 -Subject: Fix build against Qt 5.14 - -(merged with 7cd6950e96: Fix version check logic) - ---- - plugins/quickinspector/quickinspector.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/quickinspector/quickinspector.cpp b/plugins/quickinspector/quickinspector.cpp -index 1e728b83..17770ed1 100644 ---- a/plugins/quickinspector/quickinspector.cpp -+++ b/plugins/quickinspector/quickinspector.cpp -@@ -654,7 +654,7 @@ void QuickInspector::checkOverlaySettings() - class SGSoftwareRendererPrivacyViolater : public QSGAbstractSoftwareRenderer - { - public: --#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) -+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) && QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - using QSGAbstractSoftwareRenderer::renderableNodes; - #endif - using QSGAbstractSoftwareRenderer::renderNodes; -@@ -684,7 +684,7 @@ void QuickInspector::analyzePainting() - renderer->markDirty(); - renderer->buildRenderList(); - renderer->optimizeRenderList(); --#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) -+#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) || QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) - renderer->renderNodes(&painter); - #else - auto iterator = renderer->renderableNodes().begin(); --- -2.24.0 - diff --git a/gammaray-2.11.0.tar.gz b/gammaray-2.11.0.tar.gz deleted file mode 100644 index 8228f20..0000000 --- a/gammaray-2.11.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab0488d2178c532816d491ab361ac3d362590f0e63912f7198f34c1b582209ca -size 10326200 diff --git a/gammaray-2.11.1.tar.gz b/gammaray-2.11.1.tar.gz new file mode 100644 index 0000000..fb284d4 --- /dev/null +++ b/gammaray-2.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87a1d72ad1ad6d1a0156c54a85b0976ab38c6a64136458ca7c4ee491566d25d0 +size 10332434 diff --git a/gammaray.changes b/gammaray.changes index d1ed898..52bfbc6 100644 --- a/gammaray.changes +++ b/gammaray.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu May 7 07:32:15 UTC 2020 - Fabian Vogt + +- Update to 2.11.1: + * Add OpenGL ES2 fallback for the Qt3D geometry inspector. + * Fix assert on empty text document selections. + * Fix side-effects of using the widget layout overlay on a QSplitter. + * Fix merging of events in the event monitor. + * Fix event order in the event monitor. + * Add event propagation detection for QtQuick pointer events. + * Fix compilation with QT_NO_OPENGL and QT_NO_SSL. + * Adapt QtQuick software renderer inspector to changes in Qt 5.14. + * Fix Android support with Qt 5.14. + * Fix memory leak in event recording when Qt Quick remote view is active. + * Fix possible crash during probe destruction. + * Fix crash due to signal spy changes in Qt 5.14. + * Fix possible crash in the outbound connections view. +- Drop patches, now upstream: + * 0001-Fix-build-against-Qt-5.14.patch + ------------------------------------------------------------------- Fri Apr 3 09:15:56 UTC 2020 - Christophe Giboudeaux diff --git a/gammaray.spec b/gammaray.spec index 99e348c..2be872b 100644 --- a/gammaray.spec +++ b/gammaray.spec @@ -21,7 +21,7 @@ %define tarname GammaRay Name: gammaray -Version: 2.11.0 +Version: 2.11.1 Release: 0 Summary: Introspection/Debugging Tool for Qt Applications License: GPL-2.0-or-later @@ -31,8 +31,6 @@ Source: https://github.com/KDAB/GammaRay/releases/download/v%{version}/% # PATCH-FIX-UPSTREAM Fix_icons_installation.patch -- Don't try to install multiple copies in exotic subdirs Patch0: Fix_icons_installation.patch # PATCH-FIX-UPSTREAM -Patch1: 0001-Fix-build-against-Qt-5.14.patch -# PATCH-FIX-UPSTREAM Patch2: 0001-Fix-build-with-Qt-5.15.patch BuildRequires: binutils-devel BuildRequires: cmake >= 3.1