pool/qt6-declarative
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1098107 from KDE:Qt6

Browse Source 
- Add patch to make qmlimportscanner usable with qml-autoreqprov
  again (QTBUG-115170):
  * 0001-qmlimportscanner-Include-module-versions-again.patch

OBS-URL: https://build.opensuse.org/request/show/1098107
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-declarative?expand=0&rev=28
This commit is contained in:
Ana Guerrero 2023-07-11 13:57:23 +00:00 committed by Git OBS Bridge
commit 908bb967eb
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0001-qmlimportscanner-Include-module-versions-again.patch Normal file
View File

@ -0,0 +1,25 @@
From c75d424ea77385688e97f150df0d3e68ba55f5f4 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
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

7
qt6-declarative.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 11 09:30:38 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to make qmlimportscanner usable with qml-autoreqprov
again (QTBUG-115170):
* 0001-qmlimportscanner-Include-module-versions-again.patch
-------------------------------------------------------------------
Fri Jun 30 15:13:09 UTC 2023 - Christophe Marin <christophe@krop.fr>

13
qt6-declarative.spec
View File

@ -34,6 +34,8 @@ License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
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 @@ QML files and plugins from the Qt 6 Declarative module.
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: libQt6QuickDialogs2-6 = %{version}
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 @@ The Qt 6 QuickTemplates2 library.
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 @@ This library does not have any ABI or API guarantees.
%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 @@ The Qt6 QuickControlsTestUtils static library.
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