[SCM] KDE PIM module packaging branch, master, updated. debian/4.4.11.1+l10n-2-2-g637de65

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git;a=commitdiff;h=637de65

The following commit has been merged in the master branch:
commit 637de65d78725ce9f4287adaf83028a3e8d9b7b5
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 9 11:45:59 2012 +0200

    fix Akregator shutdown with Qt 4.8 (#675498)
    
    backport upstream commit 6ae89eee936159dd7d7ca3405fbe6d9d66d86ddd
---
 debian/changelog                                   |    4 ++
 debian/patches/series                              |    1 +
 .../upstream_Fix-crash-in-Folder-destructor.patch  |   36 ++++++++++++++++++++
 3 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 79df89f..b86d087 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kdepim (4:4.4.11.1+l10n-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream commit 6ae89eee936159dd7d7ca3405fbe6d9d66d86ddd to fix
+    the Akregator shutdown with qDeleteAll() of Qt 4.8; patch
+    upstream_Fix-crash-in-Folder-destructor.patch. (Closes: #675498)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Jun 2012 11:18:32 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index fa2c3b9..cf195cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ displaying_only_unread_issue.diff
 debian_set_library_version.diff
 upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
 upstream_Build-with-clang.patch
+upstream_Fix-crash-in-Folder-destructor.patch
diff --git a/debian/patches/upstream_Fix-crash-in-Folder-destructor.patch b/debian/patches/upstream_Fix-crash-in-Folder-destructor.patch
new file mode 100644
index 0000000..5038eb1
--- /dev/null
+++ b/debian/patches/upstream_Fix-crash-in-Folder-destructor.patch
@@ -0,0 +1,36 @@
+From 6ae89eee936159dd7d7ca3405fbe6d9d66d86ddd Mon Sep 17 00:00:00 2001
+From: Christoph Feck <christoph at maxiom.de>
+Date: Mon, 7 Nov 2011 21:29:38 +0100
+Subject: [PATCH] Fix crash in Folder destructor
+
+Especially visible with Qt 4.8.0 qDeleteAll() changes, but might also
+fix older bugs.
+
+BUG: 285938
+CCBUG: 193780
+FIXED-IN: 4.7.4
+REVIEW: 102981
+(cherry picked from commit 3497e5afe51490191825c7b7d475a5fc0702988d)
+---
+ akregator/src/folder.cpp |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp
+index f2385b0..249e598 100644
+--- a/akregator/src/folder.cpp
++++ b/akregator/src/folder.cpp
+@@ -65,7 +65,10 @@ Folder::FolderPrivate::FolderPrivate( Folder* qq ) : q( qq ), unread( 0 ), open(
+ 
+ Folder::FolderPrivate::~FolderPrivate()
+ {
+-    qDeleteAll( children );
++    while (!children.isEmpty()) {
++        // child removes itself from list in its destructor
++        delete children.first();
++    }
+     emit q->emitSignalDestroyed();
+ }
+ 
+-- 
+1.7.10
+

-- 
KDE PIM module packaging