From e4113d0e51dced59ec5825d751a0ac9ef8aa7078 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 10 May 2017 18:06:59 +0200 Subject: [PATCH] fixed bz#1449582, FTBFS on big endian arches --- qt3d-namespace-big-endian.patch | 11 +++++++++++ qt5-qt3d.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 qt3d-namespace-big-endian.patch diff --git a/qt3d-namespace-big-endian.patch b/qt3d-namespace-big-endian.patch new file mode 100644 index 0000000..bfa9605 --- /dev/null +++ b/qt3d-namespace-big-endian.patch @@ -0,0 +1,11 @@ +diff -up qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl.than qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl +--- qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl.than 2017-05-10 11:48:47.727867274 -0400 ++++ qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl 2017-05-10 11:48:29.407529841 -0400 +@@ -40,6 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + + #include "StringUtils.h" + ++using namespace Assimp; + namespace glTF { + + namespace { diff --git a/qt5-qt3d.spec b/qt5-qt3d.spec index aaacd92..9421a48 100644 --- a/qt5-qt3d.spec +++ b/qt5-qt3d.spec @@ -3,7 +3,7 @@ Summary: Qt5 - Qt3D QML bindings and C++ APIs Name: qt5-%{qt_module} Version: 5.9.0 -Release: 0.beta.3%{?dist} +Release: 1.beta.3%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://doc.qt.io/qt-5/licensing.html @@ -22,6 +22,9 @@ BuildRequires: qt5-qtimageformats BuildRequires: pkgconfig(assimp) >= 3.3.1 Requires: qt5-qtimageformats%{?_isa} >= %{version} +# namespace on big endian platforms +Patch1: qt3d-namespace-big-endian.patch + %description Qt 3D provides functionality for near-realtime simulation systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applications). @@ -41,6 +44,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-opensource-src-%{version}-beta3 +%patch1 -p1 -b .namespace-big-endian.patch %build mkdir %{_target_platform} @@ -161,6 +165,9 @@ popd %endif %changelog +* Wed May 10 2017 Than Ngo - 5.9.0-1.beta.3 +- fixed bz#1449582, FTBFS on big endian arches + * Mon May 08 2017 Helio Chissini de Castro - 5.9.0-0.beta.3 - Upstream beta 3