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/qt3d-everywhere-src-6.5.1.tar.xz b/qt3d-everywhere-src-6.5.1.tar.xz deleted file mode 100644 index e69de29..0000000 diff --git a/qt3d-everywhere-src-6.5.1.tar.xz1 b/qt3d-everywhere-src-6.5.1.tar.xz1 deleted file mode 100644 index 8642f3f..0000000 Binary files a/qt3d-everywhere-src-6.5.1.tar.xz1 and /dev/null differ diff --git a/qt3d-everywhere-src-6.5.1.tar.xz0 b/qt3d-everywhere-src-6.5.2.tar.xz similarity index 58% rename from qt3d-everywhere-src-6.5.1.tar.xz0 rename to qt3d-everywhere-src-6.5.2.tar.xz index c2ea6fd..5b21565 100644 Binary files a/qt3d-everywhere-src-6.5.1.tar.xz0 and b/qt3d-everywhere-src-6.5.2.tar.xz differ diff --git a/qt6-qt3d.spec b/qt6-qt3d.spec index 3e26162..f12b8e5 100644 --- a/qt6-qt3d.spec +++ b/qt6-qt3d.spec @@ -5,7 +5,7 @@ Summary: Qt6 - Qt3D QML bindings and C++ APIs Name: qt6-%{qt_module} -Version: 6.5.1 +Version: 6.5.2 Release: 1 %global examples 1 @@ -16,8 +16,6 @@ License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz Source1: qt3dcore-config-multilib_p.h -Source2: %{qt_module}-everywhere-src-%{version}.tar.xz0 -Source3: %{qt_module}-everywhere-src-%{version}.tar.xz1 Patch0: qt3d-assimp-fix-build.patch @@ -49,14 +47,13 @@ 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}. %endif %prep -%{__cat} %{SOURCE2} %{SOURCE3} > %{SOURCE0} +#%{__cat} %{SOURCE2} %{SOURCE3} > %{SOURCE0} %autosetup -n %{qt_module}-everywhere-src-%{version} -p1 @@ -193,6 +190,9 @@ popd %changelog +* Thu Aug 30 2023 peijiankang - 6.5.2-1 +- update version to 6.5.2 + * Fri Jul 14 2023 EastDong - 6.5.1-1 - update package