Accepting request 680359 from KDE:Extra

OBS-URL: https://build.opensuse.org/request/show/680359
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gammaray?expand=0&rev=8

fix-build-qt-5.12-again.patch

@@ -1,27 +0,0 @@
-From d0c9f9c8a0c62c53812c25e5bd77119f214cd1f8 Mon Sep 17 00:00:00 2001
-From: Volker Krause <volker.krause@kdab.com>
-Date: Mon, 20 Aug 2018 13:47:35 +0200
-Subject: [PATCH] Adapt to Qt 5.12 V4 identifier changes
-
----
- plugins/qmlsupport/qmlcontextpropertyadaptor.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/plugins/qmlsupport/qmlcontextpropertyadaptor.cpp b/plugins/qmlsupport/qmlcontextpropertyadaptor.cpp
-index 2c183f083..1c24eaa44 100644
---- a/plugins/qmlsupport/qmlcontextpropertyadaptor.cpp
-+++ b/plugins/qmlsupport/qmlcontextpropertyadaptor.cpp
-@@ -100,8 +100,13 @@ void QmlContextPropertyAdaptor::doSetObject(const ObjectInstance &oi)
-     QV4::IdentifierHashEntry *e = propNames.d->entries;
-     QV4::IdentifierHashEntry *end = e + propNames.d->alloc;
-     while (e < end) {
-+#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
-         if (e->identifier)
-             m_contextPropertyNames.push_back(e->identifier->string);
-+#else
-+        if (e->identifier.isValid())
-+            m_contextPropertyNames.push_back(e->identifier.toQString());
-+#endif
-         ++e;
-     }
- #else

fix-build-qt-5.12.patch

@@ -1,21 +0,0 @@
-From 2cd4585e287a2bcf80572505537e5e75d020c5f5 Mon Sep 17 00:00:00 2001
-From: Volker Krause <volker.krause@kdab.com>
-Date: Wed, 22 Aug 2018 09:59:42 +0200
-Subject: [PATCH] Compile with Qt 5.12
-
----
- plugins/qmlsupport/qmlbindingprovider.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/qmlsupport/qmlbindingprovider.cpp b/plugins/qmlsupport/qmlbindingprovider.cpp
-index efc6f2b4d..0d210aa4c 100644
---- a/plugins/qmlsupport/qmlbindingprovider.cpp
-+++ b/plugins/qmlsupport/qmlbindingprovider.cpp
-@@ -35,6 +35,7 @@
- // Qt
- #include <private/qqmlabstractbinding_p.h>
- #include <private/qqmlbinding_p.h>
-+#include <private/qqmlglobal_p.h>
- #include <private/qqmlvaluetypeproxybinding_p.h>
- #include <private/qqmldata_p.h>
- #include <private/qqmlproperty_p.h>

gammaray-2.10.0.tar.gz

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

gammaray-2.9.1.tar.gz

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

gammaray.changes

@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Thu Feb 28 21:01:00 UTC 2019 - wbauer@tmo.at
+
+- Update to 2.10.0:
+  * Increase CMake requirement to version 3.1 on all platforms.
+  * Add object navigation to the paint analyzer.
+  * Reduce network load by moving more property model features to
+    the client side.
+  * Port object hierarchy visualizer plugin to Qt 5.
+  * Add new system information plugin, which supersedes the
+    standard paths plugin.
+  * Use application palette rather than style palette in the style
+    inspector.
+  * Improve gdb injector performance.
+  * Reduce performance impact of the widget paint analyzer in
+    Windows debug builds.
+  * Improve Qt Quick item picking in case of zero-sized parent
+    elements.
+  * Provide access to QAbstractItemModel role name mapping.
+  * Add QtPositioning plugin allowing to monitor and simulate geo
+    localization.
+  * Add NMEA geo localization playback.
+  * Add support for generic functor property accessors.
+  * Add property access for mime data and clipboard types.
+  * Add infrastructure to override generic property access, such as
+    Qt Quick anchor properties.
+  * Add custom property access for Qt Quick anchors properties to
+    no longer trigger their on-demand creation.
+  * Add generic problem reporter infrastructure, and port some
+    existing checks to it.
+- Drop patches merged upstream:
+  * fix-build-qt-5.12.patch
+  * fix-build-qt-5.12-again.patch
+
+-------------------------------------------------------------------
+Wed Nov 14 10:37:36 UTC 2018 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Remove unneeded build dependencies.
+
 -------------------------------------------------------------------
 Fri Oct  5 08:01:34 UTC 2018 - fabian@ritter-vogt.de
 

gammaray.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gammaray
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,35 +12,28 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define tarname GammaRay
 Name:           gammaray
