From 0b472ea554cfa29b9941fef6bdda84cec8008d3c8e74e27254226f1938246154 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Tue, 28 Jun 2022 08:21:09 +0000
Subject: [PATCH] Qt 5.15.5 with patch collection + qtscript 5.15.10

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdatavis3d?expand=0&rev=14
---
 0001-Revert-Bump-version.patch                | 25 -------------------
 _service                                      |  4 +--
 libqt5-qtdatavis3d.changes                    | 10 ++++++++
 libqt5-qtdatavis3d.spec                       |  8 +++---
 ...tavis3d-everywhere-src-5.15.2+kde2.obscpio |  3 ---
 ...tavis3d-everywhere-src-5.15.5+kde0.obscpio |  3 +++
 qtdatavis3d-everywhere-src.obsinfo            |  7 +++---
 7 files changed, 21 insertions(+), 39 deletions(-)
 delete mode 100644 0001-Revert-Bump-version.patch
 delete mode 100644 qtdatavis3d-everywhere-src-5.15.2+kde2.obscpio
 create mode 100644 qtdatavis3d-everywhere-src-5.15.5+kde0.obscpio

diff --git a/0001-Revert-Bump-version.patch b/0001-Revert-Bump-version.patch
deleted file mode 100644
index ca3ef47..0000000
--- a/0001-Revert-Bump-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 12975b72d6f549cd3da9a56e8d14c84a3c578602 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Tue, 22 Jun 2021 21:38:50 +0200
-Subject: [PATCH] Revert "Bump version"
-
-This reverts commit 6ad9a687da69d54adf59e47ba285b9697a83b447.
----
- .qmake.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.qmake.conf b/.qmake.conf
-index 13d3ec1d..7f986544 100644
---- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -2,6 +2,6 @@ load(qt_build_config)
- 
- DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
- 
--MODULE_VERSION = 5.15.3
-+MODULE_VERSION = 5.15.2
- CONFIG += warning_clean
- CMAKE_MODULE_TESTS=-
--- 
-2.20.1
-
diff --git a/_service b/_service
index f619ce2..8673ef4 100644
--- a/_service
+++ b/_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/qtdatavis3d.git</param>
    <param name="scm">git</param>
    <param name="filename">qtdatavis3d-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"/>
diff --git a/libqt5-qtdatavis3d.changes b/libqt5-qtdatavis3d.changes
index 5ffc2db..4151d7a 100644
--- a/libqt5-qtdatavis3d.changes
+++ b/libqt5-qtdatavis3d.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jun 27 13:09:20 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+  * Fix QML theme showing totally dark
+  * Revert "Update commercial license headers"
+  * QSurfaceDataProxy: Fix crashes adding the first row of data
+  * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
 -------------------------------------------------------------------
 Tue Jun 22 19:38:51 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libqt5-qtdatavis3d.spec b/libqt5-qtdatavis3d.spec
index 2b68d7e..a81d5ad 100644
--- a/libqt5-qtdatavis3d.spec
+++ b/libqt5-qtdatavis3d.spec
@@ -22,19 +22,17 @@
 %define qt5_snapshot 1
 %define libname libQt5DataVisualization5
 %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 qtdatavis3d-everywhere-src-%{version}
 Name:           libqt5-qtdatavis3d
-Version:        5.15.2+kde2
+Version:        5.15.5+kde0
 Release:        0
 Summary:        Qt5 Data Visualization 3D
 License:        GPL-3.0-or-later
 Group:          Development/Libraries/X11
 URL:            https://doc.qt.io/qt-5/qtdatavisualization-index.html
 Source:         %{tar_version}.tar.xz
-# PATCH-FIX-OPENSUSE
-Patch1:         0001-Revert-Bump-version.patch
 BuildRequires:  fdupes
 BuildRequires:  libqt5-qtdeclarative-devel >= %{real_version}
 %if %{qt5_snapshot}
diff --git a/qtdatavis3d-everywhere-src-5.15.2+kde2.obscpio b/qtdatavis3d-everywhere-src-5.15.2+kde2.obscpio
deleted file mode 100644
index 149fdda..0000000
--- a/qtdatavis3d-everywhere-src-5.15.2+kde2.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6fd6a3254b9e76c5e4c2ae73239e943ae035273425a6a6c589bfe2765bb2d87
-size 19770382
diff --git a/qtdatavis3d-everywhere-src-5.15.5+kde0.obscpio b/qtdatavis3d-everywhere-src-5.15.5+kde0.obscpio
new file mode 100644
index 0000000..d20a91e
--- /dev/null
+++ b/qtdatavis3d-everywhere-src-5.15.5+kde0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91217a9799d82d0080fc6d2728d4064c74200eb12195c04297943c7c5259cfa4
+size 19773965
diff --git a/qtdatavis3d-everywhere-src.obsinfo b/qtdatavis3d-everywhere-src.obsinfo
index 6f5b04e..5602e77 100644
--- a/qtdatavis3d-everywhere-src.obsinfo
+++ b/qtdatavis3d-everywhere-src.obsinfo
@@ -1,5 +1,4 @@
 name: qtdatavis3d-everywhere-src
-version: 5.15.2+kde2
-mtime: 1603885577
-commit: c085311c02dd216e5a041b90c164d55b3cf3ce92
-
+version: 5.15.5+kde0
+mtime: 1652714198
+commit: a32c95d27224c6c9e41d6080ea54bc937c5d1455