Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-declarative for openSUSE:Factory
checked in at 2023-07-11 15:57:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-declarative (Old)
and /work/SRC/openSUSE:Factory/.qt6-declarative.new.8922 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-declarative"
Tue Jul 11 15:57:23 2023 rev:28 rq:1098107 version:6.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-declarative/qt6-declarative.changes
2023-07-08 22:47:09.495128781 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-declarative.new.8922/qt6-declarative.changes
2023-07-11 15:57:46.805337782 +0200
@@ -1,0 +2,7 @@
+Tue Jul 11 09:30:38 UTC 2023 - Fabian Vogt <[email protected]>
+
+- Add patch to make qmlimportscanner usable with qml-autoreqprov
+ again (QTBUG-115170):
+ * 0001-qmlimportscanner-Include-module-versions-again.patch
+
+-------------------------------------------------------------------
New:
----
0001-qmlimportscanner-Include-module-versions-again.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-declarative.spec ++++++
--- /var/tmp/diff_new_pack.nQsEhz/_old 2023-07-11 15:57:47.597342389 +0200
+++ /var/tmp/diff_new_pack.nQsEhz/_new 2023-07-11 15:57:47.605342436 +0200
@@ -34,6 +34,8 @@
URL: https://www.qt.io
Source:
https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
Source99: qt6-declarative-rpmlintrc
+# PATCH-FIX-DOWNSTREAM
+Patch0: 0001-qmlimportscanner-Include-module-versions-again.patch
BuildRequires: pkgconfig
BuildRequires: python3-base
BuildRequires: qt6-core-private-devel
@@ -151,6 +153,7 @@
Summary: Qt 6 Declarative Tools
License: GPL-3.0-only
Requires: qt6-declarative-imports
+Requires: (qml-autoreqprov if rpm-build)
%description tools
Additional tools for inspecting, testing, viewing QML imports and files.
@@ -580,9 +583,9 @@
Requires: cmake(Qt6Gui) = %{real_version}
Requires: cmake(Qt6Qml) = %{real_version}
Requires: cmake(Qt6Quick) = %{real_version}
-Requires: cmake(Qt6QuickDialogs2Utils) = %{real_version}
-Requires: cmake(Qt6QuickDialogs2QuickImpl) = %{real_version}
Requires: cmake(Qt6QuickControls2Impl) = %{real_version}
+Requires: cmake(Qt6QuickDialogs2QuickImpl) = %{real_version}
+Requires: cmake(Qt6QuickDialogs2Utils) = %{real_version}
%description -n qt6-quickdialogs2-devel
Development files for the Qt 6 QuickDialogs2 library.
@@ -684,8 +687,8 @@
Summary: Qt6 QuickTemplates2 library - Development files
Requires: libQt6QuickTemplates2-6 = %{version}
Requires: cmake(Qt6Gui) = %{real_version}
-Requires: cmake(Qt6QmlModels) = %{real_version}
Requires: cmake(Qt6Qml) = %{real_version}
+Requires: cmake(Qt6QmlModels) = %{real_version}
Requires: cmake(Qt6Quick) = %{real_version}
%description -n qt6-quicktemplates2-devel
@@ -774,8 +777,8 @@
%package -n qt6-qmlcompiler-private-devel
Summary: Qt 6 QmlCompiler library - Development files
-Requires: qt6-qml-private-devel = %{version}
Requires: libQt6QmlCompiler6 = %{version}
+Requires: qt6-qml-private-devel = %{version}
%requires_eq qt6-core-private-devel
# The qmlcompiler library became a shared library (again) in 6.4.0
Provides: qt6-qmlcompiler-devel-static = 6.4.0
@@ -920,9 +923,9 @@
Summary: Qt6 QuickTestUtils static library
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
Requires: qt6-qml-private-devel = %{version}
+Requires: cmake(Qt6Network) = %{real_version}
Requires: cmake(Qt6Quick) = %{real_version}
Requires: cmake(Qt6QuickTest) = %{real_version}
-Requires: cmake(Qt6Network) = %{real_version}
Requires: cmake(Qt6Test) = %{real_version}
%description -n qt6-quicktestutils-devel-static
++++++ 0001-qmlimportscanner-Include-module-versions-again.patch ++++++
>From c75d424ea77385688e97f150df0d3e68ba55f5f4 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <[email protected]>
Date: Tue, 11 Jul 2023 10:51:35 +0200
Subject: [PATCH] qmlimportscanner: Include module versions again
Fixes: QTBUG-115170
---
tools/qmlimportscanner/main.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 7c8f1bc98e..c8635323ce 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -434,7 +434,6 @@ getImportDetails(const QVariant &inputImport,
import.insert(preferLiteral(), prefer);
}
}
- import.remove(versionLiteral());
const ImportDetailsAndDeps result = {import, dependencies};
cache.insert({inputImport, result});
--
2.41.0
