[SCM] KDE PIM module packaging branch, master, updated. debian/4.14.0-1-16-g38ebe35

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit df7f39faf04aeb2276e507433ab9e3ff314da6ad
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Oct 18 10:22:38 2014 +0200

    New patch: upstream_fix_crash_on_logout (Closes: #764362) Thanks to Francesco Muzio
---
 debian/changelog                            |  2 ++
 debian/patches/series                       |  1 +
 debian/patches/upstream_fix_crash_on_logout | 34 +++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7be7e67..5eb51ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 kdepim (4:4.14.2-1~) UNRELEASED; urgency=medium
 
   * New upstream release (4.14.2).
+  * New patch: upstream_fix_crash_on_logout (Closes: #764362) Thanks to
+    Francesco Muzio
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Oct 2014 13:43:14 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 8df2af8..aa0883f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ debianize_akregator_default.diff
 spambayes.patch
 disable_test_verify
 disable_has_focus_tests_failed_in_xvfb.patch
+upstream_fix_crash_on_logout
diff --git a/debian/patches/upstream_fix_crash_on_logout b/debian/patches/upstream_fix_crash_on_logout
new file mode 100644
index 0000000..69cd47a
--- /dev/null
+++ b/debian/patches/upstream_fix_crash_on_logout
@@ -0,0 +1,34 @@
+commit c5b703e7c1a3f5da43a3864536cfa606d112d60a
+Author: David Faure <faure at kde.org>
+Date:   Fri Oct 17 21:19:36 2014 +0200
+
+    Fix crash on logout.
+    
+    Turns out the check for kapp->sessionSaving inside queryExit was confusing,
+    it's actually false when aboutToQuit() leads to queryExit, even during logout.
+    So always delete the part in slotOnShutdown, called by aboutToQuit().
+    
+    BUG: 336417
+    FIXED-IN: 4.14.3
+
+diff --git a/akregator/src/mainwidget.cpp b/akregator/src/mainwidget.cpp
+index 3211a50..14cd2a9 100644
+--- a/akregator/src/mainwidget.cpp
++++ b/akregator/src/mainwidget.cpp
+@@ -317,6 +317,8 @@ void Akregator::MainWidget::slotOnShutdown()
+ {
+     m_shuttingDown = true;
+ 
++    delete m_part;
++
+     // close all pageviewers in a controlled way
+     // fixes bug 91660, at least when no part loading data
+     while ( m_tabWidget->count() > 1 ) { // remove frames until only the main frame remains
+@@ -333,6 +335,7 @@ void Akregator::MainWidget::slotOnShutdown()
+ 
+     delete m_mainTab;
+     delete m_mainFrame;
++    m_mainFrame = 0;
+ 
+     Settings::self()->writeConfig();
+ }

-- 
KDE PIM module packaging