Accepting request 757504 from KDE:Qt:5.14

5.14.0

OBS-URL: https://build.opensuse.org/request/show/757504
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qt3d?expand=0&rev=24

libqt5-qt3d.changes

@@ -1,3 +1,62 @@
+-------------------------------------------------------------------
+Tue Dec 17 10:11:11 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update the license tags.
+
+-------------------------------------------------------------------
+Thu Dec 12 12:39:44 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- 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 <fabian@ritter-vogt.de>
+
+- 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 <fabian@ritter-vogt.de>
+
+- Update to 5.14.0-beta3:
+  * New bugfix release
+  * No changelog available
+
+-------------------------------------------------------------------
+Thu Oct 24 13:22:23 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.14.0-beta2:
+  * New bugfix release
+  * No changelog available
+
+-------------------------------------------------------------------
+Tue Oct 15 12:34:18 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- 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 <fabian@ritter-vogt.de>
+
+- 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 <christophe@krop.fr>
 

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,26 +12,26 @@
 # 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
-
+%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.13.1
+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
+# Legal: some files are GPL-3.0-only WITH Qt-GPL-exception-1.0
+# 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
+URL:            https://www.qt.io
-%define base_name libqt5
+Source:         https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
-%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
 Source1:        baselibs.conf
 BuildRequires:  fdupes
 BuildRequires:  libQt5Bootstrap-devel-static >= %{version}
@@ -40,14 +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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig(zlib)
 
 %description
 Qt is a set of libraries for developing applications.
@@ -58,7 +57,7 @@ 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
@@ -66,7 +65,7 @@ Group:          System/Libraries
 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
@@ -96,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.
@@ -108,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.
@@ -198,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
+Supplements:    (%{libname} and libQtQuick5)
 
 %description imports
 Qt is a set of libraries for developing applications.
@@ -210,6 +209,7 @@ simulation systems.
 %package examples
 Summary:        Qt5 3D examples
 Group:          Development/Libraries/X11
+License:        BSD-3-Clause
 Recommends:     %{name}-devel
 
 %description examples
@@ -260,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}
 
@@ -328,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
@@ -350,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
@@ -364,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
+%post -n %{libname} -p /sbin/ldconfig
-
+%postun -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
@@ -438,34 +414,34 @@ for i in * ; do
 done
 popd
 
-%files -n %libname
+%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
 %{_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
@@ -474,55 +450,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 +510,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 +522,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 +534,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 +546,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 +558,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 +570,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 +582,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 +594,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 +606,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 +618,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 +630,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 +642,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

qt3d-everywhere-src-5.13.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:092dc9a691eb784b30b1a48799c23578f0f17d892b1cbd25f18130c67f51a452
-size 82107804

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