From 072094f3e7e698321b92eafcb297111ba42eed15 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 18 Jan 2023 08:32:34 +0100 Subject: [PATCH] Fix build --- qt3d-assimp-fix-build.patch | 13 +++++++++++++ qt6-qt3d.spec | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/qt3d-assimp-fix-build.patch b/qt3d-assimp-fix-build.patch index 87d4c30..3fe3d27 100644 --- a/qt3d-assimp-fix-build.patch +++ b/qt3d-assimp-fix-build.patch @@ -1,3 +1,16 @@ +diff --git a/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp +index 3488120..79b838d 100644 +--- a/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp ++++ b/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp +@@ -56,6 +56,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + ++#include ++ + namespace Assimp { + namespace FBX { + diff --git a/src/3rdparty/assimp/src/code/Common/Importer.h b/src/3rdparty/assimp/src/code/Common/Importer.h index e7da7f4..c41dd53 100644 --- a/src/3rdparty/assimp/src/code/Common/Importer.h diff --git a/qt6-qt3d.spec b/qt6-qt3d.spec index c9b0fcf..40d54fd 100644 --- a/qt6-qt3d.spec +++ b/qt6-qt3d.spec @@ -59,7 +59,6 @@ Requires: qt6-qtbase-devel%{?_isa} %if 0%{?examples} %package examples Summary: Programming examples for %{name} -# BuildRequires: qt6-qt3d-devel >= %{version} Requires: %{name}%{?_isa} = %{version}-%{release} %description examples %{summary}. @@ -76,8 +75,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} # Disable LTO %define _lto_cflags %{nil} -%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} -# -DQT_FEATURE_qt3d_system_assimp=ON +%cmake_qt6 \ + -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ + -DQT_FEATURE_qt3d_system_assimp=OFF %cmake_build