commit: 301c2e6d2d322f3f38377fe20f94d55c849a5f37 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 15 12:11:35 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Apr 15 15:11:22 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=301c2e6d
kde-plasma/kwin: Do not write GLPlatformInterface config Changing compositor settings in Wayland shall not break X11 sessions. Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-plasma/kwin/files/kwin-5.9.4-glconfig.patch | 37 +++++++++++++++++++++++++ kde-plasma/kwin/kwin-5.9.4-r1.ebuild | 5 +++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/kde-plasma/kwin/files/kwin-5.9.4-glconfig.patch b/kde-plasma/kwin/files/kwin-5.9.4-glconfig.patch new file mode 100644 index 00000000000..90a746e8f28 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.9.4-glconfig.patch @@ -0,0 +1,37 @@ +commit a936516107579df13362f6d2d6f91f26a447d6dd +Author: Martin Gräßlin <mgraess...@kde.org> +Date: Mon Apr 3 06:53:05 2017 +0200 + + [kcmkwin/compositing] Do not write GLPlatformInterface config + + Summary: + The gui element to select the platform interface is dropped. Thus we + should not store the config for it. This is rather important as changing + compositor settings on Wayland would result in egl being written into the + config which potentially breaks an X11 session. + + BUG: 378114 + + Reviewers: #kwin, #plasma + + Subscribers: plasma-devel, kwin + + Tags: #kwin + + Differential Revision: https://phabricator.kde.org/D5285 + +diff --git a/kcmkwin/kwincompositing/compositing.cpp b/kcmkwin/kwincompositing/compositing.cpp +index c1cddb89d..102dfd18c 100644 +--- a/kcmkwin/kwincompositing/compositing.cpp ++++ b/kcmkwin/kwincompositing/compositing.cpp +@@ -309,10 +309,6 @@ void Compositing::save() + } + kwinConfig.writeEntry("Backend", backend); + kwinConfig.writeEntry("GLCore", glCore); +- const QModelIndex glIndex = m_openGLPlatformInterfaceModel->index(m_openGLPlatformInterface); +- if (glIndex.isValid()) { +- kwinConfig.writeEntry("GLPlatformInterface", glIndex.data(Qt::UserRole).toString()); +- } + if (!compositingRequired()) { + kwinConfig.writeEntry("WindowsBlockCompositing", windowsBlockCompositing()); + } diff --git a/kde-plasma/kwin/kwin-5.9.4-r1.ebuild b/kde-plasma/kwin/kwin-5.9.4-r1.ebuild index dad7f6668cc..545e43d5dfe 100644 --- a/kde-plasma/kwin/kwin-5.9.4-r1.ebuild +++ b/kde-plasma/kwin/kwin-5.9.4-r1.ebuild @@ -88,7 +88,10 @@ DEPEND="${COMMON_DEPEND} RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-5.8.6-libdrm-2.4.78.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-5.8.6-libdrm-2.4.78.patch" + "${FILESDIR}/${P}-glconfig.patch" +) src_prepare() { kde5_src_prepare
