pool/gammaray
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 714279 from home:wolfi323:branches:KDE:Extra

Browse Source 
- Update to 2.11.0:
  * Drop support for Qt 4 and Qt <= 5.4.
  * Drop support for MSVC 2010 and MSVC 2012, as well as GCC < 4.8.
  * Add support for more QtNetwork properties.
  * Add new network operations monitoring tool.
  * Fix inspection of QJson types.
  * Add thread affinity check to the problem reporter.
  * Add new event monitoring tool.
  * Initial forward compatibility with Qt6 build system.
  * Improved performance of the Qt Quick 2 inspector and the signal
    monitor.
- Drop patches merged upstream:
  * fix-build-with-qt-5.13.patch
  * 0001-Make-sure-the-defined-variables-are-relative-before-.patch
  * Adapt-to-Qt-5.13-changes-for-attached-property-handling.patch
  * Adapt-to-attached-property-changes-in-Qt-5.12.4.patch
- Cleanup specfile: remove conditionals for no longer supported
  distributions

OBS-URL: https://build.opensuse.org/request/show/714279
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=52
This commit is contained in:
Christophe Giboudeaux 2019-07-09 17:58:41 +00:00 committed by Git OBS Bridge
parent 11f8e36680
commit 031f5e6783
8 changed files with 51 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
0001-Make-sure-the-defined-variables-are-relative-before-.patch
View File

@ -1,66 +0,0 @@
From f36b102b16711efe03ea3d1908daa80c04693fd8 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Mon, 13 May 2019 19:22:35 +0200
Subject: [PATCH] Make sure the defined variables are relative before setting
'GAMMARAY_INVERSE_*'
If absolute paths are used when running CMake, config-gammaray.h may contain
bogus values for GAMMARAY_INVERSE_* variables.
This can cause runtime errors and/or warnings when GammaRay tries to locate the
gammaray-launcher binary or the documentation files.
---
CMakeLists.txt | 8 ++++++--
cmake/GammaRayMacrosInternal.cmake | 7 +++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86d7db47..5a81156f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -669,19 +669,23 @@ else()
include(GNUInstallDirs)
set(BIN_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}") # relative, usually "bin"
+ gammaray_convert_to_relative_path(BIN_INSTALL_DIR)
if(GAMMARAY_INSTALL_QT_LAYOUT)
set(LIB_INSTALL_DIR "lib") # Qt always uses "lib"
else()
- set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") # "lib" or "lib64"
+ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") # "lib" or "lib64"
+ gammaray_convert_to_relative_path(LIB_INSTALL_DIR)
endif()
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/gammaray")
set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/GammaRay)
set(DATAROOTDIR "${CMAKE_INSTALL_DATAROOTDIR}" CACHE PATH "Define install directory for read-only architecture-independent data")
+ gammaray_convert_to_relative_path(DATAROOTDIR)
set(XDG_APPS_INSTALL_DIR "${DATAROOTDIR}/applications")
set(APPDATA_INSTALL_DIR "${DATAROOTDIR}/appdata")
set(ICON_INSTALL_DIR "${DATAROOTDIR}/icons")
set(MAN_INSTALL_DIR "${DATAROOTDIR}/man/man1")
- set(QCH_INSTALL_DIR "${CMAKE_INSTALL_DOCDIR}" CACHE STRING "Install location of Qt Assistant help files.")
+ set(QCH_INSTALL_DIR "${CMAKE_INSTALL_DOCDIR}" CACHE PATH "Install location of Qt Assistant help files.")
+ gammaray_convert_to_relative_path(QCH_INSTALL_DIR)
if(WIN32)
set(PLUGIN_INSTALL_DIR "plugins/gammaray")
set(LIBEXEC_INSTALL_DIR "${BIN_INSTALL_DIR}")
diff --git a/cmake/GammaRayMacrosInternal.cmake b/cmake/GammaRayMacrosInternal.cmake
index 7ef4851a..9044e9b2 100644
--- a/cmake/GammaRayMacrosInternal.cmake
+++ b/cmake/GammaRayMacrosInternal.cmake
@@ -94,6 +94,13 @@ macro(gammaray_join_list _var _sep)
endforeach()
endmacro()
+macro(gammaray_convert_to_relative_path _var)
+ # Make sure _var is a relative path
+ if(IS_ABSOLUTE "${${_var}}")
+ file(RELATIVE_PATH ${_var} "${CMAKE_INSTALL_PREFIX}" "${${_var}}")
+ endif()
+endmacro()
+
macro(gammaray_inverse_dir _var _prefix)
# strip out relative components, those break the following on OSX
get_filename_component(_clean_prefix "${CMAKE_INSTALL_PREFIX}/${_prefix}" ABSOLUTE)
--
2.21.0

