From 31abccb6e013cb1968d05a7d8d3c37c2e61fa150be7d19b0db0a379059111199 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 4 Oct 2018 13:39:18 +0000 Subject: [PATCH 1/4] Accepting request 639973 from home:Vogtinator:branches:KDE:Extra - 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 OBS-URL: https://build.opensuse.org/request/show/639973 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=31 --- gammaray-2.9.0.tar.gz | 3 --- gammaray-2.9.1.tar.gz | 3 +++ gammaray.changes | 15 +++++++++++++++ gammaray.spec | 10 ++++------ 4 files changed, 22 insertions(+), 9 deletions(-) delete mode 100644 gammaray-2.9.0.tar.gz create mode 100644 gammaray-2.9.1.tar.gz 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..890edc1 100644 --- a/gammaray.changes +++ b/gammaray.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +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..9198deb 100644 --- a/gammaray.spec +++ b/gammaray.spec @@ -18,10 +18,10 @@ %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 @@ -83,7 +83,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 @@ -132,7 +131,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 +153,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 From eecd7dade1bde89f4389df9f526f93486d629066eaa506d5062bd415dc3a9241 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 5 Oct 2018 08:01:47 +0000 Subject: [PATCH 2/4] - Add patch to fix build against Qt 5.12: * fix-build-qt-5.12.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=32 --- fix-build-qt-5.12.patch | 849 ++++++++++++++++++++++++++++++++++++++++ gammaray.changes | 6 + gammaray.spec | 4 +- 3 files changed, 858 insertions(+), 1 deletion(-) create mode 100644 fix-build-qt-5.12.patch diff --git a/fix-build-qt-5.12.patch b/fix-build-qt-5.12.patch new file mode 100644 index 0000000..9083941 --- /dev/null +++ b/fix-build-qt-5.12.patch @@ -0,0 +1,849 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Compile with Qt 5.12 · KDAB/GammaRay@2cd4585 · GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Skip to content +
+ + + + + + + + + + +
+ +
+ +
+ + +
+ + + +
+
+
+ + + + + + + + + +
+
+ + + +

+ + /GammaRay + +

+ +
+ + + + +
+ +
+
+ + + Permalink + + + + + +
+ Browse files + +

+ Compile with Qt 5.12 +

+ + +
+ + +
    +
  • Loading branch information...
    • +
+
+ + +
+ +
+
+ + + @vkrause +
+
+ +
+ + vkrause + + + committed + Aug 22, 2018 + + + +
+
+ + 1 parent + + d0c9f9c + + commit 2cd4585e287a2bcf80572505537e5e75d020c5f5 +
+
+
+ + + + + +
+
+ + Unified + + + Split + +
+ + +
+ + Showing + + with + 1 addition + and 0 deletions. +
+ +
    +
  1. + + + +1 + + + −0 + + + + + + + plugins/qmlsupport/qmlbindingprovider.cpp +
    2. +
+
+ +
+ +
+ + +
+
+
+ + + + + + View + + + +
+
+ 1 + + 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> + +
+ + + +
+
+ +
+
+ +
+ +
+ + + + + + + +
+ +
+ +
+ + + + +

+ 0 comments + on commit 2cd4585 +

