From e8b409a5ace09b6d47fbb557e90316e0461ced5a Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 26 Jun 2024 22:13:38 -0700 Subject: [PATCH] feat(deck): Restore nested desktop on KDE6 --- .../nested-desktop-resolution.patch | 17 ++++++++--------- .../steamdeck-kde-presets.spec | 15 ++++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spec_files/steamdeck-kde-presets/nested-desktop-resolution.patch b/spec_files/steamdeck-kde-presets/nested-desktop-resolution.patch index 50b90fc4..0b51e741 100644 --- a/spec_files/steamdeck-kde-presets/nested-desktop-resolution.patch +++ b/spec_files/steamdeck-kde-presets/nested-desktop-resolution.patch @@ -1,23 +1,22 @@ diff --git a/usr/bin/steamos-nested-desktop b/usr/bin/steamos-nested-desktop -index 7cc1b05..22b345f 100755 +index b833773..f7ae36f 100755 --- a/usr/bin/steamos-nested-desktop +++ b/usr/bin/steamos-nested-desktop @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/bash - # Remove the performance overlay, it meddles with some tasks - unset LD_PRELOAD -@@ -7,8 +7,10 @@ unset LD_PRELOAD + set -eu + +@@ -28,8 +28,9 @@ ln -s $XDG_RUNTIME_DIR/pipewire* $NEW_XDG_RUNTIME_DIR/. ## whilst being launched by plasma-session - mkdir $XDG_RUNTIME_DIR/nested_plasma -p - cat < $XDG_RUNTIME_DIR/nested_plasma/kwin_wayland_wrapper + mkdir $NEW_XDG_RUNTIME_DIR/bin + cat < $NEW_XDG_RUNTIME_DIR/bin/kwin_wayland_wrapper -#!/bin/sh -/usr/bin/kwin_wayland_wrapper --width 1280 --height 800 --no-lockscreen \$@ +#!/usr/bin/bash +source /etc/default/steamos-nested-desktop -+ +/usr/bin/kwin_wayland_wrapper --width ${STEAMOS_NESTED_DESKTOP_WIDTH:-1280} --height ${STEAMOS_NESTED_DESKTOP_HEIGHT:-800} --no-lockscreen \$@ EOF - chmod a+x $XDG_RUNTIME_DIR/nested_plasma/kwin_wayland_wrapper - export PATH=$XDG_RUNTIME_DIR/nested_plasma:$PATH + chmod a+x $NEW_XDG_RUNTIME_DIR/bin/kwin_wayland_wrapper + export PATH=$NEW_XDG_RUNTIME_DIR/bin:$PATH diff --git a/spec_files/steamdeck-kde-presets/steamdeck-kde-presets.spec b/spec_files/steamdeck-kde-presets/steamdeck-kde-presets.spec index dbd25c2c..7e49c3b2 100644 --- a/spec_files/steamdeck-kde-presets/steamdeck-kde-presets.spec +++ b/spec_files/steamdeck-kde-presets/steamdeck-kde-presets.spec @@ -12,11 +12,12 @@ Source3: metadata_vapor.json Source4: metadata_vgui2.json BuildArch: noarch Patch0: fedora.patch -Patch1: kdeglobals.patch -Patch2: bazzite_logo.patch -Patch3: ublue.patch -Patch4: wayland-remove-env.patch -Patch5: splash.patch +Patch1: nested-desktop-resolution.patch +Patch2: kdeglobals.patch +Patch3: bazzite_logo.patch +Patch4: ublue.patch +Patch5: wayland-remove-env.patch +Patch6: splash.patch Requires: kde-filesystem @@ -58,8 +59,6 @@ rm %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vapor.desktop/contents rm %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vgui.desktop/contents/splash/images/deck_logo.svgz rm %{buildroot}%{_sysconfdir}/xdg/autostart/jupiter-plasma-bootstrap.desktop rm %{buildroot}%{_bindir}/jupiter-plasma-bootstrap -rm %{buildroot}%{_bindir}/steamos-nested-desktop -rm -rf %{buildroot}%{_datadir}/applications/steam/steamos-nested-desktop cp %{SOURCE2} %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vapor.desktop/contents/splash/images/bazzite_logo.svgz cp %{SOURCE2} %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vgui.desktop/contents/splash/images/bazzite_logo.svgz cp %{SOURCE3} %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vapor.desktop/metadata.json @@ -97,7 +96,9 @@ rm -rf %{buildroot}%{_datadir}/kservices5 %{_sysconfdir}/xdg/plasma-workspace/env/ibus.sh %{_sysconfdir}/xdg/powermanagementprofilesrc %{_bindir}/steamos-add-to-steam +%{_bindir}/steamos-nested-desktop %{_prefix}/lib/udev/rules.d/99-kwin-ignore-tablet-mode.rules +%{_datadir}/applications/steam/steamos-nested-desktop %{_datadir}/X11/xorg.conf.d/99-pointer.conf %{_datadir}/icons/* %{_datadir}/konsole/*