Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kglobalaccel for openSUSE:Factory
checked in at 2022-08-19 17:52:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old)
and /work/SRC/openSUSE:Factory/.kglobalaccel.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel"
Fri Aug 19 17:52:57 2022 rev:111 rq:997587 version:5.97.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes
2022-08-15 19:59:19.149243967 +0200
+++ /work/SRC/openSUSE:Factory/.kglobalaccel.new.2083/kglobalaccel.changes
2022-08-19 17:53:51.727771357 +0200
@@ -1,0 +2,6 @@
+Wed Aug 17 17:16:37 UTC 2022 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Add patch to fix crashes (kde#437364):
+ 0001-Avoid-iterating-a-container-while-it-s-being-mutated.patch
+
+-------------------------------------------------------------------
New:
----
0001-Avoid-iterating-a-container-while-it-s-being-mutated.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kglobalaccel.spec ++++++
--- /var/tmp/diff_new_pack.d0QgB1/_old 2022-08-19 17:53:52.331772623 +0200
+++ /var/tmp/diff_new_pack.d0QgB1/_new 2022-08-19 17:53:52.339772639 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kglobalaccel
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,8 @@
Source1: %{name}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-Avoid-iterating-a-container-while-it-s-being-mutated.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem
++++++ 0001-Avoid-iterating-a-container-while-it-s-being-mutated.patch ++++++
>From 7347a904f1c97db7b7f7fcf49b6bdd34701c7737 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fab...@ritter-vogt.de>
Date: Wed, 17 Aug 2022 19:10:38 +0200
Subject: [PATCH] Avoid iterating a container while it's being mutated
Otherwise the iterators get invalidated and weird stuff happens.
CCBUG: 437364
---
src/runtime/globalshortcutsregistry.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/runtime/globalshortcutsregistry.cpp
b/src/runtime/globalshortcutsregistry.cpp
index 08ea010..21f84b9 100644
--- a/src/runtime/globalshortcutsregistry.cpp
+++ b/src/runtime/globalshortcutsregistry.cpp
@@ -532,7 +532,8 @@ bool GlobalShortcutsRegistry::unregisterKey(const
QKeySequence &key, GlobalShort
void GlobalShortcutsRegistry::writeSettings() const
{
- const auto &lst = GlobalShortcutsRegistry::self()->allMainComponents();
+ // Make a copy for iterating. ~Component removes itself from the list.
+ const auto lst = GlobalShortcutsRegistry::self()->allMainComponents();
for (const KdeDGlobalAccel::Component *component : lst) {
KConfigGroup configGroup(&_config, component->uniqueName());
if (component->allShortcuts().isEmpty()) {
--
2.37.1
