Accepting request 985906 from KDE:Frameworks5

Plasma 5.25.2 (forwarded request 985627 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/985906
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=192
This commit is contained in:
Dominique Leuenberger 2022-07-01 11:44:25 +00:00 committed by Git OBS Bridge
commit 2f2af33c77
8 changed files with 44 additions and 90 deletions

View File

@ -1,66 +0,0 @@
From 0cc230ec7f5bde0e61d1080512db72e3cc1a28f6 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Sun, 29 May 2022 14:47:39 +0800
Subject: [PATCH] shell: refresh geometries of all `DesktopView` and
`PanelView` when receiving `logicalDotsPerInchChanged`
Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
BUG: 450443
FIXED-IN: 5.24.6
---
shell/desktopview.cpp | 8 ++++++++
shell/panelview.cpp | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/shell/desktopview.cpp b/shell/desktopview.cpp
index 54f759f3b..8002f085e 100644
--- a/shell/desktopview.cpp
+++ b/shell/desktopview.cpp
@@ -118,12 +118,20 @@ void DesktopView::adaptToScreen()
if (m_oldScreen) {
disconnect(m_oldScreen.data(), &QScreen::geometryChanged, this, &DesktopView::screenGeometryChanged);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ disconnect(m_oldScreen.data(), &QScreen::logicalDotsPerInchChanged, this, &DesktopView::screenGeometryChanged);
+ }
}
if (m_windowType == Desktop || m_windowType == WindowedDesktop) {
screenGeometryChanged();
connect(m_screenToFollow.data(), &QScreen::geometryChanged, this, &DesktopView::screenGeometryChanged, Qt::UniqueConnection);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ connect(m_screenToFollow.data(), &QScreen::logicalDotsPerInchChanged, this, &DesktopView::screenGeometryChanged, Qt::UniqueConnection);
+ }
}
m_oldScreen = m_screenToFollow;
diff --git a/shell/panelview.cpp b/shell/panelview.cpp
index a0af15be8..aa921ddfa 100644
--- a/shell/panelview.cpp
+++ b/shell/panelview.cpp
@@ -935,10 +935,18 @@ void PanelView::setScreenToFollow(QScreen *screen)
// disconnect from old screen
disconnect(m_screenToFollow, &QScreen::virtualGeometryChanged, this, &PanelView::updateStruts);
disconnect(m_screenToFollow, &QScreen::geometryChanged, this, &PanelView::restore);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ disconnect(m_screenToFollow, &QScreen::logicalDotsPerInchChanged, this, &PanelView::restore);
+ }
}
connect(screen, &QScreen::virtualGeometryChanged, this, &PanelView::updateStruts, Qt::UniqueConnection);
connect(screen, &QScreen::geometryChanged, this, &PanelView::restore, Qt::UniqueConnection);
+ // Workaround for https://codereview.qt-project.org/c/qt/qtbase/+/413380
+ if (KWindowSystem::isPlatformX11()) {
+ connect(screen, &QScreen::logicalDotsPerInchChanged, this, &PanelView::restore, Qt::UniqueConnection);
+ }
/*connect(screen, &QObject::destroyed, this, [this]() {
if (PanelView::screen()) {
--
2.36.1

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmKxpUEACgkQ11dEg7tX
sY2pmA/9Eze9zR/bUVp1NgN/pWCm9MuoEMv6xcW+4YRCydzZTCvIOMk0ZbkbvrLu
qeJeEFdgnj25d0hHl5rpHvFywxKMOAFa9tKcjfPp9Z4i9TCb54kASCgXav4OHqhR
cHsew3P7svkxtM8+D4Jxl/qY2v2WBY+4+AL4jdLkdlUB8w9d7wU3jq6Fj1CGH4eX
Y8+FmsGavwSH99M7f5z/fQJfChMVGc9rYhhfIA1OyXtjKm4oiKtxp33RSqMh+7lf
03DGCWmKuDzV9uMDCKsL3wNtPP0DHG7onq30Th9odYEHyL3HziUYtBoAotKvh+Hp
2BO8oTVDYJ8URgCJ4SBGszVtVg2/vgQonGCzBB/qLBqkJjBfjVt6FBYvSmtWcbrz
KS7w67ongcuiZesqRVHHyyApvVl992gwid2elhvDFFxXifiGafwHwYNjvt9QvSnJ
smYIUdHnq+RW5xhqqo6t0fKIeoV3Wuoowmypxhzx+LVgfnvecK4GcmXwjOhZdMy7
DnMRNF/xcRaxOYcFUyidy9BLrhFDFQzimfc+LQDPkBknMkL73l0NZTluI8Y3qHMI
EmvrLRsv6kSvIpVkI46xDv2Cm7u6uc7Oi47vDJxPXqFiIslEPhl4kprlQXpe8fL6
Fw+7CvFnY3k+m8mC7hbfaIFz82BvFAtfjKjjBgK46elVlPHHrMc=
=1Wgu
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmK68QgACgkQ11dEg7tX
sY1duA/+LkD5TTV69MjIYEfUC/lrqrCN6MiDnz6U5fnasfKkiVocxxB7/QGq1q3m
z0Wf2aLEmLrkql3XzgzWCJP8ZPm7dnDD9jxkIITV9+eApRC8BrhEWKxEMNB3Jq0C
UdYoTIBHTYwr0E3rc4jZqWgbEPZFUG24amHOtowPSTKl41J4OjNVxIXl08m2z/zW
FzqEjgH1g2lnL48HHbxwyfW82Ive6YacgzOR+bcDYBnKLlKqjg6UbHTgQ1Xy3rl2
qEhnwOgbtiYzPBJilQ+8uqgFciGWXq9I8y7Y/OCKRwIQEcFz4t7HvFP/gkRiDlk5
E17CY4RdJuh6ulDnK7skPXLD2iSqux/uZSKnz+n1rLSo+DeUt4eoxktP/1UxDiDz
mOiaA+KVrwp3S40RuXg3W7an/6jgWCupRtOvjyUseF/SpNMgUAoc19w3rRfv1CVo
lnQEFwB+IRvP7gzqRZ57uILNssqCV3s5n9hJLXQmkBLZOR1i1O7O0QCf68NlfYOO
7PtaFKgwjFr7SaZbolfTjnPAlOcI1cnGYSRZ2wLWvzluTpbFoTbC2pQ23YxEbqva
JF2cIuBFgQ5aM/jQlakTrs+IzV6sBaP11+9R9+yKSKck6cGDpv5qK3k7PY4RS6eW
fdkTw7sqiuYfVTUvdnCpdx1cLuzQ3gE6coAcT1ENAGfHSpJNHBc=
=QJLF
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue Jun 28 13:03:35 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.25.2
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.25.2
- Changes since 5.25.1:
* shell: avoid crash after waking up from sleep (kde#455328)
* Revert "Prevent panel going out of screen boundaries"
* shell: refresh geometries of all `DesktopView` and `PanelView` when receiving `logicalDotsPerInchChanged` (kde#450443,kde#438114)
* Avoid crash in plasma-session teardown (kde#454159)
* kcms/colors: Fix window titlebar tinting in colorsapplicator (kde#455395)
* kcms/feedback: Properly fit the items inside the layout (kde#455713)
* Fix session restore + kwin interaction race (kde#442380)
- Drop patches, now upstream:
* 0001-shell-refresh-geometries-of-all-DesktopView-and-Pane.patch
-------------------------------------------------------------------
Tue Jun 28 09:27:15 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Also use xprop-kde-full-session.desktop with systemd startup
-------------------------------------------------------------------
Tue Jun 21 11:39:48 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -29,7 +29,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.25.1
Version: 5.25.2
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
@ -46,8 +46,6 @@ Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
# PATCH-FEATURE-OPENSUSE
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
# PATCH-FIX-UPSTREAM kde#450443 https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1781
Patch507: 0001-shell-refresh-geometries-of-all-DesktopView-and-Pane.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
%if 0%{?suse_version} < 1550

View File

@ -1,5 +1,5 @@
[Desktop Entry]
# To work around boo#1191825 until all FF versions got the fix
# To work around boo#1191825 until all FF and TB versions got the fix
Name=Set KDE_FULL_SESSION=1
Exec=xprop -root -format KDE_FULL_SESSION 32a -set KDE_FULL_SESSION 1
Type=Application
@ -7,4 +7,3 @@ X-KDE-StartupNotify=false
NoDisplay=true
OnlyShowIn=KDE;
X-KDE-autostart-phase=0
X-systemd-skip=true