Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qml-autoreqprov for openSUSE:Factory
checked in at 2023-07-12 17:26:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qml-autoreqprov (Old)
and /work/SRC/openSUSE:Factory/.qml-autoreqprov.new.8922 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qml-autoreqprov"
Wed Jul 12 17:26:18 2023 rev:6 rq:1098103 version:1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/qml-autoreqprov/qml-autoreqprov.changes
2021-10-23 00:50:51.789128055 +0200
+++
/work/SRC/openSUSE:Factory/.qml-autoreqprov.new.8922/qml-autoreqprov.changes
2023-07-12 17:26:24.162162584 +0200
@@ -1,0 +2,9 @@
+Tue Jul 11 09:04:16 UTC 2023 - Fabian Vogt <[email protected]>
+
+- Bump version to 1.2
+- qmldirreqprov.sh:
+ * Fix parsing of "depends"
+ * Add support for "optional plugin"
+- qml.req: Handle imports without minor version requirement
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qml-autoreqprov.spec ++++++
--- /var/tmp/diff_new_pack.XVMqP9/_old 2023-07-12 17:26:25.590170909 +0200
+++ /var/tmp/diff_new_pack.XVMqP9/_new 2023-07-12 17:26:25.594170932 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qml-autoreqprov
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: qml-autoreqprov
-Version: 1.1
+Version: 1.2
Release: 0
Summary: Automatic dependency generator for QML files and modules
License: GPL-3.0-or-later
++++++ qml.req ++++++
--- /var/tmp/diff_new_pack.XVMqP9/_old 2023-07-12 17:26:25.662171328 +0200
+++ /var/tmp/diff_new_pack.XVMqP9/_new 2023-07-12 17:26:25.666171352 +0200
@@ -53,6 +53,11 @@
# TODO: Get exit status of qmlimportscanner
while read import min; do
+ # For imports without minor version like "import org.kde.kirigami 2",
+ # the minor version is reported as 255. Treat that as 0 instead.
+ if [ $min -eq 255 ]; then
+ min=0
+ fi
foundDependency "qt${qtver}qmlimport(${import})" "$min"
done < <(grep -vE '/designer/.*\.qml' | xargs -r "$importscanner" -qmlFiles |
jq -r '.[] | select(.type == "module") | .name + " " + .version' | gawk
'match($2, /^([0-9]+)\.([0-9]+)$/, ver) { printf "%s.%d %d\n", $1, ver[1],
ver[2]; }')
++++++ qmldirreqprov.sh ++++++
--- /var/tmp/diff_new_pack.XVMqP9/_old 2023-07-12 17:26:25.686171468 +0200
+++ /var/tmp/diff_new_pack.XVMqP9/_new 2023-07-12 17:26:25.690171492 +0200
@@ -54,7 +54,8 @@
fi
if [[ $requires ]]; then
- gawk '$1 == depends && match($2, /^([0-9]+)\.([0-9]+)$/, ver) {
printf "qt'${qtver}'qmlimport(%s.%d) >= %d", $2, ver[1], ver[2]; }' "$file"
+ # TODO: Handle "auto" as version. This could generate
versionless qmlimport(Foo.Bar.2) for each exported major version.
+ gawk '$1 == "depends" && match($3, /^([0-9]+)\.([0-9]+)$/, ver)
{ printf "qt'${qtver}'qmlimport(%s.%d) >= %d\n", $2, ver[1], ver[2]; }' "$file"
fi
if [[ $provides ]]; then
@@ -76,7 +77,7 @@
fi
plugins+=("${location}/${pluginname}")
- done < <(awk '$1 == "plugin" { printf "lib%s.so %s\n", $2, $3;
}' "$file")
+ done < <(awk '$1 == "plugin" { printf "lib%s.so %s\n", $2, $3;
} $1 == "optional" && $2 == "plugin" { printf "lib%s.so %s\n", $3, $4; }'
"$file")
if [ ${#plugins[@]} -eq 0 ]; then
# No plugins?
