Hello community, here is the log from the commit of package kmymoney for openSUSE:Factory checked in at 2018-07-13 10:22:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmymoney (Old) and /work/SRC/openSUSE:Factory/.kmymoney.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmymoney" Fri Jul 13 10:22:45 2018 rev:60 rq:622369 version:5.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kmymoney/kmymoney.changes 2018-05-29 10:48:18.596987125 +0200 +++ /work/SRC/openSUSE:Factory/.kmymoney.new/kmymoney.changes 2018-07-13 10:23:00.526574647 +0200 @@ -1,0 +2,8 @@ +Thu Jul 12 14:47:48 UTC 2018 - wba...@tmo.at + +- Add upstream patches to fix a crash when creating or editing a + transaction (boo#1100025, kde#392735): + * Delete-item-after-it-has-been-removed.patch + * Improve-deletion-of-unused-widgets-in-transaction-editor.patch + +------------------------------------------------------------------- @@ -25 +33 @@ - * Kmymoney does not open multiple files correctly (kde#350850 + * Kmymoney does not open multiple files correctly (kde#350850) New: ---- Delete-item-after-it-has-been-removed.patch Improve-deletion-of-unused-widgets-in-transaction-editor.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmymoney.spec ++++++ --- /var/tmp/diff_new_pack.CATNFc/_old 2018-07-13 10:23:01.186575440 +0200 +++ /var/tmp/diff_new_pack.CATNFc/_new 2018-07-13 10:23:01.186575440 +0200 @@ -28,6 +28,10 @@ Source0: http://download.kde.org/stable/kmymoney/%{version}/src/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM Patch: Fix-build-with-Qt-5.11.patch +# PATCH-FIX-UPSTREAM +Patch1: Delete-item-after-it-has-been-removed.patch +# PATCH-FIX-UPSTREAM +Patch2: Improve-deletion-of-unused-widgets-in-transaction-editor.patch BuildRequires: aqbanking-devel BuildRequires: doxygen BuildRequires: extra-cmake-modules @@ -108,6 +112,8 @@ %prep %setup -q %patch -p1 +%patch1 -p1 +%patch2 -p1 %build ++++++ Delete-item-after-it-has-been-removed.patch ++++++ >From 93df569eb8d6c56ce4b47b5653a2460d61e3b953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?= <lukasz.wojnilow...@gmail.com> Date: Sat, 2 Jun 2018 09:57:10 +0200 Subject: Delete item after it has been removed BUG: 392735 FIXED-IN: 5.0.2 --- kmymoney/widgets/qwidgetcontainer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kmymoney/widgets/qwidgetcontainer.cpp b/kmymoney/widgets/qwidgetcontainer.cpp index 5070b72..8144e32 100644 --- a/kmymoney/widgets/qwidgetcontainer.cpp +++ b/kmymoney/widgets/qwidgetcontainer.cpp @@ -51,8 +51,8 @@ void QWidgetContainer::removeOrphans() if ((*it_w) && (*it_w)->parent()) ++it_w; else { - delete(*it_w); remove(it_w.key()); + delete(*it_w); it_w = begin(); } } -- cgit v0.11.2 ++++++ Improve-deletion-of-unused-widgets-in-transaction-editor.patch ++++++ >From 2f823a4603f1d9c823f3498e74f3fa05960e2383 Mon Sep 17 00:00:00 2001 From: Thomas Baumgart <t...@net-bembel.de> Date: Thu, 7 Jun 2018 09:44:08 +0200 Subject: Improve deletion of unused widgets in transaction editor --- kmymoney/widgets/qwidgetcontainer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kmymoney/widgets/qwidgetcontainer.cpp b/kmymoney/widgets/qwidgetcontainer.cpp index 8144e32..734b4c9 100644 --- a/kmymoney/widgets/qwidgetcontainer.cpp +++ b/kmymoney/widgets/qwidgetcontainer.cpp @@ -51,9 +51,10 @@ void QWidgetContainer::removeOrphans() if ((*it_w) && (*it_w)->parent()) ++it_w; else { - remove(it_w.key()); - delete(*it_w); - it_w = begin(); + QWidget* const w = *it_w; + it_w = erase(it_w); + if (w) + w->deleteLater(); } } } -- cgit v0.11.2
