pool/gammaray
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 710431 from home:wolfi323:branches:KDE:Extra

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/710431
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/gammaray?expand=0&rev=50
This commit is contained in:
Luca Beltrame 2019-06-17 20:59:46 +00:00 committed by Git OBS Bridge
parent ab9132455a
commit 11f8e36680
4 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Adapt-to-Qt-5.13-changes-for-attached-property-handling.patch Normal file
View File

@ -0,0 +1,34 @@
From 621dbd93feff3cc33d26e76b65dafc0fbd2d7ce4 Mon Sep 17 00:00:00 2001
From: Volker Krause <volker.krause@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. */

22
Adapt-to-attached-property-changes-in-Qt-5.12.4.patch Normal file
View File

@ -0,0 +1,22 @@
From 55c8b44e461fdfbc16efb3c76ea4e5030f60ec22 Mon Sep 17 00:00:00 2001
From: Volker Krause <volker.krause@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;

7
gammaray.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jun 17 20:05:15 UTC 2019 - Wolfgang Bauer <wbauer@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
-------------------------------------------------------------------
Tue May 14 11:52:44 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>

4
gammaray.spec
View File

@ -31,6 +31,10 @@ Patch0: Fix_icons_installation.patch
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