Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plasma-framework for
openSUSE:Factory checked in at 2022-04-23 00:25:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma-framework (Old)
and /work/SRC/openSUSE:Factory/.plasma-framework.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-framework"
Sat Apr 23 00:25:00 2022 rev:124 rq:971236 version:5.93.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma-framework/plasma-framework.changes
2022-04-17 23:50:00.522320904 +0200
+++
/work/SRC/openSUSE:Factory/.plasma-framework.new.1538/plasma-framework.changes
2022-04-23 00:25:04.471743810 +0200
@@ -1,0 +2,8 @@
+Wed Apr 20 17:55:09 UTC 2022 - Fabian Vogt <[email protected]>
+
+- Backport some patches:
+ * 0001-Fix-osd-dialog-position.patch (kde#452648)
+ * 0002-Keep-PlasmaComponents.Highlight-on-its-former-behavi.patch
(kde#452555)
+ * 0003-Fix-check-for-argument-length-in-DataEngine-loader.patch (kde#452596)
+
+-------------------------------------------------------------------
New:
----
0001-Fix-osd-dialog-position.patch
0002-Keep-PlasmaComponents.Highlight-on-its-former-behavi.patch
0003-Fix-check-for-argument-length-in-DataEngine-loader.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma-framework.spec ++++++
--- /var/tmp/diff_new_pack.HebyA4/_old 2022-04-23 00:25:05.347744276 +0200
+++ /var/tmp/diff_new_pack.HebyA4/_new 2022-04-23 00:25:05.351744279 +0200
@@ -37,6 +37,9 @@
%endif
# PATCH-FIX-UPSTREAM
Patch0: b62d83bef7733e4943e6f66787166b41198d1359.patch
+Patch1: 0001-Fix-osd-dialog-position.patch
+Patch2: 0002-Keep-PlasmaComponents.Highlight-on-its-former-behavi.patch
+Patch3: 0003-Fix-check-for-argument-length-in-DataEngine-loader.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem
++++++ 0001-Fix-osd-dialog-position.patch ++++++
>From 541e397ee645dfa7783eef3cc2c4cfc345cace30 Mon Sep 17 00:00:00 2001
From: Jim Jones <[email protected]>
Date: Wed, 20 Apr 2022 16:18:20 +0000
Subject: [PATCH 1/3] Fix osd dialog position
After the upgrade to kde-frameworks-5.93 the osd volume indicator is displayed
in the top left corner of the screen instead of being displayed in the center
of the screen.
BUG: 452648
(cherry picked from commit aec00b32980390b93411f140dfb0503a671c2163)
---
src/plasmaquick/dialog.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
index 09937ef0f..478a8d404 100644
--- a/src/plasmaquick/dialog.cpp
+++ b/src/plasmaquick/dialog.cpp
@@ -1237,11 +1237,7 @@ bool Dialog::event(QEvent *event)
{
if (event->type() == QEvent::Expose) {
if (!KWindowSystem::isPlatformWayland() || !isExposed()) {
- auto ret = QQuickWindow::event(event);
- if (d->mainItem) {
- d->syncToMainItemSize();
- }
- return ret;
+ return QQuickWindow::event(event);
}
/*
--
2.35.1
++++++ 0002-Keep-PlasmaComponents.Highlight-on-its-former-behavi.patch ++++++
>From 6586670171fe10d5817a7e5b84ffab7b677b4006 Mon Sep 17 00:00:00 2001
From: Aleix Pol <[email protected]>
Date: Wed, 13 Apr 2022 17:25:52 +0200
Subject: [PATCH 2/3] Keep PlasmaComponents.Highlight on its former behaviour
Otherwise some applets like Kickoff Legacy don't get a highlight
BUG: 452555
(cherry picked from commit 734b956c27bd76df7fed6979beb27c2f30cbd3bf)
---
src/declarativeimports/plasmacomponents/qml/Highlight.qml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/declarativeimports/plasmacomponents/qml/Highlight.qml
b/src/declarativeimports/plasmacomponents/qml/Highlight.qml
index 672e57231..3672050b7 100644
--- a/src/declarativeimports/plasmacomponents/qml/Highlight.qml
+++ b/src/declarativeimports/plasmacomponents/qml/Highlight.qml
@@ -4,6 +4,7 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
+import QtQuick 2.15
import org.kde.plasma.extras 2.0 as PlasmaExtras
/**
@@ -15,4 +16,5 @@ PlasmaExtras.Highlight
id: root
// At some point we had the "hover" property which was replaced with
"hovered"
property alias hover: root.hovered
+ hovered: true
}
--
2.35.1
++++++ 0003-Fix-check-for-argument-length-in-DataEngine-loader.patch ++++++
>From ff5c65db51216a725060a44ddd65a7f51fafde7e Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <[email protected]>
Date: Sat, 16 Apr 2022 20:59:19 +0200
Subject: [PATCH 3/3] Fix check for argument length in DataEngine loader
BUG: 452596
After i wrote the initial patch, we decided that the plasma-frameworks internal
code which dumped
the entire KPluginMetaData object as a variant map in the args could be removed.
However, this change was not applied to the sanity check in the latest revision
of the MR.
(cherry picked from commit c90e49cc98769ca5b9275c089880b3d64f1689c5)
---
src/plasma/dataengine.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plasma/dataengine.cpp b/src/plasma/dataengine.cpp
index 5c246d9b8..60b837797 100644
--- a/src/plasma/dataengine.cpp
+++ b/src/plasma/dataengine.cpp
@@ -56,7 +56,7 @@ DataEngine::DataEngine(QObject *parent, const QVariantList
&args)
: QObject(parent)
{
KPluginMetaData data;
- if (args.size() > 1 && args.first().canConvert<KPluginMetaData>()) {
+ if (!args.isEmpty() && args.first().canConvert<KPluginMetaData>()) {
data = args.first().value<KPluginMetaData>();
}
d = new DataEnginePrivate(this, data, args);
--
2.35.1
