Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtquick3d for
openSUSE:Factory checked in at 2021-06-26 21:25:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtquick3d (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtquick3d.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtquick3d"
Sat Jun 26 21:25:19 2021 rev:6 rq:902346 version:5.15.2+kde19
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtquick3d/libqt5-qtquick3d.changes
2020-11-26 23:14:37.632999994 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtquick3d.new.2625/libqt5-qtquick3d.changes
2021-06-26 21:25:28.779344618 +0200
@@ -1,0 +2,29 @@
+Wed Jun 23 06:32:01 UTC 2021 - Fabian Vogt <[email protected]>
+
+- Switch to KDE's maintenance branch
+- Update to version 5.15.2+kde19:
+ * Fix build with system assimp
+ * Only try and use valid asset import plugins
+ * Designer support: Only show supported extension in Shader source field
+ * Fix render mode switch crash
+ * AssimpImporter : Fix the global scale value
+ * Add version 7 to supported UIP version in UipParser
+ * Fix crash on setting null camera to View3D
+ * Avoid using the inverse() method in GLSL for SkyBox shader
+ * Fix build with -no-gui configure flag
+ * Fix dynamically changing a sourceItem's size
+ * Fix transparency handling with QSGTexture
+ * Backport a number of Texture.sourceItem related changes from Qt 6
+ * Import enhanced sourceItem manual test from Qt 6
+ * Remove unused and obsolete designer files
+ * Change a default value of the assimpImporter
+ * Allow non-integer scale properties for Texture
+ * Designer: Add default shader files for CustomMaterial and Effect
+ * Add changes file for Qt 5.15.2
+ * Bump version
+- Add patch to reset version to 5.15.2:
+ * 0001-Revert-Bump-version.patch
+- Drop patches, now upstream:
+ * 0001-Fix-build-with-the-system-assimp.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Fix-build-with-the-system-assimp.patch
qtquick3d-everywhere-src-5.15.2.tar.xz
New:
----
0001-Revert-Bump-version.patch
_service
_servicedata
qtquick3d-everywhere-src-5.15.2+kde19.obscpio
qtquick3d-everywhere-src.obsinfo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtquick3d.spec ++++++
--- /var/tmp/diff_new_pack.uneon6/_old 2021-06-26 21:25:33.163350407 +0200
+++ /var/tmp/diff_new_pack.uneon6/_new 2021-06-26 21:25:33.167350412 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtquick3d
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,20 +24,21 @@
%bcond_with system_assimp
%endif
+%define qt5_snapshot 1
%define base_name libqt5
%define real_version 5.15.2
%define so_version 5.15.2
-%define tar_version qtquick3d-everywhere-src-5.15.2
+%define tar_version qtquick3d-everywhere-src-%{version}
Name: libqt5-qtquick3d
-Version: 5.15.2
+Version: 5.15.2+kde19
Release: 0
Summary: Qt 5 Quick 3D Module
License: 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
-# PATCH-FIX-UPSTREAM https://bugreports.qt.io/browse/QTBUG-84037
-Patch0: 0001-Fix-build-with-the-system-assimp.patch
+Source: %{tar_version}.tar.xz
+# PATCH-FIX-OPENSUSE
+Patch1: 0001-Revert-Bump-version.patch
BuildRequires: fdupes
%if %{with system_assimp}
BuildRequires: pkgconfig(assimp) >= 5.0.0
@@ -48,6 +49,10 @@
BuildRequires: libQt5Gui-private-headers-devel
BuildRequires: libQt5OpenGLExtensions-devel-static
BuildRequires: libqt5-qtdeclarative-private-headers-devel
+%if %{qt5_snapshot}
+#to create the forwarding headers
+BuildRequires: perl
+%endif
BuildRequires: pkgconfig
BuildRequires: xz
BuildRequires: pkgconfig(Qt5Qml) >= 5.12
@@ -134,6 +139,10 @@
%autosetup -p1 -n %{tar_version}
%build
+%if %{qt5_snapshot}
+#force the configure script to generate the forwarding headers (it checks
whether .git directory exists)
+mkdir .git
+%endif
%qmake5 -- \
%if %{with system_assimp}
-system-quick3d-assimp
++++++ 0001-Revert-Bump-version.patch ++++++
>From e21a99238b998bf02b17ae8a4b845f61504b0c5c Mon Sep 17 00:00:00 2001
From: Fabian Vogt <[email protected]>
Date: Wed, 23 Jun 2021 08:32:00 +0200
Subject: [PATCH] Revert "Bump version"
This reverts commit 80196af36528e66826549a8b54d6cc5988db1622.
---
.qmake.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.qmake.conf b/.qmake.conf
index bbf484f4..ba84e234 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ load(qt_build_config)
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.2
--
2.20.1
++++++ _service ++++++
<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/qtquick3d.git</param>
<param name="scm">git</param>
<param name="filename">qtquick3d-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 ++++++
<servicedata>
<service name="tar_scm">
<param
name="url">https://invent.kde.org/qt/qt/qtquick3d.git</param>
<param
name="changesrevision">3e3e53c834b25dc2959dd30f319d12d6f84ee1e3</param></service></servicedata>++++++
qtquick3d-everywhere-src.obsinfo ++++++
name: qtquick3d-everywhere-src
version: 5.15.2+kde19
mtime: 1622888767
commit: 3e3e53c834b25dc2959dd30f319d12d6f84ee1e3