34
Adapt-to-Qt-5.13-changes-for-attached-property-handling.patch
View File

@ -1,34 +0,0 @@
From 621dbd93feff3cc33d26e76b65dafc0fbd2d7ce4 Mon Sep 17 00:00:00 2001
From: Volker Krause <volker.krause@kdab.com>
Date: Mon, 13 May 2019 14:58:26 +0200
Subject: [PATCH] Adapt to Qt 5.13 changes for attached property handling
---
plugins/qmlsupport/qmlattachedpropertyadaptor.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/plugins/qmlsupport/qmlattachedpropertyadaptor.h b/plugins/qmlsupport/qmlattachedpropertyadaptor.h
index c35e0d812..2d402c93a 100644
--- a/plugins/qmlsupport/qmlattachedpropertyadaptor.h
+++ b/plugins/qmlsupport/qmlattachedpropertyadaptor.h
@@ -32,6 +32,8 @@
#include <core/propertyadaptor.h>
#include <core/propertyadaptorfactory.h>
+#include <qqmlprivate.h>
+
namespace GammaRay {
class QmlAttachedPropertyAdaptor : public PropertyAdaptor
{
@@ -47,7 +49,11 @@ class QmlAttachedPropertyAdaptor : public PropertyAdaptor
void doSetObject(const ObjectInstance &oi) override;
private:
+#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
+ QVector<QQmlAttachedPropertiesFunc> m_attachedTypes;
+#else
QVector<int> m_attachedTypes;
+#endif
};
/** QML attached property adaptor. */

22
Adapt-to-attached-property-changes-in-Qt-5.12.4.patch
View File

@ -1,22 +0,0 @@
From 55c8b44e461fdfbc16efb3c76ea4e5030f60ec22 Mon Sep 17 00:00:00 2001
From: Volker Krause <volker.krause@kdab.com>
Date: Mon, 27 May 2019 15:00:53 +0200
Subject: [PATCH] Adapt to attached property changes in Qt 5.12.4
---
plugins/qmlsupport/qmlattachedpropertyadaptor.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/qmlsupport/qmlattachedpropertyadaptor.h b/plugins/qmlsupport/qmlattachedpropertyadaptor.h
index 2d402c93a..689d499fb 100644
--- a/plugins/qmlsupport/qmlattachedpropertyadaptor.h
+++ b/plugins/qmlsupport/qmlattachedpropertyadaptor.h
@@ -49,7 +49,7 @@ class QmlAttachedPropertyAdaptor : public PropertyAdaptor
void doSetObject(const ObjectInstance &oi) override;
private:
-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 4)
QVector<QQmlAttachedPropertiesFunc> m_attachedTypes;
#else
QVector<int> m_attachedTypes;

21
fix-build-with-qt-5.13.patch
View File

@ -1,21 +0,0 @@
commit 3cb4f2834eac0f422712a837c425a43114af586c
Author: Kevin Funk <kevin.funk@kdab.com>
Date: Tue Mar 12 10:14:43 2019 +0100
Adapt to removal of QQmlType::createSize in 5.13
diff --git a/plugins/qmlsupport/qmlsupport.cpp b/plugins/qmlsupport/qmlsupport.cpp
index 019a847f..0c1d4c45 100644
--- a/plugins/qmlsupport/qmlsupport.cpp
+++ b/plugins/qmlsupport/qmlsupport.cpp
@@ -356,7 +356,9 @@ QmlSupport::QmlSupport(Probe *probe, QObject *parent)
MO_ADD_PROPERTY_RO(QQmlType, elementName);
MO_ADD_PROPERTY_RO(QQmlType, majorVersion);
MO_ADD_PROPERTY_RO(QQmlType, minorVersion);
- MO_ADD_PROPERTY_RO(QQmlType, createSize);
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+ MO_ADD_PROPERTY_RO(QQmlType, createSize); // got removed in v5.13.0-alpha1
+#endif
MO_ADD_PROPERTY_RO(QQmlType, isCreatable);
MO_ADD_PROPERTY_RO(QQmlType, isExtendedType);
MO_ADD_PROPERTY_RO(QQmlType, isSingleton);

