From 9fe8be7bfbb643c9927ce3c47499d9364af1888a Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Tue, 14 Sep 2021 08:21:09 +0200
Subject: [PATCH] 6.2.0 - beta4

---
 .gitignore                  |  1 +
 qt3d-assimp-fix-build.patch | 12 ++++++------
 qt6-qt3d.spec               | 24 +++++++++++++++++++++---
 sources                     |  2 +-
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 42e55ba..e62f40d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /qt3d-everywhere-src-6.1.0.tar.xz
 /qt3d-everywhere-src-6.1.1.tar.xz
 /qt3d-everywhere-src-6.1.2.tar.xz
+/qt3d-everywhere-src-6.2.0-beta4.tar.xz
diff --git a/qt3d-assimp-fix-build.patch b/qt3d-assimp-fix-build.patch
index 3a712ae..87d4c30 100644
--- a/qt3d-assimp-fix-build.patch
+++ b/qt3d-assimp-fix-build.patch
@@ -1,8 +1,8 @@
 diff --git a/src/3rdparty/assimp/src/code/Common/Importer.h b/src/3rdparty/assimp/src/code/Common/Importer.h
-index eb70bc3..c9165be 100644
+index e7da7f4..c41dd53 100644
 --- a/src/3rdparty/assimp/src/code/Common/Importer.h
 +++ b/src/3rdparty/assimp/src/code/Common/Importer.h
-@@ -49,6 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+@@ -50,6 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  #include <string>
  #include <assimp/matrix4x4.h>
  
@@ -13,12 +13,12 @@ index eb70bc3..c9165be 100644
  
  namespace Assimp    {
 diff --git a/src/3rdparty/assimp/src/include/assimp/Importer.hpp b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
-index 9078fbf..ab76f93 100644
+index 09b5b68..327c71f 100644
 --- a/src/3rdparty/assimp/src/include/assimp/Importer.hpp
 +++ b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
-@@ -59,6 +59,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- // Public ASSIMP data structures
- #include <assimp/types.h>
+@@ -61,6 +61,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ #include <exception>
  
 +#include <exception>
 +#include <stdexcept>
diff --git a/qt6-qt3d.spec b/qt6-qt3d.spec
index 17d6b33..b3304a2 100644
--- a/qt6-qt3d.spec
+++ b/qt6-qt3d.spec
@@ -1,8 +1,17 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
 %global qt_module qt3d
 
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta4
+%endif
+
 Summary: Qt6 - Qt3D QML bindings and C++ APIs
 Name:    qt6-%{qt_module}
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
 Release: 1%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
@@ -10,7 +19,13 @@ Release: 1%{?dist}
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://www.qt.io
 %global majmin %(echo %{version} | cut -d. -f1-2)
-Source0: https://download.qt.io/official_releases/additional_libraries/%{qt_module}/%{majmin}/%{version}/%{qt_module}-everywhere-src-%{version}.tar.xz
+%global  qt_version %(echo %{version} | cut -d~ -f1)
+
+%if 0%{unstable}
+Source0: https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/submodules/%{qt_module}-everywhere-src-%{qt_version}-%{prerelease}.tar.xz
+%else
+Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+%endif
 Source1: qt3dcore-config-multilib_p.h
 
 Patch0:  qt3d-assimp-fix-build.patch
@@ -49,7 +64,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
 
 
 %build
@@ -187,6 +202,9 @@ popd
 
 
 %changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
 * Thu Aug 12 2021 Jan Grulich <jgrulich@redhat.com> - 6.1.2-1
 - 6.1.2
 
diff --git a/sources b/sources
index ebe210f..49c4feb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt3d-everywhere-src-6.1.2.tar.xz) = ac20920390509bcaca823062ed07b9d76e26f5140f7f9349acf40604f97d20f5f3338b8da40c756543293020e6e76e0fc2ffe0aecae51a6e7f344619d98a9125
+SHA512 (qt3d-everywhere-src-6.2.0-beta4.tar.xz) = 060e82ab72a45e7eae96094c454e7426f0bda443028d76ec50897151080cd834ec23bf9936160e2f706978b46d15644be2de4ad160905a05c3838836045c9b49