From c5033176c53179848285c92fb30e693d80fbebf8 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Tue, 8 Jun 2021 09:15:30 +0200
Subject: [PATCH] Fix assimp build

---
 qt3d-assimp-fix-build.patch | 28 ++++++++++++++++++++++++++++
 qt6-qt3d.spec               |  4 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 qt3d-assimp-fix-build.patch

diff --git a/qt3d-assimp-fix-build.patch b/qt3d-assimp-fix-build.patch
new file mode 100644
index 0000000..3a712ae
--- /dev/null
+++ b/qt3d-assimp-fix-build.patch
@@ -0,0 +1,28 @@
+diff --git a/src/3rdparty/assimp/src/code/Common/Importer.h b/src/3rdparty/assimp/src/code/Common/Importer.h
+index eb70bc3..c9165be 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.
+ #include <string>
+ #include <assimp/matrix4x4.h>
+ 
++#include <exception>
++#include <stdexcept>
++
+ struct aiScene;
+ 
+ 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
+--- 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>
+ 
++#include <exception>
++#include <stdexcept>
++
+ namespace Assimp {
+ // =======================================================================
+ // Public interface to Assimp
diff --git a/qt6-qt3d.spec b/qt6-qt3d.spec
index 0f10558..d16a69d 100644
--- a/qt6-qt3d.spec
+++ b/qt6-qt3d.spec
@@ -13,6 +13,8 @@ Url:     http://www.qt.io
 Source0: https://download.qt.io/official_releases/additional_libraries/%{qt_module}/%{majmin}/%{version}/%{qt_module}-everywhere-src-%{version}.tar.xz
 Source1: qt3dcore-config-multilib_p.h
 
+Patch0:  qt3d-assimp-fix-build.patch
+
 BuildRequires: gcc-c++
 BuildRequires: cmake
 BuildRequires: ninja-build
@@ -136,7 +138,7 @@ popd
 %{_qt6_includedir}/Qt3DQuickRender/
 %{_qt6_includedir}/Qt3DQuickScene2D
 %{_qt6_includedir}/Qt3DRender/
-%{_qt6_libdir}/cmake/Qt6/FindWrapAssimp.cmake
+%{_qt6_libdir}/cmake/Qt6/FindWrapQt3DAssimp.cmake
 %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/Qt3DTestsConfig.cmake
 %{_qt6_libdir}/cmake/Qt63DAnimation/*.cmake
 %{_qt6_libdir}/cmake/Qt63DCore/*.cmake