public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/
Date: Fri, 20 Sep 2024 17:11:50 +0000 (UTC)	[thread overview]
Message-ID: <1726852297.0b7b1cde21233ef797b09e5bff8a6287bc642f58.asturm@gentoo> (raw)

commit:     0b7b1cde21233ef797b09e5bff8a6287bc642f58
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 17:02:54 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 17:11:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7b1cde

kde-plasma/plasma-workspace: Fix a systemsettings crash

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=486922

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...-workspace-6.1.5-fix-systemsettings-crash.patch | 41 ++++++++++++++++++++++
 .../plasma-workspace-6.1.5-r2.ebuild               |  1 +
 2 files changed, 42 insertions(+)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-systemsettings-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-systemsettings-crash.patch
new file mode 100644
index 000000000000..b199921e9dc1
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-systemsettings-crash.patch
@@ -0,0 +1,41 @@
+From e81dde14d9f9c98bdce4cc5536b105a6adc3613b Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sun, 1 Sep 2024 14:24:08 +0200
+Subject: [PATCH] [krdb] Don't manually process events when applying Qt
+ settings
+
+Manually processing events like this can cause unpredictable behavior and for QML apps like systemsettings cause crashes
+
+It's also not necessary, the config we are applying isn't used by systemsettings/modern Qt apps anyway
+
+BUG: 486922
+
+SENTRY: SYSTEMSETTINGS-3RP
+(cherry picked from commit aaf0cc601a7a9ed455e2a61906ed46b6e275f007)
+---
+ kcms/krdb/krdb.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
+index eefa0d36a0..39bcb7317d 100644
+--- a/kcms/krdb/krdb.cpp
++++ b/kcms/krdb/krdb.cpp
+@@ -484,7 +484,6 @@ void runRdb(unsigned int flags)
+             applyQtSettings(kglobalcfg, *settings); // For kcmstyle
+ 
+         delete settings;
+-        QCoreApplication::processEvents();
+ #if HAVE_X11
+         if (qApp->platformName() == QLatin1String("xcb")) {
+             // We let KIPC take care of ourselves, as we are in a KDE app with
+@@ -514,7 +513,6 @@ void runRdb(unsigned int flags)
+                             PropModeReplace,
+                             (unsigned char *)stamp.buffer().data(),
+                             stamp.buffer().size());
+-            qApp->processEvents();
+         }
+ #endif
+     }
+-- 
+GitLab
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild
index 317637695d40..e1943f0f6ff9 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild
@@ -163,6 +163,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
 	"${FILESDIR}/${P}-fix-wayland-session-restore-saving.patch" # KDE-bug 436318
 	"${FILESDIR}/${P}-fix-x11-logout-w-session-restore.patch" # bug 938925, KDE-bug 488853
+	"${FILESDIR}/${P}-fix-systemsettings-crash.patch" # KDE-bug 486922
 )
 
 src_prepare() {


             reply	other threads:[~2024-09-20 17:11 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-20 17:11 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-26 10:21 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/ Andreas Sturmlechner
2025-06-03 20:07 Sam James
2025-05-15 15:35 Andreas Sturmlechner
2025-04-04  7:49 Andreas Sturmlechner
2025-01-01 21:05 Andreas Sturmlechner
2024-12-10 23:46 Andreas Sturmlechner
2024-09-14 21:37 Andreas Sturmlechner
2024-09-10 17:58 Andreas Sturmlechner
2024-09-02 20:13 Andreas Sturmlechner
2023-11-11  1:03 Andreas Sturmlechner
2023-08-16 16:31 Andreas Sturmlechner
2023-03-22 23:01 Andreas Sturmlechner
2022-10-10  9:54 Andreas Sturmlechner
2022-09-23 20:07 Andreas Sturmlechner
2022-09-23 20:07 Andreas Sturmlechner
2022-08-07 15:51 Andreas Sturmlechner
2022-01-25  9:49 Andreas Sturmlechner
2021-11-23 14:59 Andreas Sturmlechner
2021-09-30 17:24 Andreas Sturmlechner
2021-09-14 13:39 Andreas Sturmlechner
2021-01-24 19:44 Andreas Sturmlechner
2021-01-23  0:25 Andreas Sturmlechner
2021-01-23  0:25 Andreas Sturmlechner
2020-09-17 20:15 Andreas Sturmlechner
2020-09-17 20:15 Andreas Sturmlechner
2019-12-17 23:49 Andreas Sturmlechner
2019-10-29 22:22 Andreas Sturmlechner
2017-08-02 23:22 Andreas Sturmlechner
2017-06-17 18:30 Andreas Sturmlechner
2017-06-09 19:24 Andreas Sturmlechner
2016-11-17 11:35 Michael Palimaka
2016-11-12  8:22 Michael Palimaka
2016-06-26 20:36 Michael Palimaka
2016-06-26 17:19 Michael Palimaka
2015-11-19 16:42 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1726852297.0b7b1cde21233ef797b09e5bff8a6287bc642f58.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox