pool/plasma5-workspace
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

lessxwl

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=604
This commit is contained in:
Christophe Marin
2021-06-26 10:06:36 +00:00
committed by Git OBS Bridge
parent f186953639
commit fef55cd319
3 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch
View File

@@ -1,26 +0,0 @@
From 3deadbfcdf776eb0c994bb4d719e601160943bfa Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 28 Aug 2019 15:09:49 +0200
Subject: [PATCH] Set GTK_BACKEND=x11 in a wayland session
Works around missing window decorations and broken config file reading
---
startkde/startplasma-waylandsession.cpp | 5 +++++
1 file changed, 5 insertions(+)
Index: plasma-workspace-5.15.80git.20210121T134153~83e5f9011/startkde/startplasma-waylandsession.cpp
===================================================================
--- plasma-workspace-5.15.80git.20210121T134153~83e5f9011.orig/startkde/startplasma-waylandsession.cpp 2021-01-21 14:41:53.000000000 +0100
+++ plasma-workspace-5.15.80git.20210121T134153~83e5f9011/startkde/startplasma-waylandsession.cpp 2021-01-22 08:39:19.900539408 +0100
@@ -47,6 +47,11 @@
out << "startplasma-waylandsession: Starting up...";
if (qEnvironmentVariableIsSet("DISPLAY")) {
+ // GTK3 uses the wayland backend by default, but its implementation is not correct
+ // enough to work well here. Window decorations are missing, for instance.
+ if (!qEnvironmentVariableIsSet("GDK_BACKEND")) {
+ qputenv("GDK_BACKEND", "x11");
+ }
setupX11();
} else {
qWarning() << "running kwin without Xwayland support";

7
plasma5-workspace.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jun 25 21:13:54 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- No longer force GDK_BACKEND, kde-gtk-config deals with it meanwhile:
* 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch
- Drop "Full Wayland" session, default in libqt5-qtbase changed
-------------------------------------------------------------------
Wed Jun 23 08:24:46 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

8
plasma5-workspace.spec
View File

@@ -45,7 +45,6 @@ Source3: baselibs.conf
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
Patch503: 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch
# PATCH-FEATURE-OPENSUSE
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
BuildRequires: breeze5-icons
@@ -337,12 +336,6 @@ Plasma 5 session with Wayland from a display manager.
# Install compatibility symlink
ln -s %{_kf5_sharedir}/xsessions/plasma5.desktop %{buildroot}%{_kf5_sharedir}/xsessions/kde-plasma.desktop
# Install custom "full wayland" session
pushd %{buildroot}%{_kf5_sharedir}/wayland-sessions/
sed '/^Name/d;s/^Exec=/Exec=env GDK_BACKEND=wayland QT_QPA_PLATFORM=wayland /' plasmawayland.desktop > plasmafullwayland.desktop
echo 'Name=Plasma (Full Wayland)' >> plasmafullwayland.desktop
popd
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
@@ -588,7 +581,6 @@ fi
%license COPYING*
%dir %{_datadir}/wayland-sessions/
%{_datadir}/wayland-sessions/plasmawayland.desktop
%{_datadir}/wayland-sessions/plasmafullwayland.desktop
%if %{with lang}
%files lang -f %{name}.lang