From f6b081e7f9be627842d41400f1fbfdd977058896 Mon Sep 17 00:00:00 2001 From: EastDong Date: Fri, 14 Jul 2023 16:34:18 +0800 Subject: [PATCH] fix build error --- qt3d-assimp-fix-build.patch | 13 +++++++++++++ qt6-qt3d.spec | 7 +++++-- 2 files changed, 18 insertions(+), 2 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 7a593bf..2a4476e 100644 --- a/qt6-qt3d.spec +++ b/qt6-qt3d.spec @@ -6,7 +6,7 @@ Summary: Qt6 - Qt3D QML bindings and C++ APIs Name: qt6-%{qt_module} Version: 6.5.0 -Release: 1 +Release: 2 %global examples 1 @@ -67,7 +67,7 @@ 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 . %{?_smp_mflags} --verbose @@ -193,6 +193,9 @@ popd %changelog +* Fri Jul 14 2023 EastDong - 6.5.0-2 +- fix error build + * Tue Apr 25 2023 EastDong - 6.5.0-1 - update package -- Gitee