+ +
+ +
+ +
+ + + + +
+ +
+ +
+ + + + Please sign in to comment. + +
+ + +
+
+
+ +
+
+ +
+ + + + + + +
+ + + You can’t perform that action at this time. +
+ + + + + + + + + +
+ + You signed in with another tab or window. Reload to refresh your session. + You signed out in another tab or window. Reload to refresh your session. +
+ + + + + + +
+ Press h to open a hovercard with more details. +
+ + + + + diff --git a/gammaray.changes b/gammaray.changes index 890edc1..beba397 100644 --- a/gammaray.changes +++ b/gammaray.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 5 08:01:34 UTC 2018 - fabian@ritter-vogt.de + +- Add patch to fix build against Qt 5.12: + * fix-build-qt-5.12.patch + ------------------------------------------------------------------- Thu Oct 4 12:19:52 UTC 2018 - fabian@ritter-vogt.de diff --git a/gammaray.spec b/gammaray.spec index 9198deb..985e075 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 +Patch1: fix-build-qt-5.12.patch BuildRequires: binutils-devel BuildRequires: cmake >= 2.8.11 BuildRequires: fdupes @@ -101,7 +103,7 @@ frameworks in Qt. Development files. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 +%autopatch -p1 %build %if "%{_lib}" == "lib64" From 8b356f590132588842d873a2061069370821ebe68adfcea8823652366e93392c Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 5 Oct 2018 08:02:17 +0000 Subject: [PATCH 3/4] Upload the correct patch file... OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=33 --- fix-build-qt-5.12.patch | 870 +--------------------------------------- 1 file changed, 21 insertions(+), 849 deletions(-) diff --git a/fix-build-qt-5.12.patch b/fix-build-qt-5.12.patch index 9083941..08718d4 100644 --- a/fix-build-qt-5.12.patch +++ b/fix-build-qt-5.12.patch @@ -1,849 +1,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Compile with Qt 5.12 · KDAB/GammaRay@2cd4585 · GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Skip to content -
- - - - - - - - - - -
- -
- -
- - -
- - - -
-
-
- - - - - - - - - -
-
- - - -

- - /GammaRay - -

- -
- - - - -
- -
-
- - - Permalink - - - - - -
- Browse files - -

- Compile with Qt 5.12 -

- - -
- - -
    -
  • Loading branch information...
    • -
-
- - -
- -
-
- - - @vkrause -
-
- -
- - vkrause - - - committed - Aug 22, 2018 - - - -
-
- - 1 parent - - d0c9f9c - - commit 2cd4585e287a2bcf80572505537e5e75d020c5f5 -
-
-
- - - - - -
-
- - Unified - - - Split - -
- - -
- - Showing - - with - 1 addition - and 0 deletions. -
- -
    -
  1. - - - +1 - - - −0 - - - - - - - plugins/qmlsupport/qmlbindingprovider.cpp -
    2. -
-
- -
- -
- - -
-
-
- - - - - - View - - - -
-
- 1 - - 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> - -
- - - -
-
- -
-
- -
- -
- - - - - - - -
- -
- -
- - - - -

- 0 comments - on commit 2cd4585 -

- -
- -
- -
- - - - -
- -
- -
- - - - Please sign in to comment. - -
- - -
-
-
- -
-
- -
- - - - - - -
- - - You can’t perform that action at this time. -
- - - - - - - - - -
- - You signed in with another tab or window. Reload to refresh your session. - You signed out in another tab or window. Reload to refresh your session. -
- - - - - - -
- Press h to open a hovercard with more details. -
- - - - - +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 From ce932df13b8a4bcbb878a1b1d0a772341155a9f052cbc1b2f970ce0b4c1201a7 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 5 Oct 2018 08:27:01 +0000 Subject: [PATCH 4/4] - Add patches to fix build against Qt 5.12: * fix-build-qt-5.12-again.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=34 --- fix-build-qt-5.12-again.patch | 27 +++++++++++++++++++++++++++ gammaray.changes | 3 ++- gammaray.spec | 1 + 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 fix-build-qt-5.12-again.patch 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/gammaray.changes b/gammaray.changes index beba397..60d02a6 100644 --- a/gammaray.changes +++ b/gammaray.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Fri Oct 5 08:01:34 UTC 2018 - fabian@ritter-vogt.de -- Add patch to fix build against Qt 5.12: +- 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 diff --git a/gammaray.spec b/gammaray.spec index 985e075..6dd8b95 100644 --- a/gammaray.spec +++ b/gammaray.spec @@ -29,6 +29,7 @@ Source: https://github.com/KDAB/GammaRay/releases/download/v%{version}/% 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