From 757e93eac0fb6dc6a35d6517ad7116e8e099443592a034efb8d64e237a2b5475 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 10 Apr 2019 18:08:13 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=46 --- fix-build-with-qt-5.13.patch | 21 +++++++++++++++++++++ gammaray.changes | 5 +++++ gammaray.spec | 27 ++++++++++++--------------- 3 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 fix-build-with-qt-5.13.patch diff --git a/fix-build-with-qt-5.13.patch b/fix-build-with-qt-5.13.patch new file mode 100644 index 0000000..ac3b018 --- /dev/null +++ b/fix-build-with-qt-5.13.patch @@ -0,0 +1,21 @@ +commit 3cb4f2834eac0f422712a837c425a43114af586c +Author: Kevin Funk +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); diff --git a/gammaray.changes b/gammaray.changes index 88ac20f..d58a5a9 100644 --- a/gammaray.changes +++ b/gammaray.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 10 18:04:06 UTC 2019 - Christophe Giboudeaux + +- Add fix-build-with-qt-5.13.patch + ------------------------------------------------------------------- Tue Apr 2 13:26:04 UTC 2019 - Christophe Giboudeaux diff --git a/gammaray.spec b/gammaray.spec index 9a109b5..6fd691c 100644 --- a/gammaray.spec +++ b/gammaray.spec @@ -27,6 +27,8 @@ 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 fix-build-with-qt-5.13.patch +Patch1: fix-build-with-qt-5.13.patch BuildRequires: binutils-devel BuildRequires: cmake >= 3.1 BuildRequires: doxygen @@ -108,23 +110,18 @@ frameworks in Qt. Development files. %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 \ - -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} +%cmake \ + -DECM_MKSPECS_INSTALL_DIR=%{_libdir}/qt5/mkspecs/modules \ + -DQCH_INSTALL_DIR=%{_datadir}/gammaray/ \ + -DQDOC_EXECUTABLE=%{_libqt5_bindir}/qdoc \ + -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}