diff options
Diffstat (limited to 'kde-plasma')
| -rw-r--r-- | kde-plasma/Manifest.gz | bin | 9784 -> 9785 bytes | |||
| -rw-r--r-- | kde-plasma/kscreen/Manifest | 3 | ||||
| -rw-r--r-- | kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch | 39 | ||||
| -rw-r--r-- | kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild (renamed from kde-plasma/kscreen/kscreen-5.27.4-r1.ebuild) | 5 |
4 files changed, 45 insertions, 2 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz Binary files differindex 2cf0e6297a01..32323ec1862e 100644 --- a/kde-plasma/Manifest.gz +++ b/kde-plasma/Manifest.gz diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest index 80eb1e5e5e8a..e6a845b15536 100644 --- a/kde-plasma/kscreen/Manifest +++ b/kde-plasma/kscreen/Manifest @@ -1,6 +1,7 @@ +AUX kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch 1264 BLAKE2B eb4b151f724470f369ba9c2b36c4910b1933739cd5e10c7163d9135b6dad99a2f6876e7738b38c0fd82dc0638e63f6a71da13d7ab64c3deda0caa9fabeaff809 SHA512 cb76b1f337f26458639caba52e6c4bd90cf92cda2f38cc8bac2e5415069d9d9604348ba609d36b2c81fc5f394f16c05c6b27e3ce2a78d5b5e5f7a8e38259ab90 AUX kscreen-5.27.4-kcm-notify-changes-when-global-scale-changes.patch 1178 BLAKE2B a12f4a7a88c7fbeb9ea8a2fa32a2c720383e0e491de8a11b6ac48eb575cabf837b1f6cfc87fcf779e6d80b8efb5f262a65549e17cd3fd542a2ed046171e39e29 SHA512 45e2145b292982452dbf723338e0ac21b0c1d2402a31d227d28ce9bcf163e0917123faa7015d8a399c36d4d8aaa0a9b70e57206544b2b4fdc07dd12b6b4ade43 DIST kscreen-5.26.5.tar.xz 154600 BLAKE2B 202f7ec24b01ca057a5e52b796176e6ae09518693cb50e16b0d3901351fba58d5554d959f4afa48b5539981870e02f14bde8c25402d4c2b6427acf5c896ca75f SHA512 58635bc2c5cb3e3cee6b838ddc3a9068c9b22bcedef6ddd9c4b6aa59889b59242118227e706208c17c89241a701f850d42e9c5617d876068367246d35d1800c2 DIST kscreen-5.27.4.tar.xz 184212 BLAKE2B f0ff9a98f0d6151e230dbc1f4ba33d123b80d4d3879de818adb5dbff0a50e09892fbee37c7cd96f31e1708aef43b0c9bbcdae2c6c13f81f5a80380ba8145d72c SHA512 2ce33a582e8315133de31c01fcd32ea02627dbbd00fa2a8c30ea8a9a082b12c36410d21bb74c4ef727fdbab0c7ae6d9ff6cc83597c249e6a5456d6e11b738518 EBUILD kscreen-5.26.5.ebuild 1348 BLAKE2B f06076f8cedb330a598c9aeb630027949cbc0c99a0fe5023f337494365da903a24194f28edb7e7946a3088cec9e666fd226eb43695761f38826311eb4b8e08c0 SHA512 3a0088c16d2a7f1486744a871d87ed3a2db8a57d97cffd930a852b1024f0b0d0618c99b86b8e37b2f5f02971b063d4919faf044e5c3bbcb21824aa3d82cb71e3 -EBUILD kscreen-5.27.4-r1.ebuild 1452 BLAKE2B e6df7c74851be734acd854860ae1d116cedfcf922bd0184e00b4ea1c47fbc703adb3c6278ece716786487e0418ddb026c22ae96cfadd61a6437187ceb89a9d4b SHA512 68ea0b97144ad807c038737ebc3bd7c80eaeca848c7eb7877a17e250e0ee387b06b48380f74fa876b10c612a7521cdb85ad0d957d817f09a977f2df76c9fa8d9 +EBUILD kscreen-5.27.4-r2.ebuild 1544 BLAKE2B 3e5c8971aa56af921efbcaa8c7a124d681411a5c35a9c6b8a78934a3ba45fc527c36aa224e556c8611875300ae08af823433cdf3798ce775d6d89e18aba92f45 SHA512 2ed462ab7bf1681009dc0aa51a43614e1551addf72cafdb60edc876f4b13178837daba589e405a41d60a1fb1138714641e8d73be6d9ac5c8237b851af28144f9 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch b/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch new file mode 100644 index 000000000000..795773a679f6 --- /dev/null +++ b/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch @@ -0,0 +1,39 @@ +From 8af1cfac332f6f7c4e6db40c851dd5ac719236f1 Mon Sep 17 00:00:00 2001 +From: Harald Sitter <sitter@kde.org> +Date: Mon, 17 Apr 2023 16:01:50 +0200 +Subject: [PATCH] don't stumble over nullptrs if outputs changed during saving + +exec() opens a nested eventloop that does event processing and may end +up processing output changes when e.g. a screen is getting unplugged. as +part of this our m_configHandler may get reset to null, so make sure the +pointers are still valid after exec + +BUG: 466960 + + +(cherry picked from commit 0bfa16bd2b59ac9b2ce8112c06d86e5e29c69654) +--- + kcm/kcm.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp +index f292699c..931509eb 100644 +--- a/kcm/kcm.cpp ++++ b/kcm/kcm.cpp +@@ -172,6 +172,13 @@ void KCMKScreen::doSave() + m_stopUpdatesFromBackend = true; + op->exec(); + ++ // exec() opens a nested eventloop that may have unset m_configHandler if (e.g.) ++ // outputs changed during saving. https://bugs.kde.org/show_bug.cgi?id=466960 ++ if (!m_configHandler || !m_configHandler->config()) { ++ Q_EMIT errorOnSave(); ++ return; ++ } ++ + const auto updateInitialData = [this]() { + if (!m_configHandler || !m_configHandler->config()) { + return; +-- +GitLab + diff --git a/kde-plasma/kscreen/kscreen-5.27.4-r1.ebuild b/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild index efbf3dea06d4..b462d1c4519b 100644 --- a/kde-plasma/kscreen/kscreen-5.27.4-r1.ebuild +++ b/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild @@ -48,4 +48,7 @@ RDEPEND="${DEPEND} " BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" -PATCHES=( "${FILESDIR}/${P}-kcm-notify-changes-when-global-scale-changes.patch" ) # KDE-bug 468203 +PATCHES=( + "${FILESDIR}/${P}-kcm-notify-changes-when-global-scale-changes.patch" # KDE-bug 468203 + "${FILESDIR}/${P}-avoid-nullptrs-if-outputs-changed-during-saving.patch" # KDE-bug 466960 +) |