From 7b57ddeb5d7fa0669f509b95646468e58bb0e75a689b3b74658ed97eaf8ee3e2 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 28 Dec 2020 11:08:06 +0000 Subject: [PATCH] Accepting request 858919 from home:jgwang:branches:KDE:Extra Update to version 2.11.2 OBS-URL: https://build.opensuse.org/request/show/858919 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=65 --- 0001-Fix-build-with-Qt-5.15.patch | 24 ------------------------ fix-build-with-qt-5.15-again.patch | 25 ------------------------- gammaray-2.11.1.tar.gz | 3 --- gammaray-2.11.2.tar.gz | 3 +++ gammaray.changes | 12 ++++++++++++ gammaray.spec | 4 +--- 6 files changed, 16 insertions(+), 55 deletions(-) delete mode 100644 0001-Fix-build-with-Qt-5.15.patch delete mode 100644 fix-build-with-qt-5.15-again.patch delete mode 100644 gammaray-2.11.1.tar.gz create mode 100644 gammaray-2.11.2.tar.gz diff --git a/0001-Fix-build-with-Qt-5.15.patch b/0001-Fix-build-with-Qt-5.15.patch deleted file mode 100644 index f729bd7..0000000 --- a/0001-Fix-build-with-Qt-5.15.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ec9fe40808e094b3ee6283256ae18f1a3bb95bb7 Mon Sep 17 00:00:00 2001 -From: Volker Krause -Date: Wed, 18 Mar 2020 09:07:11 +0100 -Subject: [PATCH] Fix build with Qt 5.15 - ---- - plugins/widgetinspector/overlaywidget.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugins/widgetinspector/overlaywidget.h b/plugins/widgetinspector/overlaywidget.h -index 5e0bb1352..ca102a9ea 100644 ---- a/plugins/widgetinspector/overlaywidget.h -+++ b/plugins/widgetinspector/overlaywidget.h -@@ -30,6 +30,7 @@ - #define GAMMARAY_WIDGETINSPECTOR_OVERLAYWIDGET_H - - #include -+#include - #include - #include - --- -2.26.0 - diff --git a/fix-build-with-qt-5.15-again.patch b/fix-build-with-qt-5.15-again.patch deleted file mode 100644 index 57aa846..0000000 --- a/fix-build-with-qt-5.15-again.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7cd17bca4fb8369b5e1c5822ac1c79574766d3e7 Mon Sep 17 00:00:00 2001 -From: Eike Ziller -Date: Wed, 6 May 2020 10:34:01 +0200 -Subject: [PATCH] Fix build against Qt 5.15 - -After qtbase/487dd80bce9c6006f349ccb09222e1c308200f0a which adds -a meta type declaration ---- - plugins/network/networksupport.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/network/networksupport.cpp b/plugins/network/networksupport.cpp -index 32191d0ca..97db54222 100644 ---- a/plugins/network/networksupport.cpp -+++ b/plugins/network/networksupport.cpp -@@ -89,7 +89,9 @@ Q_DECLARE_METATYPE(QNetworkInterface::InterfaceFlags) - #endif - Q_DECLARE_METATYPE(QNetworkProxy::Capabilities) - Q_DECLARE_METATYPE(QNetworkProxy::ProxyType) -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - Q_DECLARE_METATYPE(QSocketNotifier::Type) -+#endif - #ifndef QT_NO_SSL - Q_DECLARE_METATYPE(QSsl::KeyAlgorithm) - Q_DECLARE_METATYPE(QSsl::KeyType) diff --git a/gammaray-2.11.1.tar.gz b/gammaray-2.11.1.tar.gz deleted file mode 100644 index fb284d4..0000000 --- a/gammaray-2.11.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87a1d72ad1ad6d1a0156c54a85b0976ab38c6a64136458ca7c4ee491566d25d0 -size 10332434 diff --git a/gammaray-2.11.2.tar.gz b/gammaray-2.11.2.tar.gz new file mode 100644 index 0000000..c3b260c --- /dev/null +++ b/gammaray-2.11.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bba4f21a2bc81ec8ab50dce5218c7a375b92d64253c690490a6fcb384c2ff9f3 +size 10333340 diff --git a/gammaray.changes b/gammaray.changes index 3afb403..463f6d5 100644 --- a/gammaray.changes +++ b/gammaray.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Dec 28 02:50:33 UTC 2020 - Wang Jun + +- Update to version 2.11.2 + * Prefer picking QtQuick items in fully visible parent-child chains. + * Fix deadlock with Qt 5.15 on high DPI screens. + * Fix QtQuick detection on older macOS versions. + * Support for Qt 5.15. +- Drop patches, now upstream: + * 0001-Fix-build-with-Qt-5.15.patch + * fix-build-with-qt-5.15-again.patch + ------------------------------------------------------------------- Tue Jun 2 09:58:03 UTC 2020 - Fabian Vogt diff --git a/gammaray.spec b/gammaray.spec index d2b7edd..91e8c6b 100644 --- a/gammaray.spec +++ b/gammaray.spec @@ -21,7 +21,7 @@ %define tarname GammaRay Name: gammaray -Version: 2.11.1 +Version: 2.11.2 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 -Patch2: 0001-Fix-build-with-Qt-5.15.patch -Patch3: fix-build-with-qt-5.15-again.patch BuildRequires: binutils-devel BuildRequires: cmake >= 3.1 BuildRequires: doxygen