Qt 5.15.5 with patch collection + qtscript 5.15.10

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtx11extras?expand=0&rev=13

0001-Revert-Bump-version.patch

@@ -1,23 +0,0 @@
-From 0985045bae063d07ce21438632430f55e2090b1a Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Tue, 22 Jun 2021 21:35:07 +0200
-Subject: [PATCH] Revert "Bump version"
-
-This reverts commit 3898f5484fd4864b047729bfeda9a1222f32364f.
----
- .qmake.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.qmake.conf b/.qmake.conf
-index bbf484f..ba84e23 100644
---- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -3,4 +3,4 @@ load(qt_build_config)
- CONFIG += warning_clean
- DEFINES += QT_NO_FOREACH
- 
--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/qtx11extras.git</param>
    <param name="scm">git</param>
    <param name="filename">qtx11extras-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-qtx11extras.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jun 27 13:10:57 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+  * Revert "Update commercial license headers"
+  * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
 -------------------------------------------------------------------
 Tue Jun 22 19:35:07 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
 

libqt5-qtx11extras.spec

@@ -19,11 +19,11 @@
 %define qt5_snapshot 1
 %define libname libQt5X11Extras5
 %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 qtx11extras-everywhere-src-%{version}
 Name:           libqt5-qtx11extras
-Version:        5.15.2+kde1
+Version:        5.15.5+kde0
 Release:        0
 Summary:        Qt 5 X11 Extras Addon
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@@ -31,8 +31,6 @@ Group:          Development/Libraries/X11
 URL:            https://www.qt.io
 Source:         %{tar_version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-OPENSUSE
-Patch1:         0001-Revert-Bump-version.patch
 BuildRequires:  fdupes
 BuildRequires:  libQt5Gui-private-headers-devel >= %{real_version}
 BuildRequires:  libQt5PlatformHeaders-devel >= %{real_version}

qtx11extras-everywhere-src-5.15.2+kde1.obscpio

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

qtx11extras-everywhere-src-5.15.5+kde0.obscpio

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

qtx11extras-everywhere-src.obsinfo

@@ -1,5 +1,4 @@
 name: qtx11extras-everywhere-src
-version: 5.15.2+kde1
-mtime: 1603777751
-commit: 3898f5484fd4864b047729bfeda9a1222f32364f
-
+version: 5.15.5+kde0
+mtime: 1654181614
+commit: 0dfaf36ec6f642a0fd583ce1cc33a31eb6b3328e