commit gammaray for openSUSE:Factory

2 May 2019

Hello community,

here is the log from the commit of package gammaray for openSUSE:Factory checked in at 2019-05-02 19:16:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gammaray (Old)
 and      /work/SRC/openSUSE:Factory/.gammaray.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gammaray"

Thu May  2 19:16:20 2019 rev:9 rq:692997 version:2.10.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/gammaray/gammaray.changes	2019-03-26 15:39:00.272334539 +0100
+++ /work/SRC/openSUSE:Factory/.gammaray.new.5148/gammaray.changes	2019-05-02 19:16:24.873318467 +0200
@@ -1,0 +2,10 @@
+Wed Apr 10 18:04:06 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add fix-build-with-qt-5.13.patch
+
+-------------------------------------------------------------------
+Tue Apr  2 13:26:04 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Remove the vtk-tcl dependency.
+
+-------------------------------------------------------------------

New:
----
  fix-build-with-qt-5.13.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gammaray.spec ++++++
--- /var/tmp/diff_new_pack.0gidSN/_old	2019-05-02 19:16:25.701319989 +0200
+++ /var/tmp/diff_new_pack.0gidSN/_new	2019-05-02 19:16:25.701319989 +0200
@@ -27,6 +27,8 @@
 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 fix-build-with-qt-5.13.patch
+Patch1:         fix-build-with-qt-5.13.patch
 BuildRequires:  binutils-devel
 BuildRequires:  cmake >= 3.1
 BuildRequires:  doxygen
@@ -48,7 +50,6 @@
 BuildRequires:  vtk-devel
 BuildRequires:  vtk-java
 BuildRequires:  vtk-qt
-BuildRequires:  vtk-tcl
 BuildRequires:  wayland-devel
 BuildRequires:  cmake(KF5CoreAddons)
 BuildRequires:  cmake(Qt5Bluetooth) >= 5.3.0
@@ -109,23 +110,18 @@
 %autopatch -p1
 
 %build
-%if "%{_lib}" == "lib64"
-LIBSUFFIX="-DLIB_SUFFIX=64"
-%else
-LIBSUFFIX=""
-%endif
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-        -DCMAKE_SKIP_INSTALL_RPATH=ON \
-        -DCMAKE_VERBOSE_MAKEFILE=ON \
+%cmake \
         -DECM_MKSPECS_INSTALL_DIR=%{_libdir}/qt5/mkspecs/modules \
         -DQCH_INSTALL_DIR=%{_datadir}/gammaray/ \
         -DQDOC_EXECUTABLE=%{_libqt5_bindir}/qdoc \
-        -DQHELPGEN_EXECUTABLE=%{_libqt5_bindir}/qhelpgenerator \
-        $LIBSUFFIX
-make VERBOSE=1 %{?_smp_mflags}
+  -DQHELPGEN_EXECUTABLE=%{_libqt5_bindir}/qhelpgenerator
+
+# Still not available on all leap flavors
+# %%cmake_build
+%make_jobs
 
 %install
-%make_install
+%cmake_install
 
 install -d -m 755 %{buildroot}%{_docdir}/%{name}
 mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}

++++++ fix-build-with-qt-5.13.patch ++++++
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);

    

root

tags

participants (1)