Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-declarative for openSUSE:Factory
checked in at 2023-04-29 17:28:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-declarative (Old)
and /work/SRC/openSUSE:Factory/.qt6-declarative.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-declarative"
Sat Apr 29 17:28:11 2023 rev:25 rq:1083538 version:6.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-declarative/qt6-declarative.changes
2023-04-05 21:36:37.218899018 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-declarative.new.1533/qt6-declarative.changes
2023-04-29 17:28:23.758606331 +0200
@@ -1,0 +2,6 @@
+Fri Apr 28 13:59:13 UTC 2023 - Christophe Marin <christo...@krop.fr>
+
+- Add upstream change to fix boo#1210849:
+ * 0001-QML-metatypes-Adjust-to-QMetaType-revision-increment.patch
+
+-------------------------------------------------------------------
New:
----
0001-QML-metatypes-Adjust-to-QMetaType-revision-increment.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-declarative.spec ++++++
--- /var/tmp/diff_new_pack.JxTh36/_old 2023-04-29 17:28:24.402609027 +0200
+++ /var/tmp/diff_new_pack.JxTh36/_new 2023-04-29 17:28:24.410609061 +0200
@@ -34,6 +34,8 @@
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
++++++ 0001-QML-metatypes-Adjust-to-QMetaType-revision-increment.patch ++++++
>From 25f02543ae8e334d880ce5975e32a8a6972ad962 Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosm...@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
