update version to 6.5.2

This commit is contained in:
peijiankang 2023-11-30 21:05:40 +08:00
parent 0f0a36d625
commit 2163b1382e
5 changed files with 18 additions and 5 deletions

View File

@ -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 <assimp/DefaultLogger.hpp>
#include <assimp/StringUtils.h>
+#include <cstdint>
+
namespace Assimp {
namespace FBX {
diff --git a/src/3rdparty/assimp/src/code/Common/Importer.h b/src/3rdparty/assimp/src/code/Common/Importer.h diff --git a/src/3rdparty/assimp/src/code/Common/Importer.h b/src/3rdparty/assimp/src/code/Common/Importer.h
index e7da7f4..c41dd53 100644 index e7da7f4..c41dd53 100644
--- a/src/3rdparty/assimp/src/code/Common/Importer.h --- a/src/3rdparty/assimp/src/code/Common/Importer.h

Binary file not shown.

View File

@ -5,7 +5,7 @@
Summary: Qt6 - Qt3D QML bindings and C++ APIs Summary: Qt6 - Qt3D QML bindings and C++ APIs
Name: qt6-%{qt_module} Name: qt6-%{qt_module}
Version: 6.5.1 Version: 6.5.2
Release: 1 Release: 1
%global examples 1 %global examples 1
@ -16,8 +16,6 @@ License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://www.qt.io Url: http://www.qt.io
Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz 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 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 Patch0: qt3d-assimp-fix-build.patch
@ -49,14 +47,13 @@ Requires: qt6-qtbase-devel%{?_isa}
%if 0%{?examples} %if 0%{?examples}
%package examples %package examples
Summary: Programming examples for %{name} Summary: Programming examples for %{name}
# BuildRequires: qt6-qt3d-devel >= %{version}
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples %description examples
%{summary}. %{summary}.
%endif %endif
%prep %prep
%{__cat} %{SOURCE2} %{SOURCE3} > %{SOURCE0} #%{__cat} %{SOURCE2} %{SOURCE3} > %{SOURCE0}
%autosetup -n %{qt_module}-everywhere-src-%{version} -p1 %autosetup -n %{qt_module}-everywhere-src-%{version} -p1
@ -193,6 +190,9 @@ popd
%changelog %changelog
* Thu Aug 30 2023 peijiankang <peijiankang@kylinos.cn> - 6.5.2-1
- update version to 6.5.2
* Fri Jul 14 2023 EastDong <xudong23@iscas.ac.cn> - 6.5.1-1 * Fri Jul 14 2023 EastDong <xudong23@iscas.ac.cn> - 6.5.1-1
- update package - update package