From 878f58124bccbd7a615c49e04e2c063066cbe96409620ecfe02aacae463b2223 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 30 Sep 2019 13:17:44 +0000 Subject: [PATCH 1/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qt3d?expand=0&rev=1 From e6f9f9db592363c9561385f7b8de288d031a60d0586f51b8167946323dec543f Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 5 Oct 2019 16:00:52 +0000 Subject: [PATCH 2/8] Accepting request 734738 from home:Vogtinator:qt5.14 Qt 5.14 Alpha OBS-URL: https://build.opensuse.org/request/show/734738 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qt3d?expand=0&rev=2 --- fix-return-nonvoid-function.patch | 19 +++++++ libqt5-qt3d.changes | 11 ++++ libqt5-qt3d.spec | 71 +++++++++++++------------ qt3d-everywhere-src-5.13.1.tar.xz | 3 -- qt3d-everywhere-src-5.14.0-alpha.tar.xz | 3 ++ 5 files changed, 69 insertions(+), 38 deletions(-) create mode 100644 fix-return-nonvoid-function.patch delete mode 100644 qt3d-everywhere-src-5.13.1.tar.xz create mode 100644 qt3d-everywhere-src-5.14.0-alpha.tar.xz diff --git a/fix-return-nonvoid-function.patch b/fix-return-nonvoid-function.patch new file mode 100644 index 0000000..4684b16 --- /dev/null +++ b/fix-return-nonvoid-function.patch @@ -0,0 +1,19 @@ +From: Fabian Vogt +Subject: Fix no return in nonvoid function error + +Optflags include -Werror=return-type, which does not like qt3d without this. + +Index: qt3d-everywhere-src-5.14.0-alpha/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp +=================================================================== +--- qt3d-everywhere-src-5.14.0-alpha.orig/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp ++++ qt3d-everywhere-src-5.14.0-alpha/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp +@@ -73,6 +73,9 @@ GLenum glAccessEnumForShaderImageAccess( + return GL_WRITE_ONLY; + case QShaderImage::ReadWrite: + return GL_READ_WRITE; ++ default: ++ Q_UNREACHABLE(); ++ return GL_NONE; + } + } + diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index afb1727..de76b6e 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Sep 30 13:29:53 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-alpha: + * New feature release + * No changelog available + * For more details about Qt 5.14 please see: + https://wiki.qt.io/New_Features_in_Qt_5.14 +- Add patch to fix build: + * fix-return-nonvoid-function.patch + ------------------------------------------------------------------- Wed Sep 25 08:42:32 UTC 2019 - Christophe Giboudeaux diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index e2e2f22..f430301 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -21,18 +21,20 @@ %define libname libQt53DCore5 Name: libqt5-qt3d -Version: 5.13.1 +Version: 5.14.0~alpha Release: 0 Summary: Qt 5 3D Addon License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.13.1 -%define so_version 5.13.1 -%define tar_version qt3d-everywhere-src-5.13.1 -Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.14.0-alpha +%define so_version 5.14.0 +%define tar_version qt3d-everywhere-src-5.14.0-alpha +Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE +Patch1: fix-return-nonvoid-function.patch BuildRequires: fdupes BuildRequires: libQt5Bootstrap-devel-static >= %{version} BuildRequires: libQt5Concurrent-devel >= %{version} @@ -47,7 +49,6 @@ BuildRequires: pkgconfig(zlib) BuildRequires: perl %endif BuildRequires: xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Qt is a set of libraries for developing applications. @@ -440,27 +441,27 @@ popd %files -n %libname %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DCore.so.* %files -n libQt53DInput5 %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DInput.so.* %files -n libQt53DQuick5 %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DQuick.so.* %files -n libQt53DQuickRender5 %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DQuickRender.so.* %files -n libQt53DRender5 %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DRender.so.* %dir %{_libqt5_libdir}/qt5/plugins/sceneparsers %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so @@ -474,55 +475,55 @@ popd %files -n libQt53DQuickInput5 %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DQuickInput.so.* %files -n libQt53DLogic5 %defattr(-,root,root,755) %{_libqt5_libdir}/libQt53DLogic.so.* -%doc LICENSE.* +%license LICENSE.* %files -n libQt53DExtras5 -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DExtras.so.* %files -n libQt53DAnimation5 -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DAnimation.so.* %files -n libQt53DQuickAnimation5 -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DQuickAnimation.so.* %files -n libQt53DQuickScene2D5 -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DQuickScene2D.so.* %dir %{_libqt5_libdir}/qt5/plugins/renderplugins %{_libqt5_libdir}/qt5/plugins/renderplugins/libscene2d.so %files -n libQt53DQuickExtras5 -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DQuickExtras.so.* %files imports %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_archdatadir}/qml/*/ %files tools %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_bindir}/qgltf %{_libqt5_bindir}/qgltf %files examples %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_examplesdir}/ %files -n libQt53DCore-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DCore.so %{_libqt5_libdir}/libQt53DCore.prl %{_libqt5_libdir}/cmake/Qt53DCore/ @@ -534,7 +535,7 @@ popd %files -n libQt53DInput-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DInput.so %{_libqt5_libdir}/libQt53DInput.prl %{_libqt5_libdir}/cmake/Qt53DInput/ @@ -546,7 +547,7 @@ popd %files -n libQt53DQuick-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DQuick.so %{_libqt5_libdir}/libQt53DQuick.prl %{_libqt5_libdir}/cmake/Qt53DQuick/ @@ -558,7 +559,7 @@ popd %files -n libQt53DQuickRender-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_includedir}/Qt3DQuickRender/ %{_libqt5_libdir}/cmake/Qt53DQuickRender/ %{_libqt5_libdir}/libQt53DQuickRender.so @@ -570,7 +571,7 @@ popd %files -n libQt53DQuickInput-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_includedir}/Qt3DQuickInput/ %{_libqt5_libdir}/libQt53DQuickInput.so %{_libqt5_libdir}/libQt53DQuickInput.prl @@ -582,7 +583,7 @@ popd %files -n libQt53DRender-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_includedir}/Qt3DRender/ %{_libqt5_libdir}/cmake/Qt53DRender/ %{_libqt5_libdir}/libQt53DRender.so @@ -594,7 +595,7 @@ popd %files -n libQt53DLogic-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DLogic.so %{_libqt5_libdir}/libQt53DLogic.prl %{_libqt5_libdir}/cmake/Qt53DLogic/ @@ -606,7 +607,7 @@ popd %files -n libQt53DExtras-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DExtras.so %{_libqt5_libdir}/libQt53DExtras.prl %{_libqt5_libdir}/cmake/Qt53DExtras/ @@ -618,7 +619,7 @@ popd %files -n libQt53DAnimation-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DAnimation.so %{_libqt5_libdir}/libQt53DAnimation.prl %{_libqt5_libdir}/cmake/Qt53DAnimation/ @@ -630,7 +631,7 @@ popd %files -n libQt53DQuickAnimation-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DQuickAnimation.so %{_libqt5_libdir}/libQt53DQuickAnimation.prl %{_libqt5_libdir}/cmake/Qt53DQuickAnimation/ @@ -642,7 +643,7 @@ popd %files -n libQt53DQuickScene2D-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DQuickScene2D.so %{_libqt5_libdir}/libQt53DQuickScene2D.prl %{_libqt5_libdir}/cmake/Qt53DQuickScene2D/ @@ -654,7 +655,7 @@ popd %files -n libQt53DQuickExtras-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_libdir}/libQt53DQuickExtras.so %{_libqt5_libdir}/libQt53DQuickExtras.prl %{_libqt5_libdir}/cmake/Qt53DQuickExtras/ @@ -666,11 +667,11 @@ popd %files private-headers-devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %{_libqt5_includedir}/Qt*/%{so_version}/ %files devel %defattr(-,root,root,755) -%doc LICENSE.* +%license LICENSE.* %changelog diff --git a/qt3d-everywhere-src-5.13.1.tar.xz b/qt3d-everywhere-src-5.13.1.tar.xz deleted file mode 100644 index 761c9d1..0000000 --- a/qt3d-everywhere-src-5.13.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:092dc9a691eb784b30b1a48799c23578f0f17d892b1cbd25f18130c67f51a452 -size 82107804 diff --git a/qt3d-everywhere-src-5.14.0-alpha.tar.xz b/qt3d-everywhere-src-5.14.0-alpha.tar.xz new file mode 100644 index 0000000..b7a86d6 --- /dev/null +++ b/qt3d-everywhere-src-5.14.0-alpha.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea9fbfaf8f13ff4a1eb22233cdccdfd11317274788d54143354a7be929aa60b7 +size 82188104 From c86034d5446fdae116ea09ddf4167d13106ab9fe0919f7340f8e78e5ca14e936 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 28 Oct 2019 17:53:53 +0000 Subject: [PATCH 3/8] Accepting request 743230 from home:Vogtinator:qt5.14 Qt 5.14.0 Beta 2 OBS-URL: https://build.opensuse.org/request/show/743230 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qt3d?expand=0&rev=3 --- fix-return-nonvoid-function.patch | 19 ------------------- libqt5-qt3d.changes | 16 ++++++++++++++++ libqt5-qt3d.spec | 8 +++----- qt3d-everywhere-src-5.14.0-alpha.tar.xz | 3 --- qt3d-everywhere-src-5.14.0-beta2.tar.xz | 3 +++ 5 files changed, 22 insertions(+), 27 deletions(-) delete mode 100644 fix-return-nonvoid-function.patch delete mode 100644 qt3d-everywhere-src-5.14.0-alpha.tar.xz create mode 100644 qt3d-everywhere-src-5.14.0-beta2.tar.xz diff --git a/fix-return-nonvoid-function.patch b/fix-return-nonvoid-function.patch deleted file mode 100644 index 4684b16..0000000 --- a/fix-return-nonvoid-function.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Fabian Vogt -Subject: Fix no return in nonvoid function error - -Optflags include -Werror=return-type, which does not like qt3d without this. - -Index: qt3d-everywhere-src-5.14.0-alpha/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp -=================================================================== ---- qt3d-everywhere-src-5.14.0-alpha.orig/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp -+++ qt3d-everywhere-src-5.14.0-alpha/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp -@@ -73,6 +73,9 @@ GLenum glAccessEnumForShaderImageAccess( - return GL_WRITE_ONLY; - case QShaderImage::ReadWrite: - return GL_READ_WRITE; -+ default: -+ Q_UNREACHABLE(); -+ return GL_NONE; - } - } - diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index de76b6e..5a7845b 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Oct 24 13:22:23 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-beta2: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Tue Oct 15 12:34:18 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-beta1: + * New bugfix release + * No changelog available +- Drop patches, now upstream: + * fix-return-nonvoid-function.patch + ------------------------------------------------------------------- Mon Sep 30 13:29:53 UTC 2019 - Fabian Vogt diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index f430301..fd9ddb6 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -21,20 +21,18 @@ %define libname libQt53DCore5 Name: libqt5-qt3d -Version: 5.14.0~alpha +Version: 5.14.0~beta2 Release: 0 Summary: Qt 5 3D Addon License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.14.0-alpha +%define real_version 5.14.0-beta2 %define so_version 5.14.0 -%define tar_version qt3d-everywhere-src-5.14.0-alpha +%define tar_version qt3d-everywhere-src-5.14.0-beta2 Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-OPENSUSE -Patch1: fix-return-nonvoid-function.patch BuildRequires: fdupes BuildRequires: libQt5Bootstrap-devel-static >= %{version} BuildRequires: libQt5Concurrent-devel >= %{version} diff --git a/qt3d-everywhere-src-5.14.0-alpha.tar.xz b/qt3d-everywhere-src-5.14.0-alpha.tar.xz deleted file mode 100644 index b7a86d6..0000000 --- a/qt3d-everywhere-src-5.14.0-alpha.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea9fbfaf8f13ff4a1eb22233cdccdfd11317274788d54143354a7be929aa60b7 -size 82188104 diff --git a/qt3d-everywhere-src-5.14.0-beta2.tar.xz b/qt3d-everywhere-src-5.14.0-beta2.tar.xz new file mode 100644 index 0000000..e38a3a1 --- /dev/null +++ b/qt3d-everywhere-src-5.14.0-beta2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca3abadd89dee3c0455e42e8ddd7673339344b9648de8f487c03fc20bf5ee7a1 +size 81627488 From f7a82da993b467850c95e51bb018432662d883935f7bc41319cf9de0b29ea6a2 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 14 Nov 2019 08:34:35 +0000 Subject: [PATCH 4/8] Accepting request 748159 from home:Vogtinator:qt5.14 Qt 5.14 Beta 3 OBS-URL: https://build.opensuse.org/request/show/748159 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qt3d?expand=0&rev=4 --- libqt5-qt3d.changes | 7 +++++++ libqt5-qt3d.spec | 6 +++--- qt3d-everywhere-src-5.14.0-beta2.tar.xz | 3 --- qt3d-everywhere-src-5.14.0-beta3.tar.xz | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 qt3d-everywhere-src-5.14.0-beta2.tar.xz create mode 100644 qt3d-everywhere-src-5.14.0-beta3.tar.xz diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index 5a7845b..e0899e9 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 12 13:00:24 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-beta3: + * New bugfix release + * No changelog available + ------------------------------------------------------------------- Thu Oct 24 13:22:23 UTC 2019 - Fabian Vogt diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index fd9ddb6..6a1bd80 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -21,16 +21,16 @@ %define libname libQt53DCore5 Name: libqt5-qt3d -Version: 5.14.0~beta2 +Version: 5.14.0~beta3 Release: 0 Summary: Qt 5 3D Addon License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.14.0-beta2 +%define real_version 5.14.0-beta3 %define so_version 5.14.0 -%define tar_version qt3d-everywhere-src-5.14.0-beta2 +%define tar_version qt3d-everywhere-src-5.14.0-beta3 Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf BuildRequires: fdupes diff --git a/qt3d-everywhere-src-5.14.0-beta2.tar.xz b/qt3d-everywhere-src-5.14.0-beta2.tar.xz deleted file mode 100644 index e38a3a1..0000000 --- a/qt3d-everywhere-src-5.14.0-beta2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca3abadd89dee3c0455e42e8ddd7673339344b9648de8f487c03fc20bf5ee7a1 -size 81627488 diff --git a/qt3d-everywhere-src-5.14.0-beta3.tar.xz b/qt3d-everywhere-src-5.14.0-beta3.tar.xz new file mode 100644 index 0000000..d1fc143 --- /dev/null +++ b/qt3d-everywhere-src-5.14.0-beta3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0609aa910c103137f619dd478dfb4a36916fce2446c505f7558c2b3b8679673c +size 81636208 From 665331592be595c2b58d52c80a1df43bcde9617004129e742e2d7955a400941a Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 5 Dec 2019 09:41:11 +0000 Subject: [PATCH 5/8] Accepting request 754286 from home:Vogtinator:qt5.14 Qt 5.14.0 RC1 OBS-URL: https://build.opensuse.org/request/show/754286 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qt3d?expand=0&rev=5 --- libqt5-qt3d.changes | 10 ++++++++++ libqt5-qt3d.spec | 6 +++--- qt3d-everywhere-src-5.14.0-beta3.tar.xz | 3 --- qt3d-everywhere-src-5.14.0-rc.tar.xz | 3 +++ 4 files changed, 16 insertions(+), 6 deletions(-) delete mode 100644 qt3d-everywhere-src-5.14.0-beta3.tar.xz create mode 100644 qt3d-everywhere-src-5.14.0-rc.tar.xz diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index e0899e9..20294e7 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Dec 4 14:37:30 UTC 2019 - Fabian Vogt + +- Update to 5.14.0-rc: + * New bugfix release + * No changelog available + * For more details please see: + * For more details about Qt 5.14 please see: + https://wiki.qt.io/New_Features_in_Qt_5.14 + ------------------------------------------------------------------- Tue Nov 12 13:00:24 UTC 2019 - Fabian Vogt diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index 6a1bd80..0a51e7d 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -21,16 +21,16 @@ %define libname libQt53DCore5 Name: libqt5-qt3d -Version: 5.14.0~beta3 +Version: 5.14.0~rc Release: 0 Summary: Qt 5 3D Addon License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.14.0-beta3 +%define real_version 5.14.0-rc %define so_version 5.14.0 -%define tar_version qt3d-everywhere-src-5.14.0-beta3 +%define tar_version qt3d-everywhere-src-5.14.0-rc Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf BuildRequires: fdupes diff --git a/qt3d-everywhere-src-5.14.0-beta3.tar.xz b/qt3d-everywhere-src-5.14.0-beta3.tar.xz deleted file mode 100644 index d1fc143..0000000 --- a/qt3d-everywhere-src-5.14.0-beta3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0609aa910c103137f619dd478dfb4a36916fce2446c505f7558c2b3b8679673c -size 81636208 diff --git a/qt3d-everywhere-src-5.14.0-rc.tar.xz b/qt3d-everywhere-src-5.14.0-rc.tar.xz new file mode 100644 index 0000000..8e3d408 --- /dev/null +++ b/qt3d-everywhere-src-5.14.0-rc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e517df3bc6c74da6d576efb0eae8015769004626933a599821519b0123e0a640 +size 81557284 From ec849d1ca9eb94edafe2c207319f8c8c7b03dad6cd887105f1e55f6500a322fd Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 12 Dec 2019 20:39:49 +0000 Subject: [PATCH 6/8] Accepting request 756177 from home:Vogtinator:qt5.14 Qt 5.14.0 final - not fully built yet OBS-URL: https://build.opensuse.org/request/show/756177 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qt3d?expand=0&rev=6 --- libqt5-qt3d.changes | 10 ++++++++++ libqt5-qt3d.spec | 8 ++++---- qt3d-everywhere-src-5.14.0-rc.tar.xz | 3 --- qt3d-everywhere-src-5.14.0.tar.xz | 3 +++ 4 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 qt3d-everywhere-src-5.14.0-rc.tar.xz create mode 100644 qt3d-everywhere-src-5.14.0.tar.xz diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index 20294e7..ad78830 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Dec 12 12:39:44 UTC 2019 - Fabian Vogt + +- Update to 5.14.0: + * New bugfix release + * For the changes between 5.13.2 and 5.14.0 please see: + https://code.qt.io/cgit/qt/qt3d.git/tree/dist/changes-5.14.0?h=v5.14.0 + * For the changes between 5.13.1 and 5.13.2 please see: + https://code.qt.io/cgit/qt/qt3d.git/tree/dist/changes-5.13.2?h=v5.14.0 + ------------------------------------------------------------------- Wed Dec 4 14:37:30 UTC 2019 - Fabian Vogt diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index 0a51e7d..eecf8b7 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -21,17 +21,17 @@ %define libname libQt53DCore5 Name: libqt5-qt3d -Version: 5.14.0~rc +Version: 5.14.0 Release: 0 Summary: Qt 5 3D Addon License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.14.0-rc +%define real_version 5.14.0 %define so_version 5.14.0 -%define tar_version qt3d-everywhere-src-5.14.0-rc -Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz +%define tar_version qt3d-everywhere-src-5.14.0 +Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf BuildRequires: fdupes BuildRequires: libQt5Bootstrap-devel-static >= %{version} diff --git a/qt3d-everywhere-src-5.14.0-rc.tar.xz b/qt3d-everywhere-src-5.14.0-rc.tar.xz deleted file mode 100644 index 8e3d408..0000000 --- a/qt3d-everywhere-src-5.14.0-rc.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e517df3bc6c74da6d576efb0eae8015769004626933a599821519b0123e0a640 -size 81557284 diff --git a/qt3d-everywhere-src-5.14.0.tar.xz b/qt3d-everywhere-src-5.14.0.tar.xz new file mode 100644 index 0000000..61fba9f --- /dev/null +++ b/qt3d-everywhere-src-5.14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:515b57d0f99be48f70817cf73bc8a0c0e63f7c9c41dbf35fc8baf065fc752515 +size 81564944 From 9e0f825fad70b408d5da9e66c112119770f0451b6e9189870c6064f8201fdc2b Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 17 Dec 2019 10:11:19 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qt3d?expand=0&rev=7 --- libqt5-qt3d.changes | 5 +++ libqt5-qt3d.spec | 103 +++++++++++++++++--------------------------- 2 files changed, 45 insertions(+), 63 deletions(-) diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index ad78830..34a335d 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 17 10:11:11 UTC 2019 - Christophe Giboudeaux + +- Update the license tags. + ------------------------------------------------------------------- Thu Dec 12 12:39:44 UTC 2019 - Fabian Vogt diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index eecf8b7..ebf8c08 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qt3d # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define qt5_snapshot 0 - %define libname libQt53DCore5 - -Name: libqt5-qt3d -Version: 5.14.0 -Release: 0 -Summary: Qt 5 3D Addon -License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only -Group: Development/Libraries/X11 -Url: https://www.qt.io %define base_name libqt5 %define real_version 5.14.0 %define so_version 5.14.0 %define tar_version qt3d-everywhere-src-5.14.0 +Name: libqt5-qt3d +Version: 5.14.0 +Release: 0 +Summary: Qt 5 3D Addon +# Legal: some files are GPL-3.0-only WITH Qt-GPL-exception-1.0 +# The exception allows applying using these files under the license of the larger project using them +License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) +Group: Development/Libraries/X11 +URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf BuildRequires: fdupes @@ -40,13 +40,13 @@ BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5Gui-private-headers-devel >= %{version} BuildRequires: libQt5OpenGLExtensions-devel-static >= %{version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} -BuildRequires: pkgconfig(zlib) - -%if %qt5_snapshot +%if %{qt5_snapshot} #to create the forwarding headers BuildRequires: perl %endif +BuildRequires: pkgconfig BuildRequires: xz +BuildRequires: pkgconfig(zlib) %description Qt is a set of libraries for developing applications. @@ -57,15 +57,15 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica %prep %autosetup -p1 -n %{tar_version} -%package -n %libname +%package -n %{libname} Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 # Removed in Qt3D 5.6 Provides: libQt53dCollision5 = %{version} Obsoletes: libQt53dCollision5 < %{version} -%description -n %libname +%description -n %{libname} Qt is a set of libraries for developing applications. Qt 3D provides functionality for near-realtime simulation @@ -74,7 +74,7 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica %package -n libQt53DInput5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DInput5 Qt is a set of libraries for developing applications. @@ -85,7 +85,7 @@ applications using Qt3D. %package -n libQt53DQuick5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DQuick5 Qt is a set of libraries for developing applications. @@ -95,9 +95,9 @@ This package provides core Qt 3D QML types. %package -n libQt53DQuickRender5 Summary: Qt 5 3D Addon Group: System/Libraries +%requires_ge libQt5Core5 Provides: libQt53DQuickRenderer5 = %{version} Obsoletes: libQt53DQuickRenderer5 < %{version} -%requires_ge libQt5Core5 %description -n libQt53DQuickRender5 Qt is a set of libraries for developing applications. @@ -107,9 +107,9 @@ This package provides Qt 3D QML types for rendering. %package -n libQt53DRender5 Summary: Qt 5 3D Addon Group: System/Libraries +%requires_ge libQt5Core5 Provides: libQt53DRenderer5 = %{version} Obsoletes: libQt53DRenderer5 < %{version} -%requires_ge libQt5Core5 %description -n libQt53DRender5 Qt is a set of libraries for developing applications. @@ -120,7 +120,7 @@ rendering using Qt 3D. %package -n libQt53DQuickInput5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DQuickInput5 Qt is a set of libraries for developing applications. @@ -131,7 +131,7 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica %package -n libQt53DLogic5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DLogic5 Qt is a set of libraries for developing applications. @@ -142,7 +142,7 @@ backend. %package -n libQt53DExtras5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DExtras5 Qt is a set of libraries for developing applications. @@ -153,7 +153,7 @@ systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applica %package -n libQt53DQuickExtras5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DQuickExtras5 Qt is a set of libraries for developing applications. @@ -164,7 +164,7 @@ simulation systems. %package -n libQt53DAnimation5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DAnimation5 Qt is a set of libraries for developing applications. @@ -175,7 +175,7 @@ simulation systems. %package -n libQt53DQuickAnimation5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DQuickAnimation5 Qt is a set of libraries for developing applications. @@ -186,7 +186,7 @@ simulation systems. %package -n libQt53DQuickScene2D5 Summary: Qt 5 3D Addon Group: System/Libraries -%requires_ge libQt5Core5 +%requires_ge libQt5Core5 %description -n libQt53DQuickScene2D5 Qt is a set of libraries for developing applications. @@ -197,8 +197,8 @@ simulation systems. %package imports Summary: Qt 5 3D Library - QML imports Group: Development/Libraries/X11 -Supplements: packageand(%{libname}:libQtQuick5) -%requires_ge libQtQuick5 +%requires_ge libQtQuick5 +Supplements: (%{libname} and libQtQuick5) %description imports Qt is a set of libraries for developing applications. @@ -209,6 +209,7 @@ simulation systems. %package examples Summary: Qt5 3D examples Group: Development/Libraries/X11 +License: BSD-3-Clause Recommends: %{name}-devel %description examples @@ -259,9 +260,9 @@ Development files for the Qt 5 QuickRenderer 3D library. %package -n libQt53DRender-devel Summary: Development files for the Qt 5 Renderer 3D library Group: Development/Libraries/X11 -Requires: libQt53DRender5 = %{version} # Qt53DRenderConfig.cmake requires libscene2d.so Requires: libQt53DQuickScene2D5 = %{version} +Requires: libQt53DRender5 = %{version} Provides: libQt53DRenderer-devel = %{version} Obsoletes: libQt53DRenderer-devel < %{version} @@ -327,16 +328,16 @@ Development files for the Qt 5 Logic 3D library. %package devel Summary: Development files for the Qt5 3D library Group: Development/Libraries/X11 +Requires: libQt53DAnimation-devel = %{version} Requires: libQt53DCore-devel = %{version} Requires: libQt53DExtras-devel = %{version} Requires: libQt53DInput-devel = %{version} Requires: libQt53DLogic-devel = %{version} Requires: libQt53DQuick-devel = %{version} +Requires: libQt53DQuickAnimation-devel = %{version} Requires: libQt53DQuickExtras-devel = %{version} Requires: libQt53DQuickInput-devel = %{version} Requires: libQt53DQuickRender-devel = %{version} -Requires: libQt53DAnimation-devel = %{version} -Requires: libQt53DQuickAnimation-devel = %{version} Requires: libQt53DQuickScene2D-devel = %{version} Requires: libQt53DRender-devel = %{version} # Removed in Qt3D 5.6 @@ -349,13 +350,12 @@ You need this package if you want to compile programs with qt3d. %package private-headers-devel Summary: Non-ABI stable experimental API for the Qt5 3D library Group: Development/Libraries/C and C++ -BuildArch: noarch Requires: %{name}-devel = %{version} Requires: libQt5Core-private-headers-devel >= %{version} -Requires: libQt5Core-private-headers-devel >= %{version} Requires: libQt5Gui-private-headers-devel >= %{version} Requires: libQt5OpenGLExtensions-devel-static >= %{version} Requires: libqt5-qtdeclarative-private-headers-devel >= %{version} +BuildArch: noarch %description private-headers-devel This package provides private headers of libqt5-qt3d that are normally @@ -363,58 +363,35 @@ not used by application development and that do not have any ABI or API guarantees. The packages that build against these have to require the exact Qt version. -%post -n %libname -p /sbin/ldconfig - -%postun -n %libname -p /sbin/ldconfig - +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %post -n libQt53DInput5 -p /sbin/ldconfig - %postun -n libQt53DInput5 -p /sbin/ldconfig - %post -n libQt53DQuick5 -p /sbin/ldconfig - %postun -n libQt53DQuick5 -p /sbin/ldconfig - %post -n libQt53DQuickRender5 -p /sbin/ldconfig - %postun -n libQt53DQuickRender5 -p /sbin/ldconfig - %post -n libQt53DRender5 -p /sbin/ldconfig - %postun -n libQt53DRender5 -p /sbin/ldconfig - %post -n libQt53DQuickInput5 -p /sbin/ldconfig - %postun -n libQt53DQuickInput5 -p /sbin/ldconfig - %post -n libQt53DLogic5 -p /sbin/ldconfig - %postun -n libQt53DLogic5 -p /sbin/ldconfig - %post -n libQt53DExtras5 -p /sbin/ldconfig - %postun -n libQt53DExtras5 -p /sbin/ldconfig - %post -n libQt53DAnimation5 -p /sbin/ldconfig - %postun -n libQt53DAnimation5 -p /sbin/ldconfig - %post -n libQt53DQuickAnimation5 -p /sbin/ldconfig - %postun -n libQt53DQuickAnimation5 -p /sbin/ldconfig - %post -n libQt53DQuickScene2D5 -p /sbin/ldconfig - %postun -n libQt53DQuickScene2D5 -p /sbin/ldconfig - %post -n libQt53DQuickExtras5 -p /sbin/ldconfig - %postun -n libQt53DQuickExtras5 -p /sbin/ldconfig %build # -flto breaks CONFIG += resources_big (QTBUG-73834), but resources_big is needed to prevent excessive memory use %define _lto_cflags %{nil} -%if %qt5_snapshot +%if %{qt5_snapshot} #force the configure script to generate the forwarding headers (it checks whether .git directory exists) mkdir .git %endif @@ -437,7 +414,7 @@ for i in * ; do done popd -%files -n %libname +%files -n %{libname} %defattr(-,root,root,755) %license LICENSE.* %{_libqt5_libdir}/libQt53DCore.so.* @@ -464,7 +441,7 @@ popd %dir %{_libqt5_libdir}/qt5/plugins/sceneparsers %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneexport.so -%if 0%{suse_version} >= 1500 +%if 0%{?suse_version} >= 1500 %{_libqt5_libdir}/qt5/plugins/sceneparsers/libassimpsceneimport.so %endif %dir %{_libqt5_libdir}/qt5/plugins/geometryloaders From 3f20ba6d9f11c45127fc6fdac1d19f0e7b18455b45806057e17de7e484f0317a Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 17 Dec 2019 10:48:54 +0000 Subject: [PATCH 8/8] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qt3d?expand=0&rev=8 --- libqt5-qt3d.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index ebf8c08..f1e5f0c 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -27,7 +27,7 @@ Version: 5.14.0 Release: 0 Summary: Qt 5 3D Addon # Legal: some files are GPL-3.0-only WITH Qt-GPL-exception-1.0 -# The exception allows applying using these files under the license of the larger project using them +# The exception allows using these files under the license of the larger project License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: Development/Libraries/X11 URL: https://www.qt.io