-Version:        2.9.1
+Version:        2.10.0
 Release:        0
 Summary:        Introspection/Debugging Tool for Qt Applications
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Debuggers
-Url:            http://www.kdab.com/gammaray
+URL:            http://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:         fix-build-qt-5.12.patch
-Patch2:         fix-build-qt-5.12-again.patch
 BuildRequires:  binutils-devel
-BuildRequires:  cmake >= 2.8.11
+BuildRequires:  cmake >= 3.1
-BuildRequires:  fdupes
-BuildRequires:  kcoreaddons-devel
-# include this so the icon folders don't need to be owned by the package
 BuildRequires:  doxygen
-%if 0%{?suse_version} > 1320 || 0%{?leap_version} >= 420200
+BuildRequires:  fdupes
-BuildRequires:  glslang-devel
-%endif
 BuildRequires:  graphviz-devel
 BuildRequires:  graphviz-gnome
+# include this so the icon folders don't need to be owned by the package
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  kdstatemachineeditor-devel
 BuildRequires:  libQt5Core-private-headers-devel >= 5.3.0
@@ -50,23 +43,14 @@ BuildRequires:  libdw-devel
 BuildRequires:  libqt5-qt3d-devel >= 5.3.0
 BuildRequires:  libqt5-qtbase-doc >= 5.3.0
 BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= 5.3.0
-BuildRequires:  libqt5-qtdoc >= 5.3.0
-%if 0%{?suse_version} > 1320
-BuildRequires:  libqt5-qtscxml-private-headers-devel >= 5.8.0
-%endif
 BuildRequires:  libqt5-qttools >= 5.3.0
-BuildRequires:  libqt5-qtwayland-devel >= 5.3.0
-BuildRequires:  libxml2-devel
-BuildRequires:  python-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  vtk-devel
 BuildRequires:  vtk-java
 BuildRequires:  vtk-qt
 BuildRequires:  vtk-tcl
 BuildRequires:  wayland-devel
-%if 0%{?suse_version} > 1320
+BuildRequires:  cmake(KF5CoreAddons)
-BuildRequires:  cmake(KF5SyntaxHighlighting) >= 5.28.0
-%endif
 BuildRequires:  cmake(Qt5Bluetooth) >= 5.3.0
 BuildRequires:  cmake(Qt5Concurrent) >= 5.3.0
 BuildRequires:  cmake(Qt5Core) >= 5.3.0
@@ -79,13 +63,31 @@ BuildRequires:  cmake(Qt5Qml) >= 5.3.0
 BuildRequires:  cmake(Qt5Quick) >= 5.3.0
 BuildRequires:  cmake(Qt5Script) >= 5.3.0
 BuildRequires:  cmake(Qt5ScriptTools) >= 5.3.0
+BuildRequires:  cmake(Qt5Svg) >= 5.3.0
+BuildRequires:  cmake(Qt5Test) >= 5.3.0
+BuildRequires:  cmake(Qt5WebEngineWidgets) >= 5.3.0
+BuildRequires:  cmake(Qt5Widgets) >= 5.3.0
+%if 0%{?suse_version} > 1315
+# Needed to build the user manual
+BuildRequires:  libqt5-qtdoc-devel
+#
+BuildRequires:  cmake(Qt5WaylandCompositor) >= 5.3.0
+%else
+# libqt5-qtdoc-devel doesn't exist in leap 42.3
+BuildRequires:  libqt5-qtdoc
+%endif
+%if 0%{?suse_version} > 1320 || 0%{?leap_version} >= 420200
+BuildRequires:  glslang-devel
+%endif
+%if 0%{?suse_version} > 1320
+BuildRequires:  libqt5-qtscxml-private-headers-devel >= 5.8.0
+%endif
+%if 0%{?suse_version} > 1320
+BuildRequires:  cmake(KF5SyntaxHighlighting) >= 5.28.0
+%endif
 %if 0%{?suse_version} > 1320
 BuildRequires:  cmake(Qt5Scxml) >= 5.8.0
 %endif
-BuildRequires:  cmake(Qt5Svg) >= 5.3.0
-BuildRequires:  cmake(Qt5Test) >= 5.3.0
-BuildRequires:  cmake(Qt5WebKitWidgets) >= 5.3.0
-BuildRequires:  cmake(Qt5Widgets) >= 5.3.0
 
 %description
 Gamma Ray is a comprehensive collection of high level introspection
@@ -103,7 +105,7 @@ and debugging utilities specifically tailored for the various
 frameworks in Qt. Development files.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %autopatch -p1
 
 %build
@@ -123,7 +125,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install
+%make_install
 
 install -d -m 755 %{buildroot}%{_docdir}/%{name}
 mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}