Plasma 5.27.8, not built yet

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=711
This commit is contained in:
Christophe Marin 2023-09-12 19:29:50 +00:00 committed by Git OBS Bridge
parent 545cc8dfdf
commit 3987200f0a
10 changed files with 34 additions and 208 deletions

View File

@ -1,63 +0,0 @@
From 94b2c3d1d4a72d70d487513954601c2cf723e673 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Tue, 1 Aug 2023 19:47:52 +0200
Subject: [PATCH] OSD: Fix size calculation for progress value
Use a common function for formatting the percent, so placeholder 100% label will
use the exact formatting used by the label next to the progress bar.
Also use font advanceWidth, which is the appropriate means of calculating the
bounding box of text in this case. Also ceil it to avoid subpixel alignment.
And to be absolutely sure disable word wrapping.
BUG: 469576
(cherry picked from commit 9737efa79440b65db303030f34f0039f1c9cd6a0)
---
lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml b/lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml
index fa892cb23..bc60efc15 100644
--- a/lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml
+++ b/lookandfeel/org.kde.breeze/contents/osd/OsdItem.qml
@@ -26,6 +26,10 @@ RowLayout {
// false for displaying the value as normal text
property bool showingProgress: false
+ function formatPercent(number) {
+ return i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Percentage value", "%1%", number);
+ }
+
spacing: PlasmaCore.Units.smallSpacing
Layout.preferredWidth: Math.max(Math.min(Screen.desktopAvailableWidth / 2, implicitWidth), PlasmaCore.Units.gridUnit * 15)
@@ -63,7 +67,7 @@ RowLayout {
// to the maximum width to avoid the progress bad resizing itself
TextMetrics {
id: widestLabelSize
- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "100%")
+ text: formatPercent(100)
font: percentageLabel.font
}
@@ -71,13 +75,14 @@ RowLayout {
PlasmaExtra.Heading {
id: percentageLabel
Layout.fillHeight: true
- Layout.preferredWidth: widestLabelSize.width
+ Layout.preferredWidth: Math.ceil(widestLabelSize.advanceWidth)
Layout.rightMargin: PlasmaCore.Units.smallSpacing
Layout.alignment: Qt.AlignVCenter
level: 3
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
- text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Percentage value", "%1%", progressBar.value)
+ text: formatPercent(progressBar.value)
+ wrapMode: Text.NoWrap
visible: showingProgress
// Display a subtle visual indication that the volume might be
// dangerously high
--
2.41.0

View File

@ -1,48 +0,0 @@
From dc146e7164a5dcb3a6ed4829398db69378111f0e Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Fri, 18 Aug 2023 12:20:50 +0800
Subject: [PATCH 1/2] TriangleMouseFilter: check intercepted item still exists
in reset timer
m_interceptedHoverItem.item can be deleted before m_interceptedHoverItem
is reset, so checking interceptedHoverEnterPosition is not enough.
BUG: 473432
FIXED-IN: 5.27.8
(cherry picked from commit 1e8a8d6e6c338bcc66c781863222a038d7136618)
---
components/trianglemousefilter/trianglemousefilter.cpp | 2 +-
components/trianglemousefilter/trianglemousefilter.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/trianglemousefilter/trianglemousefilter.cpp b/components/trianglemousefilter/trianglemousefilter.cpp
index 9395f8479..8b414588b 100644
--- a/components/trianglemousefilter/trianglemousefilter.cpp
+++ b/components/trianglemousefilter/trianglemousefilter.cpp
@@ -26,7 +26,7 @@ TriangleMouseFilter::TriangleMouseFilter(QQuickItem *parent)
update();
- if (m_interceptedHoverItem.interceptedHoverEnterPosition.has_value()) {
+ if (m_interceptedHoverItem) {
resendHoverEvents(m_interceptedHoverItem.interceptedHoverEnterPosition.value());
}
diff --git a/components/trianglemousefilter/trianglemousefilter.h b/components/trianglemousefilter/trianglemousefilter.h
index a18556b90..086c1d62b 100644
--- a/components/trianglemousefilter/trianglemousefilter.h
+++ b/components/trianglemousefilter/trianglemousefilter.h
@@ -29,7 +29,7 @@ struct InterceptedQuickItemData {
explicit operator bool() const
{
- return item != nullptr;
+ return !item.isNull();
}
};
--
2.41.0

View File

@ -1,37 +0,0 @@
From fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Fri, 4 Aug 2023 12:40:17 +0800
Subject: [PATCH] shell: avoid potential crash when previous window is gone
before returning focus
m_previousPlasmaWindow is bound to a window, and if a window is closed
before `restorePreviousWindow` is called, there will be a crash. Use
QPointer to track the window destruction.
---
shell/shellcorona.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/shell/shellcorona.h b/shell/shellcorona.h
index a3aff351a..db218d16e 100644
--- a/shell/shellcorona.h
+++ b/shell/shellcorona.h
@@ -14,6 +14,7 @@
#include <QDBusContext>
#include <QDBusVariant>
+#include <QPointer>
#include <QSet>
#include <QTimer>
@@ -301,7 +302,7 @@ private:
KWayland::Client::PlasmaShell *m_waylandPlasmaShell;
// For getting the active window on Wayland
KWayland::Client::PlasmaWindowManagement *m_waylandWindowManagement = nullptr;
- KWayland::Client::PlasmaWindow *m_previousPlasmaWindow = nullptr;
+ QPointer<KWayland::Client::PlasmaWindow> m_previousPlasmaWindow;
bool m_closingDown : 1;
bool m_screenReorderInProgress = false;
QString m_testModeLayout;
--
2.41.0.windows.3

View File

@ -1,35 +0,0 @@
From 88780c843d1dbd63d18edbeecca17fddfe24a004 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Fri, 18 Aug 2023 22:29:42 +0800
Subject: [PATCH 2/2] TriangleMouseFilter: also check optional position has
value
If firstEnter is true, only item is set, and interceptedHoverEnterPosition
still has no value until there is another QEvent::HoverEnter event.
Amends 1e8a8d6e6c338bcc66c781863222a038d7136618
CCBUG: 473432
(cherry picked from commit 08c8c00bdd3811b9547360ccb23eeef3da00de54)
---
components/trianglemousefilter/trianglemousefilter.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/trianglemousefilter/trianglemousefilter.h b/components/trianglemousefilter/trianglemousefilter.h
index 086c1d62b..b4d6662ab 100644
--- a/components/trianglemousefilter/trianglemousefilter.h
+++ b/components/trianglemousefilter/trianglemousefilter.h
@@ -29,7 +29,7 @@ struct InterceptedQuickItemData {
explicit operator bool() const
{
- return !item.isNull();
+ return !item.isNull() && interceptedHoverEnterPosition.has_value();
}
};
--
2.41.0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0642941dcdf513ac201494897e2c5097a2f2db8be6dcdb597cae1a43d82ece5f
size 19465984

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmTI0CAACgkQ11dEg7tX
sY2rhg/9HWjPf3AYnAKaHvlnzVvxAo70CSxPV4xN7nMvRFlWwcvU+fLbFNNA1ufA
nc0msBpUgBuB4d1QCmSK/74+Z05gLPcafGInxkqHrXJJQ6PVpF/v4Um7Tc56EYv6
qYvs6XDPCEVGz7GD/LBp4PwZ+nlzJ0cc2wQJj6dr8mUndhkJjEWXZpub9qRHORPA
H67YwJySJCDqmmJHpKVFoBJxSEAbo37fPado1iZIhNKRsRTFmLrgrwsX77+AsJQo
D0Ou3TGOIFP4GL7Ts5L3zBtRpyZYJWRdtu36rWm7ONHcGcMw5UwPK6JQWchp0b7i
DctIZbxRTWCjFt5Tl2j5gyU2bXhiw5UzOSSv9a3EqgATRqhl1bot0EpSjYenLLg0
RdBIfsdH2Gb3qLTY/NEMPlLwuhUDg/er+xjB8IMfJhJBFlmHXJrTeJQ+pXmzcHD4
7/RpLujOnNy/2tClUEGXT3rXRvfXZ4Sy0gmTuV8kd33jpOlXNakx+VVU49+b1wZE
SkDKhcvXCrTc83h3pOcjpDOxbTqyVTCnty5I94oIRg02G+wMjfO9BUCF4aC0oY3a
A3lvggZyhvH8wBy9RQoTvp8ldoP2RTwx8hguDl223iT8YdOMVymb1P7bkk4cWPDv
tZ1kd2jAKYDjovVr9dKSJMZr5iRl1KFHUXbvtxxrUZMvXbgs6bg=
=qLrx
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a565d29851f28e0003018562c929b7d4ac8f00836923c12d199b4964d3b60ef0
size 19465764

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmUAPmAACgkQ11dEg7tX
sY3k3BAAhcntrDFR2jzc6fRWHG9EXJMyaOb8JWgiSTMyokhNdHqJDWrHgGb9NjFm
uS0jUnLoKQTYMhh//hqXjuxt3HQMlI4WmWmSXlmSeO4GhCZqYlHUyOOn90Ji26LS
CiOTHa+cxDk5aJGJAbhK6ePx9uLZswSvOwsfBJQviivm/+Ob3PSGyDDsuqwob0ME
ALaKHuACk6V7pGYa38WV2NM3m0d7hPT0AQmnX0zfsxNt0nDKBuX7zFGxl5AtEXVW
JTbilt9IohLJIJ3vXpsVg0eaTQ1wnllOm4LH0gzLieTZ04ljyvztQ8rVItDQtb6R
ccQJ/Re7V31Yur2ZQcrLtXC/I8fwUP/jEzkS4/yrHjS58nN9ykPRfcodL5Gfzxdb
tsOXlujQ1vI9EbMCT0s9AYL5D+pknjoUbTVW2M+ixWSJ0jqMnojTHMOOLqWU+Dqn
VzbwDmdKuvlkyKMm2RQPmD84ye63kJvCsVpg2zi2K790bbjAIE7tT/QmiF+m5sn0
PkYHdfV+muKLCE2dU6dU4b2g/0kJD97K9Lg9xZjXYk8aRP5KJAdBxKopF4z4TGiC
z3rPC7qkTlw8ipulIwUknx/kypypyzgdDbImwJYVXBAVo9kvdRbQ+6R+C78PcUl2
GUTL6cgbA5MCOk/A+53LQS5wTMyQdWgj/maXJ+xjzQib+5jCOCo=
=vCc7
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Sep 12 11:22:30 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.27.8
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.27.8
- Too many changes to list here
- Drop patches, now upstream:
* 0001-OSD-Fix-size-calculation-for-progress-value.patch
* 0001-shell-avoid-potential-crash-when-previous-window-is-.patch
* 0001-TriangleMouseFilter-check-intercepted-item-still-exi.patch
* 0002-TriangleMouseFilter-also-check-optional-position-has.patch
-------------------------------------------------------------------
Fri Aug 18 14:03:29 UTC 2023 - Fusion Future <qydwhotmail@gmail.com>

View File

@ -30,7 +30,7 @@ Name: plasma5-workspace
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
# Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
Version: 5.27.7
Version: 5.27.8
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
@ -42,11 +42,6 @@ Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspa
Source2: plasma.keyring
%endif
Source3: xprop-kde-full-session.desktop
# PATCH-FIX-UPSTREAM
Patch1: 0001-OSD-Fix-size-calculation-for-progress-value.patch
Patch2: 0001-shell-avoid-potential-crash-when-previous-window-is-.patch
Patch3: 0001-TriangleMouseFilter-check-intercepted-item-still-exi.patch
Patch4: 0002-TriangleMouseFilter-also-check-optional-position-has.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch