Hello community,
here is the log from the commit of package gammaray for openSUSE:Factory
checked in at 2019-06-19 21:08:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gammaray (Old)
and /work/SRC/openSUSE:Factory/.gammaray.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gammaray"
Wed Jun 19 21:08:30 2019 rev:11 rq:710434 version:2.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gammaray/gammaray.changes 2019-06-07
12:18:58.600778816 +0200
+++ /work/SRC/openSUSE:Factory/.gammaray.new.4811/gammaray.changes
2019-06-19 21:10:28.870630624 +0200
@@ -1,0 +2,7 @@
+Mon Jun 17 20:05:15 UTC 2019 - Wolfgang Bauer <wba...@tmo.at>
+
+- Add upstream patches to fix build with Qt 5.12.4 and 5.13:
+ * Adapt-to-Qt-5.13-changes-for-attached-property-handling.patch
+ * Adapt-to-attached-property-changes-in-Qt-5.12.4.patch
+
+-------------------------------------------------------------------
New:
----
Adapt-to-Qt-5.13-changes-for-attached-property-handling.patch
Adapt-to-attached-property-changes-in-Qt-5.12.4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gammaray.spec ++++++
--- /var/tmp/diff_new_pack.8Aps2a/_old 2019-06-19 21:10:29.706631437 +0200
+++ /var/tmp/diff_new_pack.8Aps2a/_new 2019-06-19 21:10:29.710631440 +0200
@@ -31,6 +31,10 @@
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: cmake >= 3.1
BuildRequires: doxygen
++++++ Adapt-to-Qt-5.13-changes-for-attached-property-handling.patch ++++++
>From 621dbd93feff3cc33d26e76b65dafc0fbd2d7ce4 Mon Sep 17 00:00:00 2001
From: Volker Krause <volker.kra...@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. */
++++++ Adapt-to-attached-property-changes-in-Qt-5.12.4.patch ++++++
>From 55c8b44e461fdfbc16efb3c76ea4e5030f60ec22 Mon Sep 17 00:00:00 2001
From: Volker Krause <volker.kra...@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;
