Accepting request 1088916 from home:krop:Qt6:Release

Qt 6.5.1

OBS-URL: https://build.opensuse.org/request/show/1088916
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-declarative?expand=0&rev=42

0001-QML-metatypes-Adjust-to-QMetaType-revision-increment.patch

@@ -1,37 +0,0 @@
-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
-

qt6-declarative.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed May 24 07:45:35 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.5.1
+  * https://www.qt.io/blog/qt-6.5.1-released
+- Drop patch, merged upstream:
+  * 0001-QML-metatypes-Adjust-to-QMetaType-revision-increment.patch
+
 -------------------------------------------------------------------
 Fri Apr 28 13:59:13 UTC 2023 - Christophe Marin <christophe@krop.fr>
 

qt6-declarative.spec

@@ -16,7 +16,7 @@
 #
 
 
-%define real_version 6.5.0
+%define real_version 6.5.1
 %define short_version 6.5
 %define tar_name qtdeclarative-everywhere-src
 %define tar_suffix %{nil}
@@ -27,15 +27,13 @@
 %endif
 #
 Name:           qt6-declarative%{?pkg_suffix}
-Version:        6.5.0
+Version:        6.5.1
 Release:        0
 Summary:        Qt 6 Declarative Libraries and tools
 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

qtdeclarative-everywhere-src-6.5.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7d631cd8ebc1491dad0f30f1b5326ae812bee4ad706e61157816a82bf588c97
-size 32597512

qtdeclarative-everywhere-src-6.5.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:201148f9614a65d169a85cd0d0fbd414603498da6ff330c4e0835ecd962dce79
+size 35506504