From 7feb8f666d61c2dd77fc986b3112beb75132c97b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2020 21:25:52 +0000 Subject: import qt5-qt3d-5.12.5-2.el8 --- diff --git a/.gitignore b/.gitignore index f43dfd7..9f3d7fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qt3d-everywhere-src-5.11.1.tar.xz +SOURCES/qt3d-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qt3d.metadata b/.qt5-qt3d.metadata index 3416d20..09c4651 100644 --- a/.qt5-qt3d.metadata +++ b/.qt5-qt3d.metadata @@ -1 +1 @@ -f7b287ad2878ec8de69b9b27e9db6a12808d82bd SOURCES/qt3d-everywhere-src-5.11.1.tar.xz +85a006fd77386502fe2d123938576b220275da33 SOURCES/qt3d-everywhere-src-5.12.5.tar.xz diff --git a/SOURCES/qt3dcore-config-multilib_p.h b/SOURCES/qt3dcore-config-multilib_p.h new file mode 100644 index 0000000..09affc1 --- /dev/null +++ b/SOURCES/qt3dcore-config-multilib_p.h @@ -0,0 +1,22 @@ +/* qt3dcore-config_p.h */ +/* This file is here to prevent a file conflict on multiarch systems. A + * conflict will occur because qt3dcore-config_p.h has arch-specific definitions. + * + * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */ + +#ifndef Q3DCONFIG_MULTILIB_H +#define Q3DCONFIG_MULTILIB_H + +#ifndef __WORDSIZE +#include +#endif + +#if __WORDSIZE == 32 +#include "Qt3DCore/private/qt3dcore-config-32_p.h" +#elif __WORDSIZE == 64 +#include "Qt3DCore/private/qt3dcore-config-64_p.h" +#else +#error "unexpected value for __WORDSIZE macro" +#endif + +#endif diff --git a/SPECS/qt5-qt3d.spec b/SPECS/qt5-qt3d.spec index c5c5fd6..ad20a74 100644 --- a/SPECS/qt5-qt3d.spec +++ b/SPECS/qt5-qt3d.spec @@ -1,9 +1,13 @@ %global qt_module qt3d +%global build_tests 1 + +%global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9 + Summary: Qt5 - Qt3D QML bindings and C++ APIs Name: qt5-%{qt_module} -Version: 5.11.1 -Release: 4%{?dist} +Version: 5.12.5 +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://doc.qt.io/qt-5/licensing.html @@ -11,6 +15,7 @@ License: LGPLv2 with exceptions or GPLv3 with exceptions 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 +Source1: qt3dcore-config-multilib_p.h BuildRequires: qt5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-static >= %{version} @@ -45,6 +50,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description examples %{summary}. +%if 0%{?build_tests} +%package tests +Summary: Unit tests for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +%{summary}. +%endif + %prep %setup -q -n %{qt_module}-everywhere-src-%{version} @@ -55,10 +69,33 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %make_build +%if 0%{?build_tests} +make sub-tests %{?_smp_mflags} -k ||: +%endif + %install make install INSTALL_ROOT=%{buildroot} +%if 0%{?build_tests} +# Install tests for gating +mkdir -p %{buildroot}%{_qt5_libdir}/qt5 +find ./tests -not -path '*/\.*' -type d | while read LINE +do + mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE" +done +find ./tests -not -path '*/\.*' -not -name '*.h' -not -name '*.cpp' -not -name '*.pro' -not -name 'uic_wrapper.sh' -not -name 'Makefile' -not -name 'target_wrapper.sh' -type f | while read LINE +do + cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/ +done +%endif + +%ifarch %{multilib_archs} +# multilib: qt3dcore-config_p.h + mv %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config_p.h %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config-%{__isa_bits}_p.h + install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config_p.h +%endif + ## .prl/.la file love # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs pushd %{buildroot}%{_qt5_libdir} @@ -164,8 +201,21 @@ popd %{_qt5_examplesdir}/ %endif +%if 0%{?build_tests} +%files tests +%{_qt5_libdir}/qt5/tests +%endif + %changelog +* Wed Nov 20 2019 Jan Grulich - 5.12.5-2 +- Fix multilib issue + Resolves: bz#1765637 + +* Mon Nov 18 2019 Jan Grulich - 5.12.5-1 +- 5.12.5 + Resolves: bz#1733159 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-4 - Rebuild for broken CI Resolves: bz#1657230