OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=57

0001-Fix-build-against-Qt-5.14.patch

@@ -0,0 +1,36 @@
+From 3bde546403e1fe27881bdfee4d0aa0dc4acbe2c7 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+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
+

gammaray.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Dec  7 09:53:39 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add 0001-Fix-build-against-Qt-5.14.patch
+
 -------------------------------------------------------------------
 Tue Oct 29 20:48:53 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

gammaray.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gammaray
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 # Required for the "highly experimental" object visualizer plugin, only VTK 7.1 supported
 %bcond_with     vtk
 
@@ -29,6 +30,8 @@ URL:            https://www.kdab.com/gammaray
 Source:         https://github.com/KDAB/GammaRay/releases/download/v%{version}/%{name}-%{version}.tar.gz
 # 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
 BuildRequires:  binutils-devel
 BuildRequires:  cmake >= 3.1
 BuildRequires:  doxygen