| 1 |
commit: 301c2e6d2d322f3f38377fe20f94d55c849a5f37 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 15 12:11:35 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 15 15:11:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=301c2e6d |
| 7 |
|
| 8 |
kde-plasma/kwin: Do not write GLPlatformInterface config |
| 9 |
|
| 10 |
Changing compositor settings in Wayland shall not break X11 sessions. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 13 |
|
| 14 |
kde-plasma/kwin/files/kwin-5.9.4-glconfig.patch | 37 +++++++++++++++++++++++++ |
| 15 |
kde-plasma/kwin/kwin-5.9.4-r1.ebuild | 5 +++- |
| 16 |
2 files changed, 41 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/kde-plasma/kwin/files/kwin-5.9.4-glconfig.patch b/kde-plasma/kwin/files/kwin-5.9.4-glconfig.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..90a746e8f28 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-plasma/kwin/files/kwin-5.9.4-glconfig.patch |
| 23 |
@@ -0,0 +1,37 @@ |
| 24 |
+commit a936516107579df13362f6d2d6f91f26a447d6dd |
| 25 |
+Author: Martin Gräßlin <mgraesslin@×××.org> |
| 26 |
+Date: Mon Apr 3 06:53:05 2017 +0200 |
| 27 |
+ |
| 28 |
+ [kcmkwin/compositing] Do not write GLPlatformInterface config |
| 29 |
+ |
| 30 |
+ Summary: |
| 31 |
+ The gui element to select the platform interface is dropped. Thus we |
| 32 |
+ should not store the config for it. This is rather important as changing |
| 33 |
+ compositor settings on Wayland would result in egl being written into the |
| 34 |
+ config which potentially breaks an X11 session. |
| 35 |
+ |
| 36 |
+ BUG: 378114 |
| 37 |
+ |
| 38 |
+ Reviewers: #kwin, #plasma |
| 39 |
+ |
| 40 |
+ Subscribers: plasma-devel, kwin |
| 41 |
+ |
| 42 |
+ Tags: #kwin |
| 43 |
+ |
| 44 |
+ Differential Revision: https://phabricator.kde.org/D5285 |
| 45 |
+ |
| 46 |
+diff --git a/kcmkwin/kwincompositing/compositing.cpp b/kcmkwin/kwincompositing/compositing.cpp |
| 47 |
+index c1cddb89d..102dfd18c 100644 |
| 48 |
+--- a/kcmkwin/kwincompositing/compositing.cpp |
| 49 |
++++ b/kcmkwin/kwincompositing/compositing.cpp |
| 50 |
+@@ -309,10 +309,6 @@ void Compositing::save() |
| 51 |
+ } |
| 52 |
+ kwinConfig.writeEntry("Backend", backend); |
| 53 |
+ kwinConfig.writeEntry("GLCore", glCore); |
| 54 |
+- const QModelIndex glIndex = m_openGLPlatformInterfaceModel->index(m_openGLPlatformInterface); |
| 55 |
+- if (glIndex.isValid()) { |
| 56 |
+- kwinConfig.writeEntry("GLPlatformInterface", glIndex.data(Qt::UserRole).toString()); |
| 57 |
+- } |
| 58 |
+ if (!compositingRequired()) { |
| 59 |
+ kwinConfig.writeEntry("WindowsBlockCompositing", windowsBlockCompositing()); |
| 60 |
+ } |
| 61 |
|
| 62 |
diff --git a/kde-plasma/kwin/kwin-5.9.4-r1.ebuild b/kde-plasma/kwin/kwin-5.9.4-r1.ebuild |
| 63 |
index dad7f6668cc..545e43d5dfe 100644 |
| 64 |
--- a/kde-plasma/kwin/kwin-5.9.4-r1.ebuild |
| 65 |
+++ b/kde-plasma/kwin/kwin-5.9.4-r1.ebuild |
| 66 |
@@ -88,7 +88,10 @@ DEPEND="${COMMON_DEPEND} |
| 67 |
|
| 68 |
RESTRICT+=" test" |
| 69 |
|
| 70 |
-PATCHES=( "${FILESDIR}/${PN}-5.8.6-libdrm-2.4.78.patch" ) |
| 71 |
+PATCHES=( |
| 72 |
+ "${FILESDIR}/${PN}-5.8.6-libdrm-2.4.78.patch" |
| 73 |
+ "${FILESDIR}/${P}-glconfig.patch" |
| 74 |
+) |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
kde5_src_prepare |
Archives