diff --git a/desktop/kde/plasma/kwin/actions.py b/desktop/kde/plasma/kwin/actions.py index 1352ef15b6..fcfc3eba61 100755 --- a/desktop/kde/plasma/kwin/actions.py +++ b/desktop/kde/plasma/kwin/actions.py @@ -10,7 +10,7 @@ from pisi.actionsapi import shelltools def setup(): #shelltools.system("rm -rf po/id") - kde5.configure() + kde5.configure("-DCMAKE_INSTALL_LIBEXECDIR=lib") def build(): kde5.make() diff --git a/desktop/kde/plasma/kwin/files/kdebug-419118.patch b/desktop/kde/plasma/kwin/files/kdebug-419118.patch new file mode 100644 index 0000000000..6c2347a885 --- /dev/null +++ b/desktop/kde/plasma/kwin/files/kdebug-419118.patch @@ -0,0 +1,66 @@ +From bee3afdd5194e0cf1fb72619b3d130514102e3cf Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Mon, 30 Mar 2020 17:27:11 +0100 +Subject: [kcmkwin] Make dialog non blocking + +Summary: +It's invoked from QML. + +Nested event loops invoked directly from QML is asking for crashes. + +BUG: 419118 + +Test Plan: +Opened KCM +Opened dialog for some settings +Window was still modal as before +Settings were saved +(though they didn't seem to be applied..maybe another bug?) + +Reviewers: #kwin, apol + +Reviewed By: apol + +Subscribers: zzag, kwin + +Tags: #kwin + +Differential Revision: https://phabricator.kde.org/D28293 +--- + kcmkwin/common/effectsmodel.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/kcmkwin/common/effectsmodel.cpp b/kcmkwin/common/effectsmodel.cpp +index 47c264f..4927567 100644 +--- a/kcmkwin/common/effectsmodel.cpp ++++ b/kcmkwin/common/effectsmodel.cpp +@@ -636,7 +636,7 @@ void EffectsModel::requestConfigure(const QModelIndex &index, QWindow *transient + return; + } + +- QPointer dialog = new QDialog(); ++ auto dialog = new QDialog(); + + KCModule *module = index.data(ScriptedRole).toBool() + ? findScriptedConfig(index.data(ServiceNameRole).toString(), dialog) +@@ -668,11 +668,13 @@ void EffectsModel::requestConfigure(const QModelIndex &index, QWindow *transient + layout->addWidget(module); + layout->addWidget(buttons); + +- if (dialog->exec() == QDialog::Accepted) { ++ connect(dialog, &QDialog::accepted, module, [module]() { + module->save(); +- } ++ }); + +- delete dialog; ++ dialog->setModal(true); ++ dialog->setAttribute(Qt::WA_DeleteOnClose); ++ dialog->show(); + } + + bool EffectsModel::shouldStore(const EffectData &data) const +-- +cgit v1.1 + + diff --git a/desktop/kde/plasma/kwin/pspec.xml b/desktop/kde/plasma/kwin/pspec.xml index 7de6e57894..9b017e106b 100755 --- a/desktop/kde/plasma/kwin/pspec.xml +++ b/desktop/kde/plasma/kwin/pspec.xml @@ -84,7 +84,7 @@ kirigami-devel - disable_qpa.patch + kdebug-419118.patch @@ -141,6 +141,8 @@ libdrm libinput ktextwidgets + freetype + fontconfig xcb-util-cursor @@ -216,9 +218,9 @@ - 2020-03-29 + 2020-04-12 5.18.3 - Version bump. + Version bump qpa patch kapatıldı Mustafa Cinasal muscnsl@gmail.com