Christophe Giboudeaux 2022-10-08 17:28:02 +00:00 committed by Git OBS Bridge
parent 5b508f284c
commit 0595756bce
7 changed files with 37 additions and 55 deletions

View File

@ -1,37 +0,0 @@
From d02188ad1f6222215adcf842f4c9806ba9e62ccb Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
Date: Sat, 17 Sep 2022 01:18:28 +0200
Subject: [PATCH] client/plasmashell: add fallback for applet popups
When the compositor doesn't support applet popups, the current code sends an
invalid surface role. This causes KWin to fall back to the "normal" surface role
and do normal window placement on it.
CCBUG: 459188
---
src/client/plasmashell.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/client/plasmashell.cpp b/src/client/plasmashell.cpp
index dc613cb5..93bc31c7 100644
--- a/src/client/plasmashell.cpp
+++ b/src/client/plasmashell.cpp
@@ -276,7 +276,14 @@ void PlasmaShellSurface::setRole(PlasmaShellSurface::Role role)
}
break;
case Role::AppletPopup:
- wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP;
+ // ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP_SINCE_VERSION is not used for this check
+ // because it wrongly is 7 with old plasma wayland protocols
+ if (wl_proxy_get_version(d->surface) < 8) {
+ // dock is what applet popups were before
+ wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_PANEL;
+ } else {
+ wlRole = ORG_KDE_PLASMA_SURFACE_ROLE_APPLETPOPUP;
+ }
break;
default:
Q_UNREACHABLE();
--
2.37.3

View File

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

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmMV9WwACgkQWNDuZIpI
s7uwfgf/WHyf9Wuq7pcBVi4jMNna+xMr3JH/jR07VXJtNx0DsaYvcq15AoF3SXZb
WX7ND3TImBL17JYi+k3XiiWlhTSw+yHKKKAY4xGlyzwzke/o0AlL8bVvnfKPbEYD
0URGUyFfHCeAXlnEXwXJhJ4fWb4UdElFARyg/QjOlpwFXWSkNhnkMXkKZR+VA6vI
lcFi86RCptQ9r1PwuwQPlOzoivrLzbj4x52ApByZ1Hd7/tts/VRyImivmw8BRRq5
pysObDm0EQYUGbs5IyqoU+9dRrItkXZSiNzSSXzUeGfaRaCb/kSRVayKAZ7Vq//x
0mZVGn5WdhlXQIiNhCw7HUxPU8BzoQ==
=EKMl
-----END PGP SIGNATURE-----

3
kwayland-5.99.0.tar.xz Normal file
View File

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

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmM4VcEACgkQWNDuZIpI
s7vPXQf9FRewx37HjfvHpE55ArEWZZU5ciT7aTcWxFtqP8BaqG4oOwB6cyzJIxON
SVQTYYWIW+mrd1HcdSiZc92qZbHjQhrjkggg9/FSqZdDBsD9eYXxImpdfzegEU7k
6/SopgDs7f2K+bosTl/QFqJzFUHghUNybwGUmClSwNcwZV/ksMqz6yHm6DH9q9UL
QHPmltqEQMzEGGHw6mO5qCzmYEhvBdikC/DDMRPOTEl8pII7RpOVq0E2WhKSUugN
3SIzIMpCb4FB0ShpLnYSfb6AX3oGUpz0j4Q3rCHcBLY+67veBbvgF2HTjOUAEIrm
8Sv0WkmrLVrN0UmYLL+cW3LVmhcxWw==
=BiES
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sat Oct 1 15:56:09 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 5.99.0
* New feature release
* For more details please see:
* https://kde.org/announcements/frameworks/5/5.99.0
- Changes since 5.98.0:
* Fix compile error with wl_output < v4
* PlasmaWindowManagement: Avoid unbounded recursion and delay in readData (kde#453124)
* client/plasmashell: fix applet popups displacing other windows (kde#459523)
* client/plasmashell: add fallback for applet popups
* require PlasmaWaylandProtocols 1.9.0 and bump supported plasmashell version to 8
* .gitlab-ci.yml: enable static builds
* ConnectionThread: connect by symbol rather than by name
* ConnectionThread: Move event dispatcing into a separate method
* ConnectionThread: Make sure we consume properly the threads
* Add support for wl_output version 4
- Drop patch, merged upstream:
* 0001-client-plasmashell-add-fallback-for-applet-popups.patch
-------------------------------------------------------------------
Thu Sep 22 14:35:55 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -16,7 +16,7 @@
#
%define _tar_path 5.98
%define _tar_path 5.99
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@ -24,7 +24,7 @@
# Only needed for the package signature condition
%bcond_without released
Name: kwayland
Version: 5.98.0
Version: 5.99.0
Release: 0
Summary: KDE Wayland library
License: LGPL-2.1-or-later
@ -35,8 +35,6 @@ Source: %{name}-%{version}.tar.xz
Source1: %{name}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch0: 0001-client-plasmashell-add-fallback-for-applet-popups.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem