diff --git a/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch b/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch index bd0cf61..91e0914 100644 --- a/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch +++ b/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch @@ -8,21 +8,18 @@ Works around missing window decorations and broken config file reading. startkde/startplasmacompositor.cmake | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index dcb473a4..1ebd126a 100644 ---- a/startkde/startplasmacompositor.cmake -+++ b/startkde/startplasmacompositor.cmake +Index: plasma-workspace-5.16.4/startkde/startplasmacompositor.cmake +=================================================================== +--- plasma-workspace-5.16.4.orig/startkde/startplasmacompositor.cmake ++++ plasma-workspace-5.16.4/startkde/startplasmacompositor.cmake @@ -118,6 +118,10 @@ else export QT_WAYLAND_FORCE_DPI=96 fi +# GTK3 uses the wayland backend by default, but its implementation is not correct +# enough to work well here. Window decorations are missing, for instance. -+export GDK_BACKEND=x11 ++[ -n "$GDK_BACKEND" ] || export GDK_BACKEND=x11 + # Get a property value from org.freedesktop.locale1 queryLocale1() { qdbus-qt5 --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1" --- -2.20.1 - diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index dd11eca..e8c44d4 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 28 13:23:28 UTC 2019 - Fabian Vogt + +- Change 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch to not + override GDK_BACKEND if already set +- Add a new plasmafullwayland.desktop which overrides use of X11 + backends of GTK and Qt + ------------------------------------------------------------------- Tue Jul 30 12:40:19 UTC 2019 - Fabian Vogt diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 76f2388..c7154cf 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -39,6 +39,7 @@ Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspa Source2: plasma.keyring %endif Source3: baselibs.conf +Source4: plasmafullwayland.desktop # PATCHES 000-100 and above are from upstream 5.16 branch # PATCHES 101-500 are from upstream master/5.17 branch # PATCHES 501-??? are PATCH-FIX-OPENSUSE @@ -327,6 +328,9 @@ 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 + install -m0644 %{SOURCE4} %{buildroot}%{_kf5_sharedir}/wayland-sessions/plasmafullwayland.desktop + mkdir -p %{buildroot}%{_sysconfdir}/alternatives touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop @@ -492,6 +496,7 @@ fi %license COPYING* %dir %{_datadir}/wayland-sessions/ %{_datadir}/wayland-sessions/plasmawayland.desktop +%{_datadir}/wayland-sessions/plasmafullwayland.desktop %endif %if %{with lang} diff --git a/plasmafullwayland.desktop b/plasmafullwayland.desktop new file mode 100644 index 0000000..97d4462 --- /dev/null +++ b/plasmafullwayland.desktop @@ -0,0 +1,50 @@ +[Desktop Entry] +Exec=env GDK_BACKEND=wayland QT_QPA_PLATFORM=wayland dbus-run-session /usr/bin/startplasmacompositor +TryExec=/usr/bin/startplasmacompositor +DesktopNames=KDE +Name=Plasma (Full Wayland) +Comment=Plasma by KDE +Comment[ar]=بلازما كدي +Comment[bs]=Plazma od strane KDe +Comment[ca]=Plasma, creat per la comunitat KDE +Comment[ca@valencia]=Plasma, creat per la comunitat KDE +Comment[cs]=Plasma z KDE +Comment[da]=Plasma fra KDE +Comment[de]=Plasma von KDE +Comment[el]=Plasma από το KDE +Comment[en_GB]=Plasma by KDE +Comment[es]=Plasma, por KDE +Comment[et]=KDE Plasma +Comment[eu]=KDEren Plasma +Comment[fi]=Plasma KDE:ltä +Comment[fr]=Plasma, par KDE +Comment[gl]=Plasma, fornecido por KDE. +Comment[he]=פלזמה באמצעות KDE +Comment[hu]=Plasma a KDE-től +Comment[id]=Plasma oleh KDE +Comment[is]=Plasma frá KDE +Comment[it]=Plasma di KDE +Comment[ja]=Plasma by KDE +Comment[ko]=KDE Plasma +Comment[lt]=Plasmą sukūrė KDE +Comment[nb]=Plasma av KDE +Comment[nds]=Plasma vun KDE +Comment[nl]=Plasma door KDE +Comment[nn]=Plasma frå KDE +Comment[pa]=KDE ਵਲੋਂ ਪਲਾਜ਼ਮਾ +Comment[pl]=Plazma dzięki KDE +Comment[pt]=Plasma do KDE +Comment[pt_BR]=Plasma do KDE +Comment[ru]=KDE Plasma +Comment[sk]=Plasma od KDE +Comment[sl]=KDE Plasma +Comment[sr]=Плазма од КДЕ‑а +Comment[sr@ijekavian]=Плазма од КДЕ‑а +Comment[sr@ijekavianlatin]=Plasma od KDE‑a +Comment[sr@latin]=Plasma od KDE‑a +Comment[sv]=Plasma av KDE +Comment[tr]=KDE Plasma +Comment[uk]=Плазма KDE +Comment[x-test]=xxPlasma by KDExx +Comment[zh_CN]=KDE Plasma +Comment[zh_TW]=Plasma by KDE