Accepting request 901662 from home:Vogtinator:qt5.15

Qt from KDE git

OBS-URL: https://build.opensuse.org/request/show/901662
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qt3d?expand=0&rev=19

0001-Revert-Bump-version.patch

@@ -0,0 +1,23 @@
+From 9ee6217569de30aded022c5418aad38d7c67a3aa Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Tue, 22 Jun 2021 21:35:01 +0200
+Subject: [PATCH] Revert "Bump version"
+
+This reverts commit 997ff3ad21b9303aa3321a86e5c5b9cfcfc2f807.
+---
+ .qmake.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/.qmake.conf b/.qmake.conf
+index a17c06927..a4c27d0e2 100644
+--- a/.qmake.conf
++++ b/.qmake.conf
+@@ -6,4 +6,4 @@ load(qt_build_config)
+ DEFINES += QT_NO_FOREACH
+ DEFINES += QT_NO_JAVA_STYLE_ITERATORS
+ 
+-MODULE_VERSION = 5.15.3
++MODULE_VERSION = 5.15.2
+-- 
+2.20.1
+

_service

@@ -0,0 +1,18 @@
+<services>
+  <service name="obs_scm" mode="disabled">
+   <param name="changesgenerate">enable</param>
+   <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+   <param name="url">https://invent.kde.org/qt/qt/qt3d.git</param>
+   <param name="scm">git</param>
+   <param name="filename">qt3d-everywhere-src</param>
+   <param name="revision">kde/5.15</param>
+   <param name="parent-tag">v5.15.2</param>
+   <param name="changesgenerate">enable</param>
+  </service>
+  <service name="set_version" mode="disabled"/>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
+   <param name="file">*.tar</param>
+   <param name="compression">xz</param>
+  </service>
+</services>

_servicedata

@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://invent.kde.org/qt/qt/qt3d.git</param>
+              <param name="changesrevision">9ea92434fda3b281f7fc1d10c701915405e249b7</param></service></servicedata>

libqt5-qt3d.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Tue Jun 22 19:35:01 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Switch to KDE's maintenance branch
+- Update to version 5.15.2+kde25:
+  * Fix multi-view picking
+  * Don't export QKeyFrame which is fully implemented in the header
+  * ObjectPicker: ensure pristine pickers are handled
+  * Add missing sampler types and sizes to gl4 helpers
+  * Restore ObjectLevelLockingPolicy on ShaderManager
+  * Fix light uniforms not properly being updated
+  * qpicktriangleevent_p.h Add missing private API warning
+  * Fix sampler2DArrayShadow uniform in QShaderGenerator
+  * Print warning about using primitive restart on ES2
+  * Allow assimp to compile on non-gcc compilers
+  * Fix binding of CubeMapArray textures
+  * Fix disabling shader cache via environment variable
+  * QShaderProgramBuilder: add documentation related to caching
+  * OpenGL renderer: fix use of outdated VAO when shader is reloaded
+  * SyncRenderViewPreCommandUpdate: fix a few odd cases
+  * Only set the state flag after having merged with the other states
+  * Introduce QGeometryRendererPrivate::sortIndex
+  * Add mipmaps count to QAbstracTexturePrivate
+  * Scene3DItem: release frontend/backend tree on destruction
+  * Fix GLTexture cleanup
+  * Check if texture upload is full sized
+  * Handle invalid entity names in QSceneLoader::component
+  * Add dedicated Qt3D.Renderer.ShaderCache logging category
+  * Add caching mechanism to ShaderBuilder
+  * Bump version
+- Add patch to reset version to 5.15.2:
+  * 0001-Revert-Bump-version.patch
+
 -------------------------------------------------------------------
 Sun Jan 31 13:39:52 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
 

libqt5-qt3d.spec

@@ -18,15 +18,15 @@
 # Internal QML imports of examples
 %global __requires_exclude qmlimport\\(Qardboard.*
 
-%define qt5_snapshot 0
+%define qt5_snapshot 1
 %define libname libQt53DCore5
 %define base_name libqt5
 %define real_version 5.15.2
 %define so_version 5.15.2
-%define tar_version qt3d-everywhere-src-5.15.2
+%define tar_version qt3d-everywhere-src-%{version}
 %global enable_assimp (0%{?suse_version} >= 1550)
 Name:           libqt5-qt3d
-Version:        5.15.2
+Version:        5.15.2+kde25
 Release:        0
 Summary:        Qt 5 3D Addon
 # Legal: some files are GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -34,14 +34,16 @@ Summary:        Qt 5 3D Addon
 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.15/%{real_version}/submodules/%{tar_version}.tar.xz
+Source:         %{tar_version}.tar.xz
+# PATCH-FIX-OPENSUSE
+Patch1:         0001-Revert-Bump-version.patch
 BuildRequires:  fdupes
-BuildRequires:  libQt5Bootstrap-devel-static >= %{version}
+BuildRequires:  libQt5Bootstrap-devel-static >= %{real_version}
-BuildRequires:  libQt5Concurrent-devel >= %{version}
+BuildRequires:  libQt5Concurrent-devel >= %{real_version}
-BuildRequires:  libQt5Core-private-headers-devel >= %{version}
+BuildRequires:  libQt5Core-private-headers-devel >= %{real_version}
-BuildRequires:  libQt5Gui-private-headers-devel >= %{version}
+BuildRequires:  libQt5Gui-private-headers-devel >= %{real_version}
-BuildRequires:  libQt5OpenGLExtensions-devel-static >= %{version}
+BuildRequires:  libQt5OpenGLExtensions-devel-static >= %{real_version}
-BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{version}
+BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{real_version}
 %if %{qt5_snapshot}
 #to create the forwarding headers
 BuildRequires:  perl
@@ -356,10 +358,10 @@ You need this package if you want to compile programs with qt3d.
 Summary:        Non-ABI stable experimental API for the Qt5 3D library
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
-Requires:       libQt5Core-private-headers-devel >= %{version}
+Requires:       libQt5Core-private-headers-devel >= %{real_version}
-Requires:       libQt5Gui-private-headers-devel >= %{version}
+Requires:       libQt5Gui-private-headers-devel >= %{real_version}
-Requires:       libQt5OpenGLExtensions-devel-static >= %{version}
+Requires:       libQt5OpenGLExtensions-devel-static >= %{real_version}
-Requires:       libqt5-qtdeclarative-private-headers-devel >= %{version}
+Requires:       libqt5-qtdeclarative-private-headers-devel >= %{real_version}
 BuildArch:      noarch
 
 %description private-headers-devel

qt3d-everywhere-src-5.15.2+kde25.obscpio

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

qt3d-everywhere-src-5.15.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d
-size 81925416

qt3d-everywhere-src.obsinfo

@@ -0,0 +1,5 @@
+name: qt3d-everywhere-src
+version: 5.15.2+kde25
+mtime: 1623795550
+commit: 9ea92434fda3b281f7fc1d10c701915405e249b7
+