SLFO-pool/qml-autoreqprov
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main qml-autoreqprov revision 92a6b130ee96949fe3e1743a04cabb25

Browse Source
This commit is contained in:
Adrian Schröter 2024-08-21 17:22:26 +02:00
parent ac6f75373c
commit 2be1e21300
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qml-autoreqprov.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Jan 22 14:18:20 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Bump version to 1.4.1
- qmldirreqprov.sh:
* Only generate unversioned URI provides for Qt 6+
-------------------------------------------------------------------
Sun Jan 21 12:11:19 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Bump version to 1.4
- qml.req:
* Detect Qt version based on libQtCore presence. The previous method
broke if /usr/libexec/qtX or kf5-filesystem were present.
- qmldirreqprov.sh:
* Generate unversioned URI provides for plugin provided imports as well
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 14 23:57:17 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de> Tue Nov 14 23:57:17 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>

4
qml-autoreqprov.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package qml-autoreqprov # spec file for package qml-autoreqprov
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: qml-autoreqprov Name: qml-autoreqprov
Version: 1.3 Version: 1.4.1
Release: 0 Release: 0
Summary: Automatic dependency generator for QML files and modules Summary: Automatic dependency generator for QML files and modules
License: GPL-3.0-or-later License: GPL-3.0-or-later

4
qml.req
View File

@ -25,7 +25,9 @@ qtver=
[[ -n ${qtvers} ]] || qtvers="5 6 7" [[ -n ${qtvers} ]] || qtvers="5 6 7"
for ver in ${qtvers}; do for ver in ${qtvers}; do
stat /usr/lib*/qt${ver} &>/dev/null && qtver="${qtver}${ver}" if [ -e "/usr/lib/libQt${ver}Core.so.${ver}" ] || [ -e "/usr/lib64/libQt${ver}Core.so.${ver}" ]; then
qtver="${qtver}${ver}"
fi
done done
# Zero or more than one version of Qt found. Abort. # Zero or more than one version of Qt found. Abort.

3
qmldirreqprov.sh
View File

@ -101,6 +101,9 @@ while read file; do
echo "Ignoring ${import}" >&2 echo "Ignoring ${import}" >&2
continue continue
fi fi
if [[ $qtver -ge 6 ]]; then
moduleExports["qt${qtver}qmlimport(${import%.*})"]="" # Provides for unversioned imports
fi
foundModuleExport "qt${qtver}qmlimport(${import})" "$min" foundModuleExport "qt${qtver}qmlimport(${import})" "$min"
done < <(qmlpluginexports-qt${qtver} "$plugin" "$module") done < <(qmlpluginexports-qt${qtver} "$plugin" "$module")
done done