3
gammaray-2.10.0.tar.gz
View File

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

3
gammaray-2.11.0.tar.gz Normal file
View File

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

22
gammaray.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Sat Jul 6 11:36:25 UTC 2019 - Wolfgang Bauer <wbauer@tmo.at>
- Update to 2.11.0:
* Drop support for Qt 4 and Qt <= 5.4.
* Drop support for MSVC 2010 and MSVC 2012, as well as GCC < 4.8.
* Add support for more QtNetwork properties.
* Add new network operations monitoring tool.
* Fix inspection of QJson types.
* Add thread affinity check to the problem reporter.
* Add new event monitoring tool.
* Initial forward compatibility with Qt6 build system.
* Improved performance of the Qt Quick 2 inspector and the signal
monitor.
- Drop patches merged upstream:
* fix-build-with-qt-5.13.patch
* 0001-Make-sure-the-defined-variables-are-relative-before-.patch
* Adapt-to-Qt-5.13-changes-for-attached-property-handling.patch
* Adapt-to-attached-property-changes-in-Qt-5.12.4.patch
- Cleanup specfile: remove conditionals for no longer supported
distributions
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 17 20:05:15 UTC 2019 - Wolfgang Bauer <wbauer@tmo.at> Mon Jun 17 20:05:15 UTC 2019 - Wolfgang Bauer <wbauer@tmo.at>

73
gammaray.spec
View File

