Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=82fc4edbc91d94226226ba8815938f57779317d5

commit 82fc4edbc91d94226226ba8815938f57779317d5
Author: Melko <[email protected]>
Date:   Sat Oct 18 09:53:09 2014 +0200

kdepim-4.14.1-2-x86_64

* add patch to fix KDE bug 336417

diff --git a/source/kde-extra/kdepim/0001-Fix-crash-on-logout.patch 
b/source/kde-extra/kdepim/0001-Fix-crash-on-logout.patch
new file mode 100644
index 0000000..ab0ad93
--- /dev/null
+++ b/source/kde-extra/kdepim/0001-Fix-crash-on-logout.patch
@@ -0,0 +1,39 @@
+From c5b703e7c1a3f5da43a3864536cfa606d112d60a Mon Sep 17 00:00:00 2001
+From: David Faure <[email protected]>
+Date: Fri, 17 Oct 2014 21:19:36 +0200
+Subject: [PATCH] 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
+---
+ akregator/src/mainwidget.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+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();
+ }
+--
+1.8.4.1
+
diff --git a/source/kde-extra/kdepim/FrugalBuild 
b/source/kde-extra/kdepim/FrugalBuild
index 3996295..0495389 100644
--- a/source/kde-extra/kdepim/FrugalBuild
+++ b/source/kde-extra/kdepim/FrugalBuild
@@ -4,7 +4,7 @@
options+=('asneeded')

pkgname=kdepim
-pkgrel=1
+pkgrel=2
pkgdesc="KDE PIM Utilities."
groups=('kde-extra')
replaces=('klibido' 'taskjuggler' "$pkgname-wizards" "$pkgname-strigi-analyzer" 
"$pkgname-mobile")
@@ -17,6 +17,8 @@ Finclude kde
depends=()
makedepends=("${makedepends[@]}" 'boost>=1.50.0' "kdelibs>=$_F_kde_ver" 
"kdepimlibs-compiletime>=${_F_kde_ver}" "docbook-xsl" \
"libdbusmenu-qt>=0.7.0" "soprano-backend-redland>=2.7.0" 
"kdepimlibs>=$_F_kde_ver" "kdelibs-compiletime>=$_F_kde_ver" "kactivities")
+source=("${source[@]}" 0001-Fix-crash-on-logout.patch)
+sha1sums=("${sha1sums[@]}" 'f8c7d5b86d2b243e4bb83744f54566e8d1748ec8')

subpkgs=("${subpkgs[@]}" "akonadiconsole")
subdescs=("${subdescs[@]}" "Akonadi Management and Debugging Console.")
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to