diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch deleted file mode 100644 index ff44d39..0000000 --- a/0001-Revert-Bump-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -From fe880ac83d870e1dfdafb6a472ff43529187e759 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -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 - diff --git a/_service b/_service index 6480fad..8116b7e 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ enable - 5.15.2+kde@TAG_OFFSET@ + 5.15.5+kde@TAG_OFFSET@ https://invent.kde.org/qt/qt/qtscxml.git git qtscxml-everywhere-src kde/5.15 - v5.15.2 + v5.15.5-lts-lgpl enable diff --git a/libqt5-qtscxml.changes b/libqt5-qtscxml.changes index 30c9bc6..134a907 100644 --- a/libqt5-qtscxml.changes +++ b/libqt5-qtscxml.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jun 27 13:10:18 UTC 2022 - Fabian Vogt + +- 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 diff --git a/libqt5-qtscxml.spec b/libqt5-qtscxml.spec index 83aca39..f5aa37a 100644 --- a/libqt5-qtscxml.spec +++ b/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} diff --git a/qtscxml-everywhere-src-5.15.2+kde1.obscpio b/qtscxml-everywhere-src-5.15.2+kde1.obscpio deleted file mode 100644 index 40c8597..0000000 --- a/qtscxml-everywhere-src-5.15.2+kde1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49931abf97c83b5bbd0a75fe9c110753690b508170d9002b166b21974f9bd2d0 -size 2483213 diff --git a/qtscxml-everywhere-src-5.15.5+kde0.obscpio b/qtscxml-everywhere-src-5.15.5+kde0.obscpio new file mode 100644 index 0000000..199d5fd --- /dev/null +++ b/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 diff --git a/qtscxml-everywhere-src.obsinfo b/qtscxml-everywhere-src.obsinfo index c96c474..cb6c349 100644 --- a/qtscxml-everywhere-src.obsinfo +++ b/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