This commit is contained in:
Jan Grulich 2021-05-07 18:33:04 +02:00
parent 09a0c5aeec
commit d0c445efa2
4 changed files with 44 additions and 2 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/qtquick3d-everywhere-src-6.0.0.tar.xz
/qtquick3d-everywhere-src-6.0.1.tar.xz
/qtquick3d-everywhere-src-6.0.3.tar.xz
/qtquick3d-everywhere-src-6.1.0.tar.xz

View File

@ -2,7 +2,7 @@
Summary: Qt6 - Quick3D Libraries and utilities
Name: qt6-%{qt_module}
Version: 6.0.3
Version: 6.1.0
Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
@ -12,6 +12,8 @@ Url: http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
Patch0: qtquick3d-fix-build-with-gcc11.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: ninja-build
@ -103,6 +105,8 @@ popd
%{_qt6_libdir}/libQt6Quick3DAssetImport.so.6*
%{_qt6_libdir}/libQt6Quick3DRuntimeRender.so.6*
%{_qt6_libdir}/libQt6Quick3DUtils.so.6*
%{_qt6_libdir}/libQt6Quick3DIblBaker.so.6*
%{_qt6_libdir}/libQt6Quick3DParticles.so.6*
%dir %{_qt6_qmldir}/QtQuick3D/
%{_qt6_qmldir}/QtQuick3D/
%{_qt6_plugindir}/assetimporters/*.so
@ -118,8 +122,14 @@ popd
%{_qt6_datadir}/modules/*.json
%{_qt6_includedir}/QtQuick3D/
%{_qt6_includedir}/QtQuick3DAssetImport/
%{_qt6_includedir}/QtQuick3DIblBaker
%{_qt6_includedir}/QtQuick3DParticles
%{_qt6_includedir}/QtQuick3DRuntimeRender/
%{_qt6_includedir}/QtQuick3DUtils/
%dir %{_qt6_libdir}/cmake/Qt6Quick3DIblBaker
%{_qt6_libdir}/cmake/Qt6Quick3DIblBaker/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6Quick3DParticles
%{_qt6_libdir}/cmake/Qt6Quick3DParticles/*.cmake
%{_qt6_libdir}/cmake/Qt6/FindWrapQuick3DAssimp.cmake
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtQuick3DTestsConfig.cmake
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
@ -141,6 +151,10 @@ popd
%{_qt6_libdir}/libQt6Quick3DRuntimeRender.so
%{_qt6_libdir}/libQt6Quick3DUtils.prl
%{_qt6_libdir}/libQt6Quick3DUtils.so
%{_qt6_libdir}/libQt6Quick3DIblBaker.prl
%{_qt6_libdir}/libQt6Quick3DIblBaker.so
%{_qt6_libdir}/libQt6Quick3DParticles.prl
%{_qt6_libdir}/libQt6Quick3DParticles.so
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%ifnarch s390x
@ -151,6 +165,9 @@ popd
%endif
%changelog
* Thu May 06 2021 Jan Grulich <jgrulich@redhat.com> - 6.1.0-1
- 6.1.0
* Mon Apr 05 2021 Jan Grulich <jgrulich@redhat.com> - 6.0.3-1
- 6.0.3

View File

@ -0,0 +1,24 @@
diff --git a/src/3rdparty/assimp/src/code/Common/Importer.cpp b/src/3rdparty/assimp/src/code/Common/Importer.cpp
index 38eb63f..7fed1ae 100644
--- a/src/3rdparty/assimp/src/code/Common/Importer.cpp
+++ b/src/3rdparty/assimp/src/code/Common/Importer.cpp
@@ -46,6 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/version.h>
#include <assimp/config.h>
#include <assimp/importerdesc.h>
+#include <exception>
// ------------------------------------------------------------------------------------------------
/* Uncomment this line to prevent Assimp from catching unknown exceptions.
diff --git a/src/3rdparty/assimp/src/include/assimp/Importer.hpp b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
index 9078fbf..45fc455 100644
--- a/src/3rdparty/assimp/src/include/assimp/Importer.hpp
+++ b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
@@ -58,6 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Public ASSIMP data structures
#include <assimp/types.h>
+#include <exception>
namespace Assimp {
// =======================================================================

View File

@ -1 +1 @@
SHA512 (qtquick3d-everywhere-src-6.0.3.tar.xz) = 882ef5de72b72dedbcfffccefe8e5e3e1731f1cfb6668856ca2498f005cd0d20007596fef7a751fa705d1883991eb987f3c7df1bca5b98b8d7c4c5c007006b13
SHA512 (qtquick3d-everywhere-src-6.1.0.tar.xz) = 94afd434f9799240fc2c61f7dfcb28068a91df5a2e8f9aea417f5867a9272bca0dff012d3f326de436795a99095966fadd3072d76527c81041e5045d0b3d0067