Accepting request 1140321 from home:Vogtinator:other6
- 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 OBS-URL: https://build.opensuse.org/request/show/1140321 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/qml-autoreqprov?expand=0&rev=13
This commit is contained in:
parent
0a1cb1a53c
commit
5bbd5601ef
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
||||||
|
|
||||||
|
@ -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
|
||||||
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
4
qml.req
@ -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.
|
||||||
|
@ -101,6 +101,7 @@ while read file; do
|
|||||||
echo "Ignoring ${import}" >&2
|
echo "Ignoring ${import}" >&2
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
moduleExports["qt${qtver}qmlimport(${import%.*})"]="" # Provides for unversioned imports
|
||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user