From eb276913d960820cf76543896540275f1d96180618c278e59a1295028bdafd43 Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe+obs@krop.fr>
Date: Tue, 10 Jan 2023 08:48:24 +0000
Subject: [PATCH] Accepting request 1057153 from home:Vogtinator:qt5.15

Qt 5.15.8, untested as usual. qtdoc not included yet.

OBS-URL: https://build.opensuse.org/request/show/1057153
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qt3d?expand=0&rev=25
---
 _service                                | 4 ++--
 _servicedata                            | 2 +-
 libqt5-qt3d.changes                     | 9 +++++++++
 libqt5-qt3d.spec                        | 6 +++---
 qt3d-everywhere-src-5.15.7+kde6.obscpio | 3 ---
 qt3d-everywhere-src-5.15.8+kde0.obscpio | 3 +++
 qt3d-everywhere-src.obsinfo             | 6 +++---
 7 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 100644 qt3d-everywhere-src-5.15.7+kde6.obscpio
 create mode 100644 qt3d-everywhere-src-5.15.8+kde0.obscpio

diff --git a/_service b/_service
index 4872506..0fd6a38 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.7+kde@TAG_OFFSET@</param>
+   <param name="versionformat">5.15.8+kde@TAG_OFFSET@</param>
    <param name="url">https://invent.kde.org/qt/qt/qt3d.git</param>
    <param name="scm">git</param>
    <param name="filename">qt3d-everywhere-src</param>
    <param name="revision">kde/5.15</param>
-   <param name="parent-tag">v5.15.7-lts-lgpl</param>
+   <param name="parent-tag">v5.15.8-lts-lgpl</param>
    <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="disabled"/>
diff --git a/_servicedata b/_servicedata
index a602810..cb68371 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://invent.kde.org/qt/qt/qt3d.git</param>
-              <param name="changesrevision">dba14d48611b9e9d59576172658779ab4a39b416</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">c3c7e6ebc29cce466d954f72f340a257d76b5ec2</param></service></servicedata>
\ No newline at end of file
diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes
index 4da2210..1a9e1f3 100644
--- a/libqt5-qt3d.changes
+++ b/libqt5-qt3d.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jan  9 09:14:30 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.8+kde0, rebased upstream:
+  * Update Assimp qt_attributions following reuse of qtquick3d assimp submodule
+  * tst_qchangearbiter: fix failures on Ubuntu 20.04 CI node
+  * Build Assimp using submodule
+  * QGeometryFactory: don't make op== virtual
+
 -------------------------------------------------------------------
 Thu Nov  3 08:50:19 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec
index dec421f..f3e8bcd 100644
--- a/libqt5-qt3d.spec
+++ b/libqt5-qt3d.spec
@@ -21,12 +21,12 @@
 %define qt5_snapshot 1
 %define libname libQt53DCore5
 %define base_name libqt5
-%define real_version 5.15.7
-%define so_version 5.15.7
+%define real_version 5.15.8
+%define so_version 5.15.8
 %define tar_version qt3d-everywhere-src-%{version}
 %global enable_assimp (0%{?suse_version} >= 1550)
 Name:           libqt5-qt3d
-Version:        5.15.7+kde6
+Version:        5.15.8+kde0
 Release:        0
 Summary:        Qt 5 3D Addon
 # Legal: some files are GPL-3.0-only WITH Qt-GPL-exception-1.0
diff --git a/qt3d-everywhere-src-5.15.7+kde6.obscpio b/qt3d-everywhere-src-5.15.7+kde6.obscpio
deleted file mode 100644
index bca258b..0000000
--- a/qt3d-everywhere-src-5.15.7+kde6.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9650a3be33740df9fefd65d932e814ac8969e59c976f8b6173b864fc51c21891
-size 119874062
diff --git a/qt3d-everywhere-src-5.15.8+kde0.obscpio b/qt3d-everywhere-src-5.15.8+kde0.obscpio
new file mode 100644
index 0000000..164bd08
--- /dev/null
+++ b/qt3d-everywhere-src-5.15.8+kde0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d779af3e507b1285ecc9bffb7e695206272ec2714720e6358f9cb094293ecb8
+size 239274510
diff --git a/qt3d-everywhere-src.obsinfo b/qt3d-everywhere-src.obsinfo
index 363f829..9a3c611 100644
--- a/qt3d-everywhere-src.obsinfo
+++ b/qt3d-everywhere-src.obsinfo
@@ -1,4 +1,4 @@
 name: qt3d-everywhere-src
-version: 5.15.7+kde6
-mtime: 1666951995
-commit: 0ff905d194e273e04e95b72dbbfd4e58193ecbaa
+version: 5.15.8+kde0
+mtime: 1668112931
+commit: c3c7e6ebc29cce466d954f72f340a257d76b5ec2