Accepting request 985489 from KDE:Qt:5.15

Qt 5.15.5 with patch collection + qtscript 5.15.10 (forwarded request 985459 from favogt)

OBS-URL: https://build.opensuse.org/request/show/985489
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtscxml?expand=0&rev=20

0001-Revert-Bump-version.patch

@@ -1,23 +0,0 @@
-From fe880ac83d870e1dfdafb6a472ff43529187e759 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Tue, 22 Jun 2021 21:35:02 +0200
-Subject: [PATCH] Revert "Bump version"
-
-This reverts commit 7a15000f42c7a3171719727cd056f82a78244ed7.
----
- .qmake.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.qmake.conf b/.qmake.conf
-index fc6f10a..cca4cfa 100644
---- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -4,4 +4,4 @@ CONFIG += warning_clean
- 
- DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
- 
--MODULE_VERSION = 5.15.3
-+MODULE_VERSION = 5.15.2
--- 
-2.20.1
-

_service

@@ -1,12 +1,12 @@
 <services>
   <service name="obs_scm" mode="disabled">
    <param name="changesgenerate">enable</param>
-   <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+   <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
    <param name="url">https://invent.kde.org/qt/qt/qtscxml.git</param>
    <param name="scm">git</param>
    <param name="filename">qtscxml-everywhere-src</param>
    <param name="revision">kde/5.15</param>
-   <param name="parent-tag">v5.15.2</param>
+   <param name="parent-tag">v5.15.5-lts-lgpl</param>
    <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="disabled"/>

libqt5-qtscxml.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jun 27 13:10:18 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+  * Fix calling of the overloaded Scxml statemachine methods
+  * Revert "Update commercial license headers"
+  * Mark dynamic state machines' metaobjects as fully dynamic
+  * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
 -------------------------------------------------------------------
 Sat Jun 26 13:36:04 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
 

libqt5-qtscxml.spec

@@ -22,11 +22,11 @@
 %define qt5_snapshot 1
 %define libname libQt5Scxml5
 %define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
 %define tar_version qtscxml-everywhere-src-%{version}
 Name:           libqt5-qtscxml
-Version:        5.15.2+kde1
+Version:        5.15.5+kde0
 Release:        0
 Summary:        Qt 5 State Chart XML Library
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@@ -34,8 +34,6 @@ Group:          System/Libraries
 URL:            https://qt.io
 Source:         %{tar_version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-OPENSUSE
-Patch1:         0001-Revert-Bump-version.patch
 BuildRequires:  libQt5Core-private-headers-devel >= %{real_version}
 BuildRequires:  libqt5-qtbase-devel >= %{real_version}
 BuildRequires:  libqt5-qtdeclarative-devel >= %{real_version}

qtscxml-everywhere-src-5.15.2+kde1.obscpio

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

qtscxml-everywhere-src-5.15.5+kde0.obscpio

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

qtscxml-everywhere-src.obsinfo

@@ -1,5 +1,4 @@
 name: qtscxml-everywhere-src
-version: 5.15.2+kde1
-mtime: 1603777786
-commit: 7a15000f42c7a3171719727cd056f82a78244ed7
-
+version: 5.15.5+kde0
+mtime: 1652934252
+commit: bb5d10f926c51aa462a56ffb331afd4f9607855c