[kdepimlibs] Kmail crash on exit (kde#289693)

[Rex Dieter]

commit c948ebf71568e918de0f288641e24241a107c9fd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Dec 29 15:38:01 2011 -0600

    Kmail crash on exit (kde#289693)

 kdepimlibs-4.7.95-kdebug289381.patch |   20 ++++++++++++++++++++
 kdepimlibs.spec                      |   10 +++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/kdepimlibs-4.7.95-kdebug289381.patch b/kdepimlibs-4.7.95-kdebug289381.patch
new file mode 100644
index 0000000..e5a8ed9
--- /dev/null
+++ b/kdepimlibs-4.7.95-kdebug289381.patch
@@ -0,0 +1,20 @@
+diff -up kdepimlibs-4.7.95/akonadi/entitytreemodel.cpp.kdebug289381 kdepimlibs-4.7.95/akonadi/entitytreemodel.cpp
+--- kdepimlibs-4.7.95/akonadi/entitytreemodel.cpp.kdebug289381	2011-12-20 13:09:54.000000000 -0600
++++ kdepimlibs-4.7.95/akonadi/entitytreemodel.cpp	2011-12-29 15:35:41.672694928 -0600
+@@ -75,8 +75,14 @@ EntityTreeModel::~EntityTreeModel()
+ {
+   Q_D( EntityTreeModel );
+ 
+-  foreach ( const QList<Node*> &list, d->m_childEntities )
+-    qDeleteAll( list );
++  foreach ( const QList<Node*> &list, d->m_childEntities ) {
++    QList<Node*>::const_iterator it = list.constBegin();
++    const QList<Node*>::const_iterator end = list.constEnd();
++    for ( ; it != end; ++it ) {
++      delete *it;
++    }
++  }
++
+   d->m_rootNode = 0;
+ 
+   delete d_ptr;
diff --git a/kdepimlibs.spec b/kdepimlibs.spec
index f2fcf6a..21e54b2 100644
--- a/kdepimlibs.spec
+++ b/kdepimlibs.spec
@@ -7,7 +7,7 @@
 Name: kdepimlibs
 Summary: KDE PIM Libraries
 Version: 4.7.95
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -20,6 +20,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # https://bugs.kde.org/249992
 Patch52: kdepimlibs-4.7.3-dovecot_kde249992.patch
 
+## upstream patches
+# https://bugs.kde.org/289381
+Patch100: kdepimlibs-4.7.95-kdebug289381.patch
+
 %if ! 0%{?akonadi_subpkg}
 Obsoletes: %{name}-akonadi < %{version}-%{release}
 Provides:  %{name}-akonadi = %{version}-%{release}
@@ -87,6 +91,7 @@ format for easy browsing.
 %setup -q
 
 %patch52 -p1 -b .dovecot_kde249992
+%patch100 -p1 -b .kdebug289381
 
 
 %build
@@ -212,6 +217,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 29 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.95-2
+- Kmail crash on exit (kde#289693)
+
 * Wed Dec 21 2011 Radek Novacek <rnovacek at redhat.com> - 4.7.95-1
 - 4.7.95