From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2ACC2158083 for ; Fri, 20 Sep 2024 17:11:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DA83E29A4; Fri, 20 Sep 2024 17:11:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 26F0EE29A4 for ; Fri, 20 Sep 2024 17:11:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5EC043431C6 for ; Fri, 20 Sep 2024 17:11:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5D1227EA for ; Fri, 20 Sep 2024 17:11:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1726852297.0b7b1cde21233ef797b09e5bff8a6287bc642f58.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-systemsettings-crash.patch kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r2.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/files/ kde-plasma/plasma-workspace/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0b7b1cde21233ef797b09e5bff8a6287bc642f58 X-VCS-Branch: master Date: Fri, 20 Sep 2024 17:11:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 91e3279d-1226-47c3-958f-0126b6a89052 X-Archives-Hash: 1d8249e605335cf596d5c46305d552a7 commit: 0b7b1cde21233ef797b09e5bff8a6287bc642f58 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Sep 20 17:02:54 2024 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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() {