From eb8d32b95267dc64bdb38d8615c663f94603fbb1d97b4059a3e1c52cb1b6189e Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe+obs@krop.fr>
Date: Fri, 28 Apr 2023 14:00:20 +0000
Subject: [PATCH] boo#1210849

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-declarative?expand=0&rev=40
---
 ...just-to-QMetaType-revision-increment.patch | 37 +++++++++++++++++++
 qt6-declarative.changes                       |  6 +++
 qt6-declarative.spec                          |  2 +
 3 files changed, 45 insertions(+)
 create mode 100644 0001-QML-metatypes-Adjust-to-QMetaType-revision-increment.patch

diff --git a/0001-QML-metatypes-Adjust-to-QMetaType-revision-increment.patch b/0001-QML-metatypes-Adjust-to-QMetaType-revision-increment.patch
new file mode 100644
index 0000000..17c125f
--- /dev/null
+++ b/0001-QML-metatypes-Adjust-to-QMetaType-revision-increment.patch
@@ -0,0 +1,37 @@
+From 25f02543ae8e334d880ce5975e32a8a6972ad962 Mon Sep 17 00:00:00 2001
+From: Fabian Kosmale <fabian.kosmale@qt.io>
+Date: Thu, 27 Apr 2023 09:57:42 +0200
+Subject: [PATCH] QML metatypes: Adjust to QMetaType revision increment
+
+Pick-to: 6.5
+Task-number: QTBUG-113227
+Change-Id: Icd2ca482ef8656d544c7c560ca05b9dd222f9c0a
+---
+ src/qml/qml/qqmlmetatype_p.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
+index c19dd8aff7..0604bbc4db 100644
+--- a/src/qml/qml/qqmlmetatype_p.h
++++ b/src/qml/qml/qqmlmetatype_p.h
+@@ -287,7 +287,7 @@ struct QQmlMetaTypeInterface : QtPrivate::QMetaTypeInterface
+     const QByteArray name;
+     QQmlMetaTypeInterface(const QByteArray &name)
+         : QMetaTypeInterface {
+-            /*.revision=*/ 0,
++            /*.revision=*/ QMetaTypeInterface::CurrentRevision,
+             /*.alignment=*/ alignof(QObject *),
+             /*.size=*/ sizeof(QObject *),
+             /*.flags=*/ QtPrivate::QMetaTypeTypeFlags<QObject *>::Flags,
+@@ -322,7 +322,7 @@ struct QQmlListMetaTypeInterface : QtPrivate::QMetaTypeInterface
+     const QtPrivate::QMetaTypeInterface *valueType;
+     QQmlListMetaTypeInterface(const QByteArray &name, const QtPrivate::QMetaTypeInterface *valueType)
+         : QMetaTypeInterface {
+-            /*.revision=*/ 0,
++            /*.revision=*/ QMetaTypeInterface::CurrentRevision,
+             /*.alignment=*/ alignof(QQmlListProperty<QObject>),
+             /*.size=*/ sizeof(QQmlListProperty<QObject>),
+             /*.flags=*/ QtPrivate::QMetaTypeTypeFlags<QQmlListProperty<QObject>>::Flags,
+-- 
+2.40.0
+
diff --git a/qt6-declarative.changes b/qt6-declarative.changes
index 2410907..383915b 100644
--- a/qt6-declarative.changes
+++ b/qt6-declarative.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 28 13:59:13 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Add upstream change to fix boo#1210849:
+  * 0001-QML-metatypes-Adjust-to-QMetaType-revision-increment.patch
+
 -------------------------------------------------------------------
 Mon Apr  3 10:02:04 UTC 2023 - Christophe Marin <christophe@krop.fr>
 
diff --git a/qt6-declarative.spec b/qt6-declarative.spec
index 50e2c64..2d5817e 100644
--- a/qt6-declarative.spec
+++ b/qt6-declarative.spec
@@ -34,6 +34,8 @@ License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
 URL:            https://www.qt.io
 Source:         https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
 Source99:       qt6-declarative-rpmlintrc
+# PATCH-FIX-UPSTREAM
+Patch0:         0001-QML-metatypes-Adjust-to-QMetaType-revision-increment.patch
 BuildRequires:  pkgconfig
 BuildRequires:  python3-base
 BuildRequires:  qt6-core-private-devel