Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtscxml for openSUSE:Factory
checked in at 2022-06-29 16:01:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtscxml (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtscxml.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtscxml"
Wed Jun 29 16:01:13 2022 rev:20 rq:985489 version:5.15.5+kde0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtscxml/libqt5-qtscxml.changes
2021-06-26 21:25:37.615356286 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtscxml.new.1548/libqt5-qtscxml.changes
2022-06-29 16:02:29.344713018 +0200
@@ -1,0 +2,10 @@
+Mon Jun 27 13:10:18 UTC 2022 - Fabian Vogt <fab...@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
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Bump-version.patch
qtscxml-everywhere-src-5.15.2+kde1.obscpio
New:
----
qtscxml-everywhere-src-5.15.5+kde0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtscxml.spec ++++++
--- /var/tmp/diff_new_pack.BJ49xq/_old 2022-06-29 16:02:30.008713902 +0200
+++ /var/tmp/diff_new_pack.BJ49xq/_new 2022-06-29 16:02:30.012713907 +0200
@@ -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 @@
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}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.BJ49xq/_old 2022-06-29 16:02:30.048713955 +0200
+++ /var/tmp/diff_new_pack.BJ49xq/_new 2022-06-29 16:02:30.052713960 +0200
@@ -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"/>
++++++ qtscxml-everywhere-src-5.15.2+kde1.obscpio ->
qtscxml-everywhere-src-5.15.5+kde0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/.gitignore
new/qtscxml-everywhere-src-5.15.5+kde0/.gitignore
--- old/qtscxml-everywhere-src-5.15.2+kde1/.gitignore 1970-01-01
01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/.gitignore 2022-05-19
06:24:12.000000000 +0200
@@ -0,0 +1,31 @@
+.DS_Store
+/tests/3rdparty/scion-tests/node_modules
+*~
+*.pro.user
+*.qmlproject.user
+*.o
+Makefile
+.qmake.stash
+*.app
+moc_*.cpp
+*.dylib
+*.moc
+/tools/qscxmlc/qscxmlc
+/tests/testCpp/testCpp
+
+tst_cppgen
+qrc_*.cpp
+tst_scion
+.qmake.cache
+*.pch
+tests/auto/scion/compiled_tests.h
+tests/auto/scion/scxml
+tests/auto/scion/scion.h
+tests/auto/scion/scion.qrc
+
+examples/trafficlight-qml/statemachine.cpp
+examples/trafficlight-qml/statemachine.h
+examples/trafficlight-qml/Makefile.*
+examples/trafficlight-widgets/statemachine.cpp
+examples/trafficlight-widgets/statemachine.h
+examples/trafficlight-widgets/Makefile.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/.qmake.conf
new/qtscxml-everywhere-src-5.15.5+kde0/.qmake.conf
--- old/qtscxml-everywhere-src-5.15.2+kde1/.qmake.conf 2020-10-27
06:49:46.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/.qmake.conf 2022-05-19
06:24:12.000000000 +0200
@@ -4,4 +4,4 @@
DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtscxml-everywhere-src-5.15.2+kde1/0001-Revert-Bump-version.patch
new/qtscxml-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch
--- old/qtscxml-everywhere-src-5.15.2+kde1/0001-Revert-Bump-version.patch
2020-10-27 06:49:46.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-From 17bcf4ec9385ea48da11a2b4672e29f736aad0f7 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fv...@suse.de>
-Date: Tue, 22 Jun 2021 21:23:26 +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
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtscxml-everywhere-src-5.15.2+kde1/src/scxml/qscxmlcompiler.cpp
new/qtscxml-everywhere-src-5.15.5+kde0/src/scxml/qscxmlcompiler.cpp
--- old/qtscxml-everywhere-src-5.15.2+kde1/src/scxml/qscxmlcompiler.cpp
2020-10-27 06:49:46.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/src/scxml/qscxmlcompiler.cpp
2022-05-19 06:24:12.000000000 +0200
@@ -54,6 +54,14 @@
#include "qscxmltabledata_p.h"
#include <private/qmetaobjectbuilder_p.h>
+#if QT_CONFIG(scxml_ecmascriptdatamodel)
+// In Qt5 the ecmascript datamodel brings in QML dependency.
+// We use that to include the QML headers needed for invalidating
+// property cache, even though strictly speaking these are distinct
+// functionalities.
+#include <private/qqmldata_p.h>
+#include <private/qqmlpropertycache_p.h>
+#endif
#endif // BUILD_QSCXMLC
#include <functional>
@@ -587,6 +595,22 @@
{
Q_D(DynamicStateMachine);
if (d->m_metaObject != &QScxmlStateMachine::staticMetaObject) {
+#if QT_CONFIG(scxml_ecmascriptdatamodel)
+ // Invalidate the QML property cache as we delete the dynamic
+ // metaobject, otherwise stale string accesses might occur.
+ // Important! This invalidation is a workaround and brittle at
+ // at best; while string cache will be cleared, the cache itself
+ // will not. Instead we rely on that the (only) user for the cache
+ // is gone as well. This workaround is specific to Qt5, in Qt6
+ // we are able to fix the issue more properly by marking the
+ // metaobject dynamic => QML property caching will not be done.
+ //
+ // All further interaction with this property cache must be
+ // avoided.
+ QQmlData *ddata = QQmlData::get(this, false);
+ if (ddata && ddata->propertyCache)
+ ddata->propertyCache->invalidate(d->m_metaObject);
+#endif
free(const_cast<QMetaObject *>(d->m_metaObject));
d->m_metaObject = &QScxmlStateMachine::staticMetaObject;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtscxml-everywhere-src-5.15.2+kde1/tests/3rdparty/scion-tests/scxml-test-framework/.gitignore
new/qtscxml-everywhere-src-5.15.5+kde0/tests/3rdparty/scion-tests/scxml-test-framework/.gitignore
---
old/qtscxml-everywhere-src-5.15.2+kde1/tests/3rdparty/scion-tests/scxml-test-framework/.gitignore
1970-01-01 01:00:00.000000000 +0100
+++
new/qtscxml-everywhere-src-5.15.5+kde0/tests/3rdparty/scion-tests/scxml-test-framework/.gitignore
2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,4 @@
+*.sw*
+node_modules
+
+test/w3c-ecma/.DS_Store
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/auto.pro
new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/auto.pro
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/auto.pro 2020-10-27
06:49:46.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/auto.pro 2022-05-19
06:24:12.000000000 +0200
@@ -5,4 +5,5 @@
parser\
scion\
statemachine \
- statemachineinfo
+ statemachineinfo \
+ qmltest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/qmltest.pro
new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/qmltest.pro
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/qmltest.pro
1970-01-01 01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/qmltest.pro
2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,14 @@
+TEMPLATE = app
+TARGET = tst_scxmlqml
+CONFIG += qmltestcase
+
+SOURCES += \
+ $$PWD/tst_scxmlqml.cpp
+
+RESOURCES += tst_scxmlqml.qrc
+
+OTHER_FILES += \
+ $$PWD/*.qml
+
+TESTDATA += \
+ $$PWD/tst_*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/statemachine.scxml
new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/statemachine.scxml
---
old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/statemachine.scxml
1970-01-01 01:00:00.000000000 +0100
+++
new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/statemachine.scxml
2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<scxml xmlns="http://www.w3.org/2005/07/scxml";
+ version="1.0"
+ name="ColorStepper"
+ initial="red">
+
+ <state id = "red">
+ <transition target="yellow" event="step"/>
+ </state>
+
+ <state id = "yellow">
+ <transition target="green" event="step"/>
+ </state>
+
+ <final id="green"/>
+</scxml>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_dynamic.qml
new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_dynamic.qml
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_dynamic.qml
1970-01-01 01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_dynamic.qml
2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtTest 1.15
+import QtScxml 5.15
+
+TestCase {
+ id: testCase
+
+ StateMachineLoader {
+ id: loader
+ source: "qrc:///statemachine.scxml"
+ }
+
+ function test_overloaded_calls_with_dynamic_statemachine()
+ {
+ // This test calls "submitEvent" invokable function which has 3
+ // overloads, differentiated both by parameter types and amounts.
+ // Test verifies that the overloads are callable while using
+ // a dynamic statemachine which has a dynamic metaobject under the hood
+ tryVerify(() => loader.stateMachine.activeStateNames()[0] === "red",
200)
+ loader.stateMachine.submitEvent("step")
+ tryVerify(() => loader.stateMachine.activeStateNames()[0] ===
"yellow", 200)
+ loader.stateMachine.submitEvent("step", "somedata")
+ tryVerify(() => loader.stateMachine.activeStateNames()[0] === "green",
200)
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_scxmlqml.cpp
new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_scxmlqml.cpp
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_scxmlqml.cpp
1970-01-01 01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_scxmlqml.cpp
2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtQuickTest/quicktest.h>
+QUICK_TEST_MAIN(tst_scxmlqml)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_scxmlqml.qrc
new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_scxmlqml.qrc
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_scxmlqml.qrc
1970-01-01 01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_scxmlqml.qrc
2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/">
+ <file>statemachine.scxml</file>
+ </qresource>
+</RCC>
++++++ qtscxml-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.BJ49xq/_old 2022-06-29 16:02:30.388714408 +0200
+++ /var/tmp/diff_new_pack.BJ49xq/_new 2022-06-29 16:02:30.392714413 +0200
@@ -1,6 +1,5 @@
name: qtscxml-everywhere-src
-version: 5.15.2+kde1
-mtime: 1603777786
-commit: 7a15000f42c7a3171719727cd056f82a78244ed7
-
+version: 5.15.5+kde0
+mtime: 1652934252
+commit: bb5d10f926c51aa462a56ffb331afd4f9607855c
