diff options
Diffstat (limited to 'source/kde/kde')
| -rw-r--r-- | source/kde/kde/build/kig | 2 | ||||
| -rw-r--r-- | source/kde/kde/build/krita | 2 | ||||
| -rw-r--r-- | source/kde/kde/build/plasma-workspace | 2 | ||||
| -rw-r--r-- | source/kde/kde/patch/plasma-workspace.patch | 3 | ||||
| -rw-r--r-- | source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch | 30 | ||||
| -rw-r--r-- | source/kde/kde/post-install/plasma-workspace.post-install | 6 |
6 files changed, 42 insertions, 3 deletions
diff --git a/source/kde/kde/build/kig b/source/kde/kde/build/kig index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kig +++ b/source/kde/kde/build/kig @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/plasma-workspace +++ b/source/kde/kde/build/plasma-workspace @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch new file mode 100644 index 000000000..975f72785 --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace.patch @@ -0,0 +1,3 @@ +# Set GTK_BACKEND=x11 in a wayland session +# Works around missing window decorations and broken config file reading +cat $CWD/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch b/source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch new file mode 100644 index 000000000..8bd445da7 --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch @@ -0,0 +1,30 @@ +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(+) + +diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp +index 87c71c6b3..5d0b3f65f 100644 +--- a/startkde/startplasma-waylandsession.cpp ++++ b/startkde/startplasma-waylandsession.cpp +@@ -45,6 +45,11 @@ int main(int /*argc*/, char** /*argv*/) + 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"; +-- +2.22.0 + + diff --git a/source/kde/kde/post-install/plasma-workspace.post-install b/source/kde/kde/post-install/plasma-workspace.post-install index 65d727fcb..4ba279a20 100644 --- a/source/kde/kde/post-install/plasma-workspace.post-install +++ b/source/kde/kde/post-install/plasma-workspace.post-install @@ -14,6 +14,12 @@ cat $CWD/post-install/plasma-workspace/scripts/startkwayland \ > $PKG/usr/bin/startkwayland chmod 0755 $PKG/usr/bin/startkwayland +# Install custom "full wayland" session +pushd $PKG/usr/share/wayland-sessions/ +sed '/^Name/d;s/^Exec=/Exec=env GDK_BACKEND=wayland QT_QPA_PLATFORM=wayland /' plasmawayland.desktop > z_plasmafullwayland.desktop +echo 'Name=Plasma (Full Wayland)' >> z_plasmafullwayland.desktop +popd + # Add a "fail-safe" version of KDE Plasma desktop session. # Prefix the name with "z_" because SDDM is braindead: mkdir -p $PKG/usr/share/xsessions |