diff --git a/fix-build-qt-5.12-again.patch b/fix-build-qt-5.12-again.patch new file mode 100644 index 0000000..17a98a2 --- /dev/null +++ b/fix-build-qt-5.12-again.patch @@ -0,0 +1,27 @@ +From d0c9f9c8a0c62c53812c25e5bd77119f214cd1f8 Mon Sep 17 00:00:00 2001 +From: Volker Krause +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 diff --git a/fix-build-qt-5.12.patch b/fix-build-qt-5.12.patch new file mode 100644 index 0000000..08718d4 --- /dev/null +++ b/fix-build-qt-5.12.patch @@ -0,0 +1,21 @@ +From 2cd4585e287a2bcf80572505537e5e75d020c5f5 Mon Sep 17 00:00:00 2001 +From: Volker Krause +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 + #include ++#include + #include + #include + #include diff --git a/gammaray-2.9.0.tar.gz b/gammaray-2.9.0.tar.gz deleted file mode 100644 index cae6139..0000000 --- a/gammaray-2.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ab3fb4ac3d7e82f37ed7c62e063505d52334338460cf31d91c99d485d1d7bc2 -size 9662773 diff --git a/gammaray-2.9.1.tar.gz b/gammaray-2.9.1.tar.gz new file mode 100644 index 0000000..ca1f44d --- /dev/null +++ b/gammaray-2.9.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba1f6f2b777c550511a17f704b9c340df139de8ba8fa0d72782ea51d0086fa47 +size 9666109 diff --git a/gammaray.changes b/gammaray.changes index 2223499..60d02a6 100644 --- a/gammaray.changes +++ b/gammaray.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Oct 5 08:01:34 UTC 2018 - fabian@ritter-vogt.de + +- Add patches to fix build against Qt 5.12: + * fix-build-qt-5.12.patch + * fix-build-qt-5.12-again.patch + +------------------------------------------------------------------- +Thu Oct 4 12:19:52 UTC 2018 - fabian@ritter-vogt.de + +- Update to 2.9.1: + * Fix crash in in-process mode with networking disabled. + * Fix compilation with Qt 5.12. + * Update Android toolchain file. + * Allow to disable QtScript dependency. + * Fix crash on zero-sized paint operations. + * Fix plugin deployment on Android. + * Fix crash in Qt Quick inspector when encountering invalid bounding rects. + * Fix activating the Qt3D plugin when attaching to a Qt3D application at runtime. + * Fix out-of-bounds framebuffer read in Qt Quick remote view for some non-integer scaling factors. +- Use %license + ------------------------------------------------------------------- Fri Feb 9 12:04:59 UTC 2018 - alarrosa@suse.com diff --git a/gammaray.spec b/gammaray.spec index e46177e..6dd8b95 100644 --- a/gammaray.spec +++ b/gammaray.spec @@ -18,15 +18,18 @@ %define tarname GammaRay Name: gammaray -Version: 2.9.0 +Version: 2.9.1 Release: 0 Summary: Introspection/Debugging Tool for Qt Applications -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Debuggers 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: fdupes @@ -83,7 +86,6 @@ BuildRequires: cmake(Qt5Svg) >= 5.3.0 BuildRequires: cmake(Qt5Test) >= 5.3.0 BuildRequires: cmake(Qt5WebKitWidgets) >= 5.3.0 BuildRequires: cmake(Qt5Widgets) >= 5.3.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Gamma Ray is a comprehensive collection of high level introspection @@ -102,7 +104,7 @@ frameworks in Qt. Development files. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 +%autopatch -p1 %build %if "%{_lib}" == "lib64" @@ -132,7 +134,7 @@ mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir} %postun -p /sbin/ldconfig %files -%defattr(-,root,root) +%license LICENSE.* %doc CHANGES ReadMe.txt %dir %{_datadir}/icons/hicolor/512x512/ %dir %{_datadir}/icons/hicolor/512x512/apps/ @@ -154,8 +156,7 @@ mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir} %{_datadir}/gammaray %files devel -%defattr(-,root,root) -%doc LICENSE.* +%license LICENSE.* %{_includedir}/%{name} %{_libdir}/cmake/GammaRay/ %{_libdir}/libgammaray_*-qt5*.so