@ -18,23 +18,15 @@
%define tarname GammaRay %define tarname GammaRay
Name: gammaray Name: gammaray
Version: 2.10.0 Version: 2.11.0
Release: 0 Release: 0
Summary: Introspection/Debugging Tool for Qt Applications Summary: Introspection/Debugging Tool for Qt Applications
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: Development/Tools/Debuggers Group: Development/Tools/Debuggers
URL: http://www.kdab.com/gammaray URL: https://www.kdab.com/gammaray
Source: https://github.com/KDAB/GammaRay/releases/download/v%{version}/%{name}-%{version}.tar.gz 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 # PATCH-FIX-UPSTREAM Fix_icons_installation.patch -- Don't try to install multiple copies in exotic subdirs
Patch0: Fix_icons_installation.patch Patch0: Fix_icons_installation.patch
# PATCH-FIX-UPSTREAM fix-build-with-qt-5.13.patch
Patch1: fix-build-with-qt-5.13.patch
# PATCH-FIX-UPSTREAM 0001-Make-sure-the-defined-variables-are-relative-before-.patch
Patch2: 0001-Make-sure-the-defined-variables-are-relative-before-.patch
# PATCH-FIX-UPSTREAM Adapt-to-Qt-5.13-changes-for-attached-property-handling.patch
Patch3: Adapt-to-Qt-5.13-changes-for-attached-property-handling.patch
# PATCH-FIX-UPSTREAM Adapt-to-attached-property-changes-in-Qt-5.12.4.patch
Patch4: Adapt-to-attached-property-changes-in-Qt-5.12.4.patch
BuildRequires: binutils-devel BuildRequires: binutils-devel
BuildRequires: cmake >= 3.1 BuildRequires: cmake >= 3.1
BuildRequires: doxygen BuildRequires: doxygen
@ -44,57 +36,44 @@ BuildRequires: graphviz-gnome
# include this so the icon folders don't need to be owned by the package # include this so the icon folders don't need to be owned by the package
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: kdstatemachineeditor-devel BuildRequires: kdstatemachineeditor-devel
BuildRequires: libQt5Core-private-headers-devel >= 5.3.0 BuildRequires: libQt5Core-private-headers-devel >= 5.5.0
BuildRequires: libQt5Gui-private-headers-devel >= 5.3.0 BuildRequires: libQt5Gui-private-headers-devel >= 5.5.0
BuildRequires: libQt5Network-private-headers-devel >= 5.3.0 BuildRequires: libQt5Network-private-headers-devel >= 5.5.0
BuildRequires: libdw-devel BuildRequires: libdw-devel
BuildRequires: libqt5-qt3d-devel >= 5.3.0 BuildRequires: libqt5-qt3d-devel >= 5.5.0
BuildRequires: libqt5-qtbase-doc >= 5.3.0 BuildRequires: libqt5-qtbase-doc >= 5.5.0
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= 5.3.0 BuildRequires: libqt5-qtdeclarative-private-headers-devel >= 5.5.0
BuildRequires: libqt5-qttools >= 5.3.0 BuildRequires: libqt5-qttools >= 5.5.0
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: vtk-devel BuildRequires: vtk-devel
BuildRequires: vtk-java BuildRequires: vtk-java
BuildRequires: vtk-qt BuildRequires: vtk-qt
BuildRequires: wayland-devel BuildRequires: wayland-devel
BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(Qt5Bluetooth) >= 5.3.0 BuildRequires: cmake(Qt5Bluetooth) >= 5.5.0
BuildRequires: cmake(Qt5Concurrent) >= 5.3.0 BuildRequires: cmake(Qt5Concurrent) >= 5.5.0
BuildRequires: cmake(Qt5Core) >= 5.3.0 BuildRequires: cmake(Qt5Core) >= 5.5.0
BuildRequires: cmake(Qt5Designer) >= 5.3.0 BuildRequires: cmake(Qt5Designer) >= 5.5.0
BuildRequires: cmake(Qt5Gui) >= 5.3.0 BuildRequires: cmake(Qt5Gui) >= 5.5.0
BuildRequires: cmake(Qt5Network) >= 5.3.0 BuildRequires: cmake(Qt5Network) >= 5.5.0
BuildRequires: cmake(Qt5Positioning) >= 5.3.0 BuildRequires: cmake(Qt5Positioning) >= 5.5.0
BuildRequires: cmake(Qt5PrintSupport) >= 5.3.0 BuildRequires: cmake(Qt5PrintSupport) >= 5.5.0
BuildRequires: cmake(Qt5Qml) >= 5.3.0 BuildRequires: cmake(Qt5Qml) >= 5.5.0
BuildRequires: cmake(Qt5Quick) >= 5.3.0 BuildRequires: cmake(Qt5Quick) >= 5.5.0
BuildRequires: cmake(Qt5Script) >= 5.3.0 BuildRequires: cmake(Qt5Script) >= 5.5.0
BuildRequires: cmake(Qt5ScriptTools) >= 5.3.0 BuildRequires: cmake(Qt5ScriptTools) >= 5.5.0
BuildRequires: cmake(Qt5Svg) >= 5.3.0 BuildRequires: cmake(Qt5Svg) >= 5.5.0
BuildRequires: cmake(Qt5Test) >= 5.3.0 BuildRequires: cmake(Qt5Test) >= 5.5.0
BuildRequires: cmake(Qt5WebEngineWidgets) >= 5.3.0 BuildRequires: cmake(Qt5WebEngineWidgets) >= 5.5.0
BuildRequires: cmake(Qt5Widgets) >= 5.3.0 BuildRequires: cmake(Qt5Widgets) >= 5.5.0
%if 0%{?suse_version} > 1315
# Needed to build the user manual # Needed to build the user manual
BuildRequires: libqt5-qtdoc-devel BuildRequires: libqt5-qtdoc-devel
# #
BuildRequires: cmake(Qt5WaylandCompositor) >= 5.3.0 BuildRequires: cmake(Qt5WaylandCompositor) >= 5.5.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 BuildRequires: glslang-devel
%endif
%if 0%{?suse_version} > 1320
BuildRequires: libqt5-qtscxml-private-headers-devel >= 5.8.0 BuildRequires: libqt5-qtscxml-private-headers-devel >= 5.8.0
%endif
%if 0%{?suse_version} > 1320
BuildRequires: cmake(KF5SyntaxHighlighting) >= 5.28.0 BuildRequires: cmake(KF5SyntaxHighlighting) >= 5.28.0
%endif
%if 0%{?suse_version} > 1320
BuildRequires: cmake(Qt5Scxml) >= 5.8.0 BuildRequires: cmake(Qt5Scxml) >= 5.8.0
%endif
%description %description
Gamma Ray is a comprehensive collection of high level introspection Gamma Ray is a comprehensive collection of high